Stop renameMethodInvocation from renaming any matching arguments with…

…in its blast radius. Fixes external #1451 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=287828341
google · Jan 6, 2020 · 4aa8c19 · 4aa8c19
1 parent cbf5ec7
commit 4aa8c19
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java b/check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java
@@ -585,7 +585,11 @@ public static SuggestedFix renameMethodInvocation(
     } else {
       throw malformedMethodInvocationTree(tree);
     }
-    List<ErrorProneToken> tokens = state.getOffsetTokens(startPos, state.getEndPosition(tree));
+    int endPos =
+        tree.getArguments().isEmpty()
+            ? state.getEndPosition(tree)
+            : ((JCTree) tree.getArguments().get(0)).getStartPosition();
+    List<ErrorProneToken> tokens = state.getOffsetTokens(startPos, endPos);
     for (ErrorProneToken token : Lists.reverse(tokens)) {
       if (token.kind() == TokenKind.IDENTIFIER && token.name().equals(identifier)) {
         return SuggestedFix.replace(token.pos(), token.endPos(), replacement);

diff --git a/core/src/test/java/com/google/errorprone/fixes/SuggestedFixesTest.java b/core/src/test/java/com/google/errorprone/fixes/SuggestedFixesTest.java
@@ -1314,32 +1314,34 @@ private static class RenameMethodChecker extends BugChecker
       implements MethodInvocationTreeMatcher {
     @Override
     public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) {
-      return describeMatch(tree, SuggestedFixes.renameMethodInvocation(tree, "emptySet", state));
+      return describeMatch(tree, SuggestedFixes.renameMethodInvocation(tree, "singleton", state));
     }
   }
 
   @Test
   public void renameMethodInvocation() {
     BugCheckerRefactoringTestHelper.newInstance(new RenameMethodChecker(), getClass())
         .addInputLines(
-            "Test.java", //
+            "Test.java",
             "import java.util.Collections;",
             "class Test {",
-            "  Object foo = Collections.<Integer /* foo */>emptyList();",
-            "  Object bar = Collections.<Integer>/* foo */emptyList();",
-            "  Object baz = Collections.<Integer>  emptyList  ();",
+            "  int singletonList = 1;",
+            "  Object foo = Collections.<Integer /* foo */>singletonList(singletonList);",
+            "  Object bar = Collections.<Integer>/* foo */singletonList(singletonList);",
+            "  Object baz = Collections.<Integer>  singletonList  (singletonList);",
             "  class emptyList {}",
-            "  Object quux = Collections.<emptyList>emptyList();",
+            "  Object quux = Collections.<emptyList>singletonList(null);",
             "}")
         .addOutputLines(
-            "Test.java", //
+            "Test.java",
             "import java.util.Collections;",
             "class Test {",
-            "  Object foo = Collections.<Integer /* foo */>emptySet();",
-            "  Object bar = Collections.<Integer>/* foo */emptySet();",
-            "  Object baz = Collections.<Integer>  emptySet  ();",
+            "  int singletonList = 1;",
+            "  Object foo = Collections.<Integer /* foo */>singleton(singletonList);",
+            "  Object bar = Collections.<Integer>/* foo */singleton(singletonList);",
+            "  Object baz = Collections.<Integer>  singleton  (singletonList);",
             "  class emptyList {}",
-            "  Object quux = Collections.<emptyList>emptySet();",
+            "  Object quux = Collections.<emptyList>singleton(null);",
             "}")
         .doTest(TEXT_MATCH);
   }