diamonds: simulate resolved constructor with generated static factory (IDEA-195813)

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

@@ -1712,8 +1712,18 @@ public class HighlightMethodUtil {
       try {
         final PsiDiamondType diamondType = constructorCall instanceof PsiNewExpression ? PsiDiamondType.getDiamondType((PsiNewExpression)constructorCall) : null;
         final JavaResolveResult staticFactory = diamondType != null ? diamondType.getStaticFactory() : null;
-        applicable = staticFactory instanceof MethodCandidateInfo ? ((MethodCandidateInfo)staticFactory).isApplicable()
-                                                                  : result != null && result.isApplicable();
+        if (staticFactory instanceof MethodCandidateInfo) {
+          if (((MethodCandidateInfo)staticFactory).isApplicable()) {
+            result = (MethodCandidateInfo)staticFactory;
+            constructor = ((MethodCandidateInfo)staticFactory).getElement();
+          }
+          else {
+            applicable = false;
+          }
+        } 
+        else {
+          applicable = result != null && result.isApplicable();
+        }
       }
       catch (IndexNotReadyException e) {
         // ignore

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/diamond/OverloadedConstructorsUnresolvedWithoutDiamonds.java

@@ -0,0 +1,17 @@
+import java.util.function.Supplier;
+
+class Foo {
+    private final Singleton<B> singletonB = new Singleton<>(() -> f());
+    static B f() {
+        return null;
+    }
+}
+
+interface B {
+    String getData();
+}
+
+class Singleton<T>  {
+    public Singleton(Supplier<T> supplier) { }
+    public Singleton(T instance) { }
+}

java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/lambda/Diamond8HighlightingTest.java

@@ -101,6 +101,10 @@ public class Diamond8HighlightingTest extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testOverloadedConstructorsUnresolvedWithoutDiamonds() {
+    doTest();
+  }
+
   private void doTest() {
     doTest(BASE_PATH + "/" + getTestName(false) + ".java", false, false);
   }