IDEA-120636 Wrong "enum cannot be instantiated"

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java

@@ -715,7 +715,7 @@ public class GenericsHighlightUtil {
 
   @Nullable
   public static HighlightInfo checkEnumInstantiation(PsiNewExpression expression, PsiClass aClass) {
-    if (aClass != null && aClass.isEnum()) {
+    if (aClass != null && aClass.isEnum() && expression.getArrayDimensions().length == 0 && expression.getArrayInitializer() == null) {
       String description = JavaErrorMessages.message("enum.types.cannot.be.instantiated");
       return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(expression).descriptionAndTooltip(description).create();
     }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/EnumInitializers.java

@@ -0,0 +1,16 @@
+import java.util.*;
+public class MyEnum {
+
+  enum Test {A,B}
+
+  public static Test[] accepted1() {
+    List<Test> list = new ArrayList<Test>();
+    return list.toArray(new Test[list.size()]);
+  }
+
+  public static Test[] accepted2() {
+    return new Test[]{};
+  }
+
+  Test t = <error descr="Enum types cannot be instantiated">new Test()</error>;
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk6Test.java

@@ -61,4 +61,5 @@ public class LightAdvHighlightingJdk6Test extends LightDaemonAnalyzerTestCase {
   public void testUnhandledExceptions() { doTest(true, false); }
   public void testUnhandledExceptionsValueOf() { doTest(true, false); }
   public void testUnsupportedFeatures7() { doTest(false, false); }
+  public void testEnumInitializers() { doTest(false, false); }
 }