new overload resolution: avoid second conflict resolution for the same conflicts, e.g. because resulted array would be available inside guard of ResolveCache (IDEA-138596)

java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java

@@ -71,6 +71,15 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
 
   @Override
   public final CandidateInfo resolveConflict(@NotNull final List<CandidateInfo> conflicts){
+    final MethodCandidateInfo.CurrentCandidateProperties properties = MethodCandidateInfo.getCurrentMethod(myArgumentsList);
+    if (properties != null) {
+      final PsiMethod method = properties.getMethod();
+      for (CandidateInfo conflict : conflicts) {
+        if (conflict.getElement() == method) {
+          return conflict;
+        }
+      }
+    }
     return MethodCandidateInfo.ourOverloadGuard.doPreventingRecursion(myArgumentsList, true, new Computable<CandidateInfo>() {
       @Override
       public CandidateInfo compute() {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/expressions/SecondConflictResolutionOnSameMethodCall.java

@@ -0,0 +1,16 @@
+import java.util.Arrays;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+class CommandTest {
+
+    public static class Command {
+        public String[] getKeywords() { return new String[] {"GET", "PUT", "POST"}; }
+        public String getDescription() { return "Some HTTP command"; }
+    }
+
+
+    public static void main(Stream<Command> stream) {
+        stream.map(cmd -> Arrays.stream(cmd.getKeywords()).map(key -> String.format("%s -> %s", key, cmd.getDescription()))).flatMap(Function.identity());
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.daemon.lambda;
+
+import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.psi.PsiMethodCallExpression;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.testFramework.IdeaTestUtil;
+import org.jetbrains.annotations.NonNls;
+
+import java.util.Collection;
+
+public class Java8ExpressionsCheckTest extends LightDaemonAnalyzerTestCase {
+  @NonNls static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/lambda/expressions";
+
+  public void testSecondConflictResolutionOnSameMethodCall() throws Exception {
+    doTestAllMethodCallExpressions();
+  }
+
+  private void doTestAllMethodCallExpressions() {
+    configureByFile(BASE_PATH + "/" + getTestName(false) + ".java");
+    final Collection<PsiMethodCallExpression> methodCallExpressions = PsiTreeUtil.findChildrenOfType(getFile(), PsiMethodCallExpression.class);
+    for (PsiMethodCallExpression expression : methodCallExpressions) {
+      getPsiManager().dropResolveCaches();
+      assertNotNull("Failed inference for: " + expression.getText(), expression.getType());
+    }
+  }
+
+  @Override
+  protected Sdk getProjectJDK() {
+    return IdeaTestUtil.getMockJdk18();
+  }
+}