diamonds: should check raw types when error occurs before inference is even started (IDEA-74053)

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

@@ -121,11 +121,11 @@ public class GenericsHighlightUtil {
           return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, referenceElements[0], "Diamond operator is not applicable for non-parameterized types");
         }
         inferenceResult = ((PsiDiamondType)referenceElements[0].getType()).resolveInferredTypes();
-        final PsiType expectedType = detectExpectedType(referenceParameterList);
-        if (!(expectedType instanceof PsiClassType && ((PsiClassType)expectedType).isRaw())) {
-          final String errorMessage = inferenceResult.getErrorMessage();
-          if (errorMessage != null) {
-           return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, referenceElements[0], errorMessage);
+        final String errorMessage = inferenceResult.getErrorMessage();
+        if (errorMessage != null) {
+          final PsiType expectedType = detectExpectedType(referenceParameterList);
+          if (!(inferenceResult.failedToInfer() && expectedType instanceof PsiClassType && ((PsiClassType)expectedType).isRaw())) {
+            return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, referenceElements[0], errorMessage);
           }
         }
       }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/DiamondMisc.java

@@ -171,4 +171,13 @@ class TestWildcardInference {
       A<? extends Number> y = new B<>(x);
     }
   }
-}
+}
+
+class PredefinedErrorsOverRaw<T> {
+  <U> PredefinedErrorsOverRaw(T t) {
+  }
+
+  void test() {
+    PredefinedErrorsOverRaw mc = new <Boolean>PredefinedErrorsOverRaw<<error descr="Cannot use diamonds with explicit type parameters for constructor"></error>>("");
+  }
+}

java/openapi/src/com/intellij/psi/PsiDiamondType.java

@@ -313,6 +313,10 @@ public class PsiDiamondType extends PsiType {
     public String getErrorMessage() {
       return myErrorMessage;
     }
+    
+    public boolean failedToInfer() {
+      return myErrorMessage != null;
+    }
 
     public void addInferredType(PsiType psiType) {
       if (myErrorMessage != null) return;