IDEA-157893 Autocompletion should not use static import in case of conflict

java/java-impl/src/com/intellij/codeInsight/completion/JavaStaticMemberProcessor.java

@@ -51,6 +51,12 @@ public class JavaStaticMemberProcessor extends StaticMemberProcessor {
   protected LookupElement createLookupElement(@NotNull PsiMember member, @NotNull final PsiClass containingClass, boolean shouldImport) {
     shouldImport |= myOriginalPosition != null && PsiTreeUtil.isAncestor(containingClass, myOriginalPosition, false);
 
+    String exprText = member.getName() + (member instanceof PsiMethod ? "()" : "");
+    PsiReference ref = JavaPsiFacade.getElementFactory(member.getProject()).createExpressionFromText(exprText, myOriginalPosition).findReferenceAt(0);
+    if (ref instanceof PsiReferenceExpression && ((PsiReferenceExpression)ref).multiResolve(true).length > 0) {
+      shouldImport = false;
+    }
+
     if (member instanceof PsiMethod) {
       return AutoCompletionPolicy.NEVER_AUTOCOMPLETE.applyPolicy(new GlobalMethodCallElement((PsiMethod)member, shouldImport, false));
     }

java/java-tests/testData/codeInsight/completion/normal/SuggestMembersOfStaticallyImportedClassesConflictWithLocalField.java

@@ -0,0 +1,10 @@
+import static foo.Foo.foo;
+
+class Bar {
+  {
+    System.out.println(foo);
+    System.out.println(ba<caret>x);
+  }
+
+  int bar = 42;
+}

java/java-tests/testData/codeInsight/completion/normal/SuggestMembersOfStaticallyImportedClassesConflictWithLocalField_after.java

@@ -0,0 +1,12 @@
+import foo.Foo;
+
+import static foo.Foo.foo;
+
+class Bar {
+  {
+    System.out.println(foo);
+    System.out.println(Foo.bar<caret>);
+  }
+
+  int bar = 42;
+}

java/java-tests/testData/codeInsight/completion/normal/SuggestMembersOfStaticallyImportedClassesConflictWithLocalMethod.java

@@ -0,0 +1,10 @@
+import static foo.Foo.foo;
+
+class Bar {
+  {
+    foo();
+    ba<caret>x
+  }
+
+  void bar();
+}

java/java-tests/testData/codeInsight/completion/normal/SuggestMembersOfStaticallyImportedClassesConflictWithLocalMethod_after.java

@@ -0,0 +1,12 @@
+import foo.Foo;
+
+import static foo.Foo.foo;
+
+class Bar {
+  {
+    foo();
+    Foo.bar();<caret>
+  }
+
+  void bar();
+}

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy

@@ -1219,6 +1219,35 @@ public class ListUtils {
     checkResult()
   }
 
+  void testSuggestMembersOfStaticallyImportedClassesConflictWithLocalMethod() throws Exception {
+    myFixture.addClass("""package foo;
+    public class Foo {
+      public static void foo() {}
+      public static void bar() {}
+    }
+    """)
+    configure()
+    myFixture.assertPreferredCompletionItems 0, 'bar', 'bar'
+    assert LookupElementPresentation.renderElement(myFixture.lookupElements[1]).itemText == 'Foo.bar'
+    myFixture.lookup.currentItem = myFixture.lookupElements[1]
+    myFixture.type '\t'
+    checkResult()
+  }
+
+  void testSuggestMembersOfStaticallyImportedClassesConflictWithLocalField() throws Exception {
+    myFixture.addClass("""package foo;
+    public class Foo {
+      public static int foo = 1;
+      public static int bar = 2;
+    }
+    """)
+    configure()
+    myFixture.assertPreferredCompletionItems 0, 'bar', 'Foo.bar'
+    myFixture.lookup.currentItem = myFixture.lookupElements[1]
+    myFixture.type '\t'
+    checkResult()
+  }
+
   void testInstanceMagicMethod() throws Exception { doTest() }
 
   void testNoDotOverwrite() throws Exception { doTest('.') }