IDEA-118551 Duplicated enum field in completion

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

@@ -379,7 +379,7 @@ public class JavaCompletionUtil {
           if (isInExcludedPackage((PsiMember)o, true)) {
             continue;
           }
-          mentioned.add((PsiMember)o);
+          mentioned.add(CompletionUtil.getOriginalOrSelf((PsiMember)o));
         }
         set.add(highlightIfNeeded(qualifierType, castQualifier(item, castItem, plainQualifier, processor), o));
       }

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

@@ -0,0 +1,11 @@
+import static C.A.*;
+class C {
+  enum A {Abc}
+
+  public static void main(A a) {
+    switch (a) {
+      case A<caret>
+
+    }
+  }
+}

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

@@ -0,0 +1,11 @@
+import static C.A.*;
+class C {
+  enum A {Abc}
+
+  public static void main(A a) {
+    switch (a) {
+      case Abc:<caret>
+
+    }
+  }
+}

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

@@ -1143,6 +1143,7 @@ class XInternalError {}
     """)
     assertOneElement myFixture.completeBasic()
   }
+  public void testStaticallyImportedFieldsTwiceSwitch() { doTest() }
 
   public void testStatementKeywords() {
     myFixture.configureByText("a.java", """