Avoid relying on source positions in SameNameButDifferent

PiperOrigin-RevId: 461283970
google · Jul 16, 2022 · 0da434e · 0da434e
1 parent 25d1c00
commit 0da434e
Showing 1 changed file with 24 additions and 4 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/SameNameButDifferent.java b/core/src/main/java/com/google/errorprone/bugpatterns/SameNameButDifferent.java
@@ -41,13 +41,16 @@
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.ClassSymbol;
 import com.sun.tools.javac.code.Symbol.TypeSymbol;
+import com.sun.tools.javac.util.Position;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Name;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 /** Looks for types being shadowed by other types in a way that may be confusing. */
 @BugPattern(
@@ -92,21 +95,38 @@ private boolean shouldIgnore() {
             && getSymbol(parentTree) instanceof ClassSymbol;
       }
 
+      private @Nullable String qualifiedName(Tree tree) {
+        if (state.getEndPosition(tree) == Position.NOPOS) {
+          return null;
+        }
+        ArrayDeque<Name> parts = new ArrayDeque<>();
+        while (tree instanceof MemberSelectTree) {
+          MemberSelectTree select = (MemberSelectTree) tree;
+          parts.addFirst(select.getIdentifier());
+          tree = select.getExpression();
+        }
+        if (!(tree instanceof IdentifierTree)) {
+          return null;
+        }
+        parts.addFirst(((IdentifierTree) tree).getName());
+        return Joiner.on('.').join(parts);
+      }
+
       private void handle(Tree tree) {
         if (tree instanceof IdentifierTree
             && ((IdentifierTree) tree).getName().contentEquals("Builder")) {
           return;
         }
-        String treeSource = state.getSourceForNode(tree);
-        if (treeSource == null) {
+        String qualifiedName = qualifiedName(tree);
+        if (qualifiedName == null) {
           return;
         }
         Symbol symbol = getSymbol(tree);
         if (symbol instanceof ClassSymbol) {
-          List<TreePath> treePaths = table.get(treeSource, symbol.type.tsym);
+          List<TreePath> treePaths = table.get(qualifiedName, symbol.type.tsym);
           if (treePaths == null) {
             treePaths = new ArrayList<>();
-            table.put(treeSource, symbol.type.tsym, treePaths);
+            table.put(qualifiedName, symbol.type.tsym, treePaths);
           }
           treePaths.add(getCurrentPath());
         }