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

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