variable incomplete code searcher should not find methods with the same name even if they are also unresolved; inline covered by RefactoringUtil.renameVariableReferences() (IDEA-126312)

java/java-indexing-impl/src/com/intellij/psi/impl/search/VariableInIncompleteCodeSearcher.java

@@ -54,6 +54,7 @@ public class VariableInIncompleteCodeSearcher extends QueryExecutorBase<PsiRefer
         if (element instanceof PsiJavaCodeReferenceElement) {
           final PsiJavaCodeReferenceElement ref = (PsiJavaCodeReferenceElement)element;
           if (!ref.isQualified() && name.equals(ref.getText()) &&
+              !(ref.getParent() instanceof PsiMethodCallExpression) &&
               ref.resolve() == null && ref.advancedResolve(true).getElement() == refElement) {
             consumer.process(ref);
           }

java/java-tests/testData/refactoring/inlineMethod/SameVarMethodNames.java

@@ -0,0 +1,13 @@
+class Test {
+  public boolean isConsideredFinal(int cl) {
+    return haveSeenAllExp<caret>ectedAtCl(cl);
+  }
+
+  private boolean haveSeenAllExpectedAtCl(int cl) {
+    return cl == cl();
+  }
+
+  int cl() {
+    return 0;
+  }
+}

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;
+  }
+}

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);