diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java index abedbcbbda23..abca8f160a3d 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java @@ -54,6 +54,7 @@ public class VariableInIncompleteCodeSearcher extends QueryExecutorBaseectedAtCl(cl); + } + + private boolean haveSeenAllExpectedAtCl(int cl) { + return cl == cl(); + } + + int cl() { + return 0; + } +} \ No newline at end of file diff --git a/java/java-tests/testData/refactoring/inlineMethod/SameVarMethodNames.java.after b/java/java-tests/testData/refactoring/inlineMethod/SameVarMethodNames.java.after new file mode 100644 index 000000000000..a7ff12c6344d --- /dev/null +++ b/java/java-tests/testData/refactoring/inlineMethod/SameVarMethodNames.java.after @@ -0,0 +1,9 @@ +class Test { + public boolean isConsideredFinal(int cl) { + return cl == cl(); + } + + int cl() { + return 0; + } +} \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java index c77b344f6722..99de5eb68dc4 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java @@ -264,6 +264,10 @@ public class InlineMethodTest extends LightRefactoringTestCase { doTest(); } + public void testSameVarMethodNames() throws Exception { + doTest(); + } + private void doTestInlineThisOnly() { @NonNls String fileName = "/refactoring/inlineMethod/" + getTestName(false) + ".java"; configureByFile(fileName);