Add test support and location option tests

Author: IgnatSergeev

clang/test/Refactor/tool-location-option.cpp

@@ -0,0 +1,11 @@
+// RUN: rm -f %t.cp.cpp
+// RUN: cp %s %t.cp.cpp
+// RUN: clang-refactor simplify-expr -location=%t.cp.cpp:5:18 -v %t.cp.cpp -- | FileCheck --check-prefix=CHECK1 %s
+
+bool test = true && true;
+
+// CHECK1: invoking action 'simplify-expr':
+// CHECK1-NEXT: -location={{.*}}.cp.cpp:5:18
+
+// RUN: not clang-refactor simplify-expr -location=%s:5:18 -v %t.cp.cpp -- 2>&1 | FileCheck --check-prefix=CHECK-FILE-ERR %s
+// CHECK-FILE-ERR: given file is not in the target TU

clang/test/Refactor/tool-test-support-location.c

@@ -0,0 +1,40 @@
+// RUN: clang-refactor simplify-expr -location=test:%s -v %s -- | FileCheck %s
+
+/*loc =*/int test;
+
+/*loc named=*/int test2;
+
+/*loc = +1*/int test3;
+
+/* loc = +100 */int test4;
+
+/*loc named =+0*/int test5;
+
+// CHECK: Test location group '':
+// CHECK-NEXT:   89
+// CHECK-NEXT:   139
+// CHECK-NEXT:   176
+// CHECK-NEXT: Test location group 'named':
+// CHECK-NEXT:   114
+// CHECK-NEXT:   195
+
+// The following invocations are in the default group:
+
+// CHECK: invoking action 'simplify-expr':
+// CHECK-NEXT: -location={{.*}}tool-test-support-location.c:3:10
+
+// CHECK: invoking action 'simplify-expr':
+// CHECK-NEXT: -location={{.*}}tool-test-support-location.c:7:14
+
+// CHECK: invoking action 'simplify-expr':
+// CHECK-NEXT: -location={{.*}}tool-test-support-location.c:9:27
+
+// The following invocations are in the 'named' group, and they follow
+// the default invocation even if some of their locations occur prior to the
+// locations from the default group because the groups are tested one-by-one:
+
+// CHECK: invoking action 'simplify-expr':
+// CHECK-NEXT: -location={{.*}}tool-test-support-location.c:5:15
+
+// CHECK: invoking action 'simplify-expr':
+// CHECK-NEXT: -location={{.*}}tool-test-support-location.c:11:18

clang/test/Refactor/tool-test-support.c renamed to clang/test/Refactor/tool-test-support-range.c

@@ -24,23 +24,23 @@
 // The following invocations are in the default group:
 
 // CHECK: invoking action 'local-rename':
-// CHECK-NEXT: -selection={{.*}}tool-test-support.c:3:11
+// CHECK-NEXT: -selection={{.*}}tool-test-support-range.c:3:11
 
 // CHECK: invoking action 'local-rename':
-// CHECK-NEXT: -selection={{.*}}tool-test-support.c:7:15
+// CHECK-NEXT: -selection={{.*}}tool-test-support-range.c:7:15
 
 // CHECK: invoking action 'local-rename':
-// CHECK-NEXT: -selection={{.*}}tool-test-support.c:9:29
+// CHECK-NEXT: -selection={{.*}}tool-test-support-range.c:9:29
 
 // CHECK: invoking action 'local-rename':
-// CHECK-NEXT: -selection={{.*}}tool-test-support.c:13:19 -> {{.*}}tool-test-support.c:13:22
+// CHECK-NEXT: -selection={{.*}}tool-test-support-range.c:13:19 -> {{.*}}tool-test-support-range.c:13:22
 
 // The following invocations are in the 'named' group, and they follow
 // the default invocation even if some of their ranges occur prior to the
 // ranges from the default group because the groups are tested one-by-one:
 
 // CHECK: invoking action 'local-rename':
-// CHECK-NEXT: -selection={{.*}}tool-test-support.c:5:17
+// CHECK-NEXT: -selection={{.*}}tool-test-support-range.c:5:17
 
 // CHECK: invoking action 'local-rename':
-// CHECK-NEXT: -selection={{.*}}tool-test-support.c:11:20
+// CHECK-NEXT: -selection={{.*}}tool-test-support-range.c:11:20

clang/tools/clang-refactor/ClangRefactor.cpp

@@ -200,6 +200,31 @@ class AbstractSourceLocationArgument {
                   llvm::function_ref<void(SourceLocation L)> Callback) = 0;
 };
 
+/// Stores the parsed -location=test:<filename> option.
+class TestSourceLocationArgument final : public AbstractSourceLocationArgument {
+public:
+  TestSourceLocationArgument(TestLocationsInFile TestLocations)
+      : TestLocations(std::move(TestLocations)) {}
+
+  void print(raw_ostream &OS) override { TestLocations.dump(OS); }
+
+  std::unique_ptr<ClangRefactorToolConsumerInterface>
+  createCustomConsumer() override {
+    return TestLocations.createConsumer();
+  }
+
+  /// Testing support: invokes the location action for each source location in
+  /// the test file.
+  bool forAllLocations(
+      const SourceManager &SM,
+      llvm::function_ref<void(SourceLocation L)> Callback) override {
+    return TestLocations.foreachLocation(SM, Callback);
+  }
+
+private:
+  TestLocationsInFile TestLocations;
+};
+
 /// Stores the parsed -location=filename:line:column option.
 class SourceLocationArgument final : public AbstractSourceLocationArgument {
 public:
@@ -235,6 +260,15 @@ class SourceLocationArgument final : public AbstractSourceLocationArgument {
 
 std::unique_ptr<AbstractSourceLocationArgument>
 AbstractSourceLocationArgument::fromString(StringRef Value) {
+  if (Value.starts_with("test:")) {
+    StringRef Filename = Value.drop_front(strlen("test:"));
+    std::optional<TestLocationsInFile> ParsedTestLocations =
+        findTestLocations(Filename);
+    if (!ParsedTestLocations)
+      return nullptr; // A parsing error was already reported.
+    return std::make_unique<TestSourceLocationArgument>(
+        std::move(*ParsedTestLocations));
+  }
   ParsedSourceLocation Location = ParsedSourceLocation::FromString(Value);
   if (Location.FileName != "")
     return std::make_unique<SourceLocationArgument>(std::move(Location));
@@ -509,8 +543,11 @@ class ClangRefactorTool {
     std::unique_ptr<ClangRefactorToolConsumerInterface> TestConsumer;
     bool HasSelection = MatchingRule->hasSelectionRequirement();
     bool HasLocation = MatchingRule->hasLocationRequirement();
-    if (HasSelection)
+    if (HasSelection) {
       TestConsumer = SelectedSubcommand->getSelection()->createCustomConsumer();
+    } else if (HasLocation) {
+      TestConsumer = SelectedSubcommand->getLocation()->createCustomConsumer();
+    }
     ClangRefactorToolConsumerInterface *ActiveConsumer =
         TestConsumer ? TestConsumer.get() : Consumer.get();
     ActiveConsumer->beginTU(AST);