Prevent SuggestedFixes#renameMethod from modifying return type decl…

…aration
google · Aug 9, 2023 · f85916e · f85916e
1 parent 1c1f0f8
commit f85916e
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
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
@@ -750,8 +750,12 @@ public static SuggestedFix renameMethod(MethodTree tree, String replacement, Vis
  int endPos =
  tree.getBody() != null ? getStartPosition(tree.getBody()) : state.getEndPosition(tree);
  List<ErrorProneToken> methodTokens = state.getOffsetTokens(basePos, endPos);
+
+ int returnTypeEndPos = state.getEndPosition(tree.getReturnType());
  for (ErrorProneToken token : methodTokens) {
- if (token.kind() == TokenKind.IDENTIFIER && token.name().equals(tree.getName())) {
+ if (token.kind() == TokenKind.IDENTIFIER
+ && token.pos() > returnTypeEndPos
+ && token.name().equals(tree.getName())) {
  return SuggestedFix.replace(token.pos(), token.endPos(), replacement);
  }
  }

diff --git a/core/src/test/java/com/google/errorprone/bugpatterns/MemberNameTest.java b/core/src/test/java/com/google/errorprone/bugpatterns/MemberNameTest.java
@@ -463,4 +463,32 @@ public void methodReference() {
  "}")
  .doTest();
  }
+
+ @Test
+ public void methodNameWithMatchingReturnType() {
+ refactoringHelper
+ .addInputLines(
+ "Test.java",
+ "class Test {",
+ " private Object Object() {",
+ " return null;",
+ " }",
+ "",
+ " void call() {",
+ " Object();",
+ " }",
+ "}")
+ .addOutputLines(
+ "Test.java",
+ "class Test {",
+ " private Object object() {",
+ " return null;",
+ " }",
+ "",
+ " void call() {",
+ " object();",
+ " }",
+ "}")
+ .doTest();
+ }
 }