IDEA-175672 Duplicate "new char[]" suggestions

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

@@ -308,12 +308,24 @@ public class JavaCompletionContributor extends CompletionContributor {
 
     if (JavaSmartCompletionContributor.AFTER_NEW.accepts(position)) {
       session.flushBatchItems();
-      new JavaInheritorsGetter(ConstructorInsertHandler.BASIC_INSTANCE).generateVariants(parameters, matcher, session::addClassItem);
+      new JavaInheritorsGetter(ConstructorInsertHandler.BASIC_INSTANCE).generateVariants(parameters, matcher, lookupElement -> {
+        if (!isSuggestedByKeywordCompletion(lookupElement)) {
+          session.addClassItem(lookupElement);
+        }
+      });
     }
 
     suggestSmartCast(parameters, session, false, result);
   }
 
+  private static boolean isSuggestedByKeywordCompletion(LookupElement lookupElement) {
+    if (lookupElement instanceof PsiTypeLookupItem) {
+      PsiType type = ((PsiTypeLookupItem)lookupElement).getType();
+      return type instanceof PsiArrayType && ((PsiArrayType)type).getComponentType() instanceof PsiPrimitiveType;
+    }
+    return false;
+  }
+
   private static void suggestSmartCast(CompletionParameters parameters, JavaCompletionSession session, boolean quick, Consumer<LookupElement> result) {
     if (SmartCastProvider.shouldSuggestCast(parameters)) {
       session.flushBatchItems();

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

@@ -0,0 +1,5 @@
+class Foo {
+    {
+        char[] cc = new cha<caret>x
+    }
+}

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

@@ -1,5 +1,5 @@
 public class Bar {
     {
-        int[] a = new in<caret>
+        int[] a = new in<caret>x
     }
 }

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

@@ -1,5 +1,5 @@
 public class Bar {
     {
-        int[] a = new int[<caret>]
+        int[] a = new int[<caret>]x
     }
 }

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

@@ -683,6 +683,11 @@ public class ListUtils {
     assert myFixture.lookupElementStrings == ['void']
   }
 
+  void testNoExpectedArrayTypeDuplication() {
+    configure()
+    assert myFixture.lookupElementStrings == ['char']
+  }
+
   void testMethodReturnType() throws Throwable {
     doTest()
   }