new HashMap<

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

@@ -102,6 +102,10 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
                                           LookupItem delegate,
                                           final PsiClass psiClass,
                                           final boolean forAnonymous) {
+    if (context.getCompletionChar() == '[') {
+      return false;
+    }
+
     final PsiElement place = context.getFile().findElementAt(context.getStartOffset());
     final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(context.getProject()).getResolveHelper();
     assert place != null;
@@ -114,7 +118,16 @@ class ConstructorInsertHandler implements InsertHandler<LookupElementDecorator<L
       }
     }
 
+    int identifierEnd = context.getTailOffset();
+
     JavaCompletionUtil.insertParentheses(context, delegate, false, hasParams, forAnonymous);
+
+    if (context.getCompletionChar() == '<') {
+      context.getDocument().insertString(identifierEnd, "<>");
+      context.setAddCompletionChar(false);
+      context.getEditor().getCaretModel().moveToOffset(identifierEnd + 1);
+    }
+
     return hasParams;
   }
 

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

@@ -0,0 +1,9 @@
+class Zooooooo<T> { }
+class Zooooooz<T> { }
+
+
+class Bar {
+  {
+    new Zoooo<caret>
+  }
+}

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

@@ -0,0 +1,9 @@
+class Zooooooo<T> { }
+class Zooooooz<T> { }
+
+
+class Bar {
+  {
+    new Zooooooo<<caret>>()
+  }
+}

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

@@ -0,0 +1,9 @@
+class Zooooooo<T> { }
+class Zooooooz<T> { }
+
+
+class Bar {
+  {
+    new Zoooo<caret>
+  }
+}

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

@@ -0,0 +1,9 @@
+class Zooooooo<T> { }
+class Zooooooz<T> { }
+
+
+class Bar {
+  {
+    new Zooooooo[<caret>]
+  }
+}

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

@@ -900,6 +900,9 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
 
   public void testStaticInnerExtendingOuter() throws Exception { doTest() }
 
+  public void testNewClassAngleBracket() throws Exception { doTest('<') }
+  public void testNewClassSquareBracket() throws Exception { doTest('[') }
+
   public void testNoMethodsInParameterType() {
     configure()
     assertOrderedEquals myFixture.lookupElementStrings, "final", "float"

plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyClassNameInsertHandler.java

@@ -76,8 +76,16 @@ public class GroovyClassNameInsertHandler implements InsertHandler<JavaPsiClassR
     }
     AllClassesGetter.TRY_SHORTENING.handleInsert(context, item);
 
-    if (parens) {
+    if (parens && context.getCompletionChar() != '[') {
+      int identifierEnd = context.getTailOffset();
+
       JavaCompletionUtil.insertParentheses(context, item, false, GroovyCompletionUtil.hasConstructorParameters(psiClass));
+
+      if (context.getCompletionChar() == '<') {
+        context.getDocument().insertString(identifierEnd, "<>");
+        context.setAddCompletionChar(false);
+        context.getEditor().getCaretModel().moveToOffset(identifierEnd + 1);
+      }
     }
 
   }

plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy

@@ -617,6 +617,11 @@ return foo()"""
     checkCompletion("Abcd<caret>", '[', "AbcdClass[<caret>]")
   }
 
+  public void testFinishClassNameWithSquareBracketAfterNew() {
+    myFixture.addClass("class AbcdClass {}; class AbcdeClass {}")
+    checkCompletion("new Abcd<caret>", '[', "new AbcdClass[<caret>]")
+  }
+
   public void testFinishMethodNameWithSquareBracket() {
     myFixture.addClass("""class AbcdClass {
       static int[] foo(int x){}
@@ -634,4 +639,9 @@ return foo()"""
     checkCompletion("Abcd<caret>", '<', "AbcdClass<<caret>>")
   }
 
+  public void testFinishClassNameWithLtAfterNew() {
+    myFixture.addClass("class AbcdClass<T> {}; class AbcdeClass {}")
+    checkCompletion("new Abcd<caret>", '<', "new AbcdClass<<caret>>()")
+  }
+
 }