[clang-diff] Make printing of matches optional

[johannes]

defer testing

[arphaman]

m isn't very descriptive, maybe something like dump-matches is better? Otherwise LGTM.

[arphaman]

Actually this needs a test as well.

[johannes]

rename to -dump-matches, add a test

[arphaman]

test/Tooling/clang-diff-args.sh

10

You can use MYCHECK-NOT in this file and run FileCheck --check-prefix=MYCHECK %s

[johannes]

fix tests

[arphaman]

LGTM!

test/Tooling/clang-diff-args.sh

 RUN: echo a > %t.cpp
 
 RUN: echo "CHECK: unknown type name 'X'" > %t1
 
 check adding command-line arguments
 RUN: clang-diff -ast-dump -extra-arg=-Da=X        %t.cpp -- 2>&1 | FileCheck %t1
 RUN: clang-diff -ast-dump -extra-arg-before=-Da=X %t.cpp -- 2>&1 | FileCheck %t1
 RUN: clang-diff -ast-dump %t.cpp -- 2>&1 -Da=X | FileCheck %t1
+
+RUN: echo "// CHECK-NOT: {{.}}" > %t-no-output
+RUN: clang-diff %S/clang-diff-ast.cpp %S/clang-diff-ast.cpp -- 2>&1 -std=c++11 \
+RUN: | FileCheck -allow-empty %t-no-output

test/Tooling/clang-diff-basic.cpp

 // RUN: %clang_cc1 -E %s > %T/src.cpp
 // RUN: %clang_cc1 -E %s > %T/dst.cpp -DDEST
-// RUN: clang-diff %T/src.cpp %T/dst.cpp -- | FileCheck %s
+// RUN: clang-diff -dump-matches %T/src.cpp %T/dst.cpp -- | FileCheck %s
 
 #ifndef DEST
 namespace src {
 
 void foo() {
   int x = 321;
 }
 

tools/clang-diff/ClangDiff.cpp

ASTDump("ast-dump",
             cl::desc("Print the internal representation of the AST."),
             cl::init(false), cl::cat(ClangDiffCategory));
 
 static cl::opt<bool> ASTDumpJson(
     "ast-dump-json",
     cl::desc("Print the internal representation of the AST as JSON."),
     cl::init(false), cl::cat(ClangDiffCategory));
 
+static cl::opt<bool>
+    PrintMatches("dump-matches", cl::desc("Print the matched nodes."),
+                 cl::init(false), cl::cat(ClangDiffCategory));
+
 static cl::opt<std::string> SourcePath(cl::Positional, cl::desc("<source>"),
                                        cl::Required,
                                        cl::cat(ClangDiffCategory));
 
 static cl::opt<std::string> DestinationPath(cl::Positional,
                                             cl::desc("<destination>"),
                                             cl::Optional,
                                             cl::cat(ClangDiffCategory));
if (!StopAfter.empty()) {
     }
   }
   diff::SyntaxTree SrcTree(Src->getASTContext());
   diff::SyntaxTree DstTree(Dst->getASTContext());
   diff::ASTDiff Diff(SrcTree, DstTree, Options);
 
   for (diff::NodeId Dst : DstTree) {
     diff::NodeId Src = Diff.getMapped(DstTree, Dst);
-    if (Src.isValid()) {
+    if (PrintMatches && Src.isValid()) {
       llvm::outs() << "Match ";
       printNode(llvm::outs(), SrcTree, Src);
       llvm::outs() << " to ";
       printNode(llvm::outs(), DstTree, Dst);
       llvm::outs() << "\n";
     }
     printDstChange(llvm::outs(), Diff, SrcTree, DstTree, Dst);
   }