[PATCH] D116978: [clangd] Selection: Prune gtest TEST()s earlier

[Sam McCall via Phabricator via cfe-commits]

sammccall updated this revision to Diff 398757.
sammccall added a comment.

Use the other end too


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D116978/new/

https://reviews.llvm.org/D116978

Files:
  clang-tools-extra/clangd/Selection.cpp


Index: clang-tools-extra/clangd/Selection.cpp
===================================================================
--- clang-tools-extra/clangd/Selection.cpp
+++ clang-tools-extra/clangd/Selection.cpp
@@ -313,12 +313,22 @@
   bool mayHit(SourceRange R) const {
     if (SpelledTokens.empty())
       return false;
-    auto B = SM.getDecomposedLoc(R.getBegin());
-    auto E = SM.getDecomposedLoc(R.getEnd());
-    if (B.first == SelFile && E.first == SelFile)
-      if (E.second < SpelledTokens.front().Offset ||
-          B.second > SpelledTokens.back().Offset)
-        return false;
+    // If the node starts after the selection ends, it is not selected.
+    // All tokens a macro location might claim are >= its expansion site.
+    // So it's safe to use the expansions location for the comparison.
+    // (This is particularly helpful for GTest's TEST macro).
+    auto B = SM.getDecomposedExpansionLoc(R.getBegin());
+    if (B.first == SelFile && B.second > SpelledTokens.back().Offset)
+      return false;
+    // If the node ends before the selection begins, it is not selected.
+    SourceLocation EndLoc = R.getEnd();
+    while (EndLoc.isMacroID())
+      EndLoc = SM.getImmediateExpansionRange(EndLoc).getEnd();
+    auto E = SM.getDecomposedLoc(EndLoc);
+    // In the rare case that the expansion range is a char range, EndLoc is
+    // ~one token too far to the right. We may fail to prune, that's OK.
+    if (E.first == SelFile && E.second < SpelledTokens.front().Offset)
+      return false;
     return true;
   }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D116978.398757.patch
Type: text/x-patch
Size: 1544 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220110/11577848/attachment-0001.bin>