Allow newlines in AST Matchers in clang-query files
Reviewers: aaron.ballman
Subscribers: cfe-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D71842
diff --git a/clang-tools-extra/clang-query/Query.cpp b/clang-tools-extra/clang-query/Query.cpp
index 675fd96..8eafc5e 100644
--- a/clang-tools-extra/clang-query/Query.cpp
+++ b/clang-tools-extra/clang-query/Query.cpp
@@ -101,9 +101,24 @@
Finder.matchAST(AST->getASTContext());
if (QS.PrintMatcher) {
- std::string prefixText = "Matcher: ";
- OS << "\n " << prefixText << Source << "\n";
- OS << " " << std::string(prefixText.size() + Source.size(), '=') << '\n';
+ SmallVector<StringRef, 4> Lines;
+ Source.split(Lines, "\n");
+ auto FirstLine = Lines[0];
+ Lines.erase(Lines.begin(), Lines.begin() + 1);
+ while (!Lines.empty() && Lines.back().empty()) {
+ Lines.resize(Lines.size() - 1);
+ }
+ unsigned MaxLength = FirstLine.size();
+ std::string PrefixText = "Matcher: ";
+ OS << "\n " << PrefixText << FirstLine;
+
+ for (auto Line : Lines) {
+ OS << "\n" << std::string(PrefixText.size() + 2, ' ') << Line;
+ MaxLength = std::max<int>(MaxLength, Line.rtrim().size());
+ }
+
+ OS << "\n"
+ << " " << std::string(PrefixText.size() + MaxLength, '=') << "\n\n";
}
for (auto MI = Matches.begin(), ME = Matches.end(); MI != ME; ++MI) {
