qualify statically imported methods if they conflict with local members (IDEA-156273)

java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java

@@ -24,7 +24,6 @@ import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.Processor;
 import com.intellij.util.containers.HashSet;
 
 import java.util.ArrayList;
@@ -150,11 +149,23 @@ public abstract class RenameJavaMemberProcessor extends RenamePsiElementProcesso
     }
   }
 
-  protected static void findCollisionsAgainstNewName(final PsiMember memberToRename, final String newName, final List<? super MemberHidesStaticImportUsageInfo> result) {
+  protected static void findCollisionsAgainstNewName(final PsiMember memberToRename, final String newName, final List<UsageInfo> result) {
     if (!memberToRename.isPhysical()) {
       return;
     }
+
+    final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(memberToRename.getProject());
     final List<PsiReference> potentialConflicts = new ArrayList<PsiReference>();
+    for (UsageInfo info : result) {
+      final PsiElement element = info.getElement();
+      if (element instanceof PsiReferenceExpression) {
+        if (((PsiReferenceExpression)element).advancedResolve(false).getCurrentFileResolveScope() instanceof PsiImportStaticStatement &&
+            referencesLocalMember(memberToRename, newName, elementFactory, element)) {
+          potentialConflicts.add(info.getReference());
+        }
+      }
+    }
+
     final PsiFile containingFile = memberToRename.getContainingFile();
     if (containingFile instanceof PsiJavaFile) {
       final PsiImportList importList = ((PsiJavaFile)containingFile).getImportList();
@@ -206,6 +217,21 @@ public abstract class RenameJavaMemberProcessor extends RenamePsiElementProcesso
     }
   }
 
+  private static boolean referencesLocalMember(PsiMember memberToRename,
+                                               String newName,
+                                               PsiElementFactory elementFactory,
+                                               PsiElement context) {
+    if (memberToRename instanceof PsiField) {
+      return ((PsiReferenceExpression)elementFactory.createExpressionFromText(newName, context)).resolve() != null;
+    }
+
+    if (memberToRename instanceof PsiMethod) {
+      final PsiMethodCallExpression callExpression = (PsiMethodCallExpression)elementFactory.createExpressionFromText(newName + "()", context);
+      return callExpression.getMethodExpression().multiResolve(false).length > 0;
+    }
+    return false;
+  }
+
   protected static void qualifyStaticImportReferences(final List<MemberHidesStaticImportUsageInfo> staticImportHides)
       throws IncorrectOperationException {
     for (MemberHidesStaticImportUsageInfo info : staticImportHides) {

java/java-tests/testData/refactoring/renameMethod/multi/expandStaticImportToAvoidConflictingResolve/after/bar/Bar.java

@@ -0,0 +1,6 @@
+package bar;
+public class Bar {
+  public static Object bar() {
+    return new Object();
+  }
+}

java/java-tests/testData/refactoring/renameMethod/multi/expandStaticImportToAvoidConflictingResolve/after/foo/Foo.java

@@ -0,0 +1,8 @@
+package foo;
+import bar.Bar;
+
+public class Foo {
+    protected static Object bar() {
+        return Bar.bar();
+    }
+}

java/java-tests/testData/refactoring/renameMethod/multi/expandStaticImportToAvoidConflictingResolve/after/foo/Foo1.java

@@ -0,0 +1,10 @@
+package foo;
+import bar.Bar;
+
+public class Foo {
+    protected static Object bar(int i) {
+        return Bar.bar();
+    }
+
+    static void bar(int i, int j) {}
+}

java/java-tests/testData/refactoring/renameMethod/multi/expandStaticImportToAvoidConflictingResolve/before/bar/Bar.java

@@ -0,0 +1,6 @@
+package bar;
+public class Bar {
+  public static Object createBar() {
+    return new Object();
+  }
+}

java/java-tests/testData/refactoring/renameMethod/multi/expandStaticImportToAvoidConflictingResolve/before/foo/Foo.java

@@ -0,0 +1,7 @@
+package foo;
+import static bar.Bar.createBar;
+public class Foo {
+    protected static Object bar() {
+        return createBar();
+    }
+}

java/java-tests/testData/refactoring/renameMethod/multi/expandStaticImportToAvoidConflictingResolve/before/foo/Foo1.java

@@ -0,0 +1,9 @@
+package foo;
+import static bar.Bar.createBar;
+public class Foo {
+    protected static Object bar(int i) {
+        return createBar();
+    }
+
+    static void bar(int i, int j) {}
+}

java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java

@@ -97,6 +97,10 @@ public class RenameMethodMultiTest extends MultiFileTestCase {
     doTest("p.Foo", "void foo()", "bar");
   }
 
+  public void testExpandStaticImportToAvoidConflictingResolve() throws Exception {
+    doTest("bar.Bar", "void createBar()", "bar");
+  }
+
   private void doTest(final String methodSignature, final String newName) throws Exception {
     doTest(getTestName(false), methodSignature, newName);
   }