IDEA-68684 Extra parenthesis and semicolon in inserted by smart completion of array type initializer in some cases

java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java

@@ -959,11 +959,10 @@ public class ExpectedTypesProvider {
 
     private static TailType getMethodArgumentTailType(final PsiExpression argument, final int index, final PsiMethod method, final PsiSubstitutor substitutor,
                                                final PsiParameter[] params) {
-      if (index >= params.length) {
+      if (index >= params.length || index == params.length - 2 && params[index + 1].isVarArgs()) {
         return TailType.NONE;
       }
-      if (index == params.length - 1 || index == params.length - 2 && params[index + 1].isVarArgs()) {
-        //myTailType = CompletionUtil.NONE_TAIL;
+      if (index == params.length - 1) {
         final PsiElement call = argument.getParent().getParent();
         if (call instanceof JspMethodCall) return TailType.NONE;
 

java/java-tests/testData/codeInsight/completion/smartType/ArrayInitializerBeforeVarargs-out.java

@@ -0,0 +1,5 @@
+class Super {
+  void foo(String[] params, int... indices) {
+      foo(new String[<caret>], 0);
+    }
+}

java/java-tests/testData/codeInsight/completion/smartType/ArrayInitializerBeforeVarargs.java

@@ -0,0 +1,5 @@
+class Super {
+  void foo(String[] params, int... indices) {
+      foo(new <caret>, 0);
+    }
+}

java/java-tests/testData/codeInsight/completion/smartType/NoCommaBeforeVarargs-out.java

@@ -2,7 +2,7 @@ class Foooo {
     int bar(int a, Object... varargs) {}
 
     int foo() {
-        bar(hashCode())<caret>;
+        bar(hashCode()<caret>);
     }
 
 }

java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java

@@ -1010,6 +1010,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
     doItemTest();
   }
 
+  public void testArrayInitializerBeforeVarargs() throws Throwable { doTest(); }
   public void testInheritorMembers() throws Throwable { doTest(); }
   public void testInheritorEnumMembers() throws Throwable { doTest(); }
   public void testDuplicateMembersFromSuperClass() throws Throwable { doTest(); }