[java-highlighting] Better call type mismatch reporting

GitOrigin-RevId: 1f7240ef2cdad17d78aa0f691b1b5ce3108293b3

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

@@ -12,6 +12,7 @@ import com.intellij.codeInsight.intention.QuickFixFactory;
 import com.intellij.codeInsight.intention.impl.PriorityIntentionActionWrapper;
 import com.intellij.codeInsight.quickfix.UnresolvedReferenceQuickFixProvider;
 import com.intellij.codeInspection.LocalQuickFixOnPsiElementAsIntentionAdapter;
+import com.intellij.core.JavaPsiBundle;
 import com.intellij.java.analysis.JavaAnalysisBundle;
 import com.intellij.lang.jvm.JvmModifier;
 import com.intellij.lang.jvm.actions.JvmElementActionFactories;
@@ -573,6 +574,7 @@ public final class HighlightMethodUtil {
                                                            @NotNull PsiElement elementToHighlight) {
     String errorMessage = resolveResult.getInferenceErrorMessage();
     if (errorMessage == null) return null;
+    if (favorParentReport(methodCall, errorMessage)) return null;
     PsiMethod method = resolveResult.getElement();
     HighlightInfo highlightInfo;
     PsiType expectedTypeByParent = InferenceSession.getTargetTypeByParent(methodCall);
@@ -598,6 +600,25 @@ public final class HighlightMethodUtil {
     return highlightInfo;
   }
 
+  private static boolean favorParentReport(@NotNull PsiCall methodCall, String errorMessage) {
+    if (errorMessage.equals(JavaPsiBundle.message("error.incompatible.type.failed.to.resolve.argument"))) {
+      PsiElement parent = PsiUtil.skipParenthesizedExprUp(methodCall.getParent());
+      if (parent instanceof PsiExpressionList) {
+        PsiElement grandParent = parent.getParent();
+        if (grandParent instanceof PsiCallExpression) {
+          JavaResolveResult parentResolveResult = ((PsiCallExpression)grandParent).resolveMethodGenerics();
+          if (parentResolveResult instanceof MethodCandidateInfo &&
+              ((MethodCandidateInfo)parentResolveResult).getInferenceErrorMessage() != null) {
+            // Parent resolve failed as well, and it's likely more informative.
+            // Suppress this error to allow reporting from parent
+            return true;
+          }
+        }
+      }
+    }
+    return false;
+  }
+
   private static void registerUsageFixes(@NotNull PsiMethodCallExpression methodCall,
                                          @Nullable HighlightInfo highlightInfo,
                                          @NotNull TextRange range) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting11/ComplexStreamTypeMismatch.java

@@ -1,9 +1,15 @@
+import java.io.File;
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 public class Demo {
+  Map<Path, Long> fileSizes(List<File> files) {
+    return <error descr="Incompatible types. Found: 'java.util.Map<java.io.File,java.lang.Long>', required: 'java.util.Map<java.nio.file.Path,java.lang.Long>'">files.stream().collect(Collectors.toMap(f -> f, f -> f.length()));</error>
+  }
+
   void test() {
     Map<Long, List<String>> collect = <error descr="Incompatible types. Found: 'java.util.Map<java.lang.Integer,java.util.List<java.lang.String>>', required: 'java.util.Map<java.lang.Long,java.util.List<java.lang.String>>'">Stream.of("xyz", "asfdasdfdasf", "dasfafasdfdf")
       .collect(Collectors.groupingBy(s -> s.length()));</error>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting8/StreamGroupingBy.java

@@ -0,0 +1,11 @@
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public class StreamFilter {
+  void test() {
+    Map<Long, List<String>> collect = Stream.of("xyz", "asfdasdfdasf", "dasfafasdfdf")
+      .collect(Collectors.groupingBy(s -> s.length()));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/patchMethodParams/afterToMap2.java

@@ -0,0 +1,13 @@
+// "Adapt lambda return using 'toPath()'" "true-preview"
+import java.io.File;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class Demo {
+  Map<Path, Long> fileSizes(List<File> files) {
+    return files.stream().collect(Collectors.toMap(f -> f.toPath(), f -> f.length()));
+  }
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/patchMethodParams/beforeToMap2.java

@@ -0,0 +1,13 @@
+// "Adapt lambda return using 'toPath()'" "true-preview"
+import java.io.File;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class Demo {
+  Map<Path, Long> fileSizes(List<File> files) {
+    return files.stream().<caret>collect(Collectors.toMap(f -> f, f -> f.length()));
+  }
+}

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

@@ -32,7 +32,6 @@ public class LightAdvHighlightingJdk8Test extends LightDaemonAnalyzerTestCase {
   public void testUncheckedWarningForPolyConditional() { enableInspectionTool(new UncheckedWarningLocalInspection()); doTest(true, true); }
   public void testUncheckedWarningOnQualifierWithTypeParameterType() { enableInspectionTool(new UncheckedWarningLocalInspection()); doTest(true, true); }
   public void testLambdaExpressions() { doTest(false, true); }
-  public void testComplexStreamTypeMismatch() { doTest(false, false);}
   public void testUnsupportedFeatures() { doTest(false, false); }
   public void testModulesNotSupported() { doTest(false, false); }
 

java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/LightJava11HighlightingTest.kt

@@ -34,6 +34,10 @@ class LightJava11HighlightingTest : LightJavaCodeInsightFixtureTestCase() {
     doTest()
   }
 
+  fun testComplexStreamTypeMismatch() {
+    doTest()
+  }
+
   fun testJavaShebang() {
     val file = myFixture.configureByText("hello",
                                          """#!/path/to/java