[clang][transformer] Fix node range-selector to include type name qualifiers of type locs.

[yuhaouy]

Previously, e.g. for TypeLoc "MyNamespace::MyClass", node() selects only "MyClass" without the qualifier. With this change, it now selects "MyNamespace::MyClass".

[llvmbot]

@llvm/pr-subscribers-clang

Author: Yu Hao (yuhaouy)

Changes

Previously, e.g. for TypeLoc "MyNamespace::MyClass", node() selects only "MyClass" without the qualifier. With this change, it now selects "MyNamespace::MyClass".

---

Full diff: https://github.com/llvm/llvm-project/pull/167619.diff

2 Files Affected:

• (modified) clang/lib/Tooling/Transformer/RangeSelector.cpp (+1-1)
• (modified) clang/unittests/Tooling/RangeSelectorTest.cpp (+7)

diff --git a/clang/lib/Tooling/Transformer/RangeSelector.cpp b/clang/lib/Tooling/Transformer/RangeSelector.cpp
index b4bdec1fcdd69..d669be2ca0409 100644
--- a/clang/lib/Tooling/Transformer/RangeSelector.cpp
+++ b/clang/lib/Tooling/Transformer/RangeSelector.cpp
@@ -139,7 +139,7 @@ RangeSelector transformer::node(std::string ID) {
             (Node->get<Stmt>() != nullptr && Node->get<Expr>() == nullptr))
                ? tooling::getExtendedRange(*Node, tok::TokenKind::semi,
                                            *Result.Context)
-               : CharSourceRange::getTokenRange(Node->getSourceRange());
+               : CharSourceRange::getTokenRange(Node->getSourceRange(true));
   };
 }
 
diff --git a/clang/unittests/Tooling/RangeSelectorTest.cpp b/clang/unittests/Tooling/RangeSelectorTest.cpp
index a1fcbb023832f..d441da165b09b 100644
--- a/clang/unittests/Tooling/RangeSelectorTest.cpp
+++ b/clang/unittests/Tooling/RangeSelectorTest.cpp
@@ -339,6 +339,13 @@ TEST(RangeSelectorTest, NodeOpExpression) {
   EXPECT_THAT_EXPECTED(select(node("id"), Match), HasValue("3"));
 }
 
+TEST(RangeSelectorTest, NodeOpTypeLoc) {
+  StringRef Code = "namespace ns {struct Foo{};} ns::Foo a;";
+  TestMatch Match =
+      matchCode(Code, varDecl(hasTypeLoc(typeLoc().bind("typeloc"))));
+  EXPECT_THAT_EXPECTED(select(node("typeloc"), Match), HasValue("ns::Foo"));
+}
+
 TEST(RangeSelectorTest, StatementOp) {
   StringRef Code = "int f() { return 3; }";
   TestMatch Match = matchCode(Code, expr().bind("id"));

[ymand]

Overall looks good, but see my request for clarification.

[github-actions]

🐧 Linux x64 Test Results

• 111318 tests passed
• 4420 tests skipped