From 70ef7b8f9a3863b7ba5b5a896bb29a9c3a692a78 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 16 Dec 2014 17:27:37 +0100
Subject: [PATCH] new overload resolution: skip conflict signature checks in
 case of one conflict

---
 .../psi/impl/source/tree/java/MethodReferenceResolver.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
index 703b1287a6c5..950a799f071b 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
@@ -216,8 +216,8 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
     public CandidateInfo resolveConflict(@NotNull List<CandidateInfo> conflicts) {
       if (mySignature == null) return null;
 
-      checkSameSignatures(conflicts);
-      checkAccessStaticLevels(conflicts, true);
+      if (conflicts.size() > 1) checkSameSignatures(conflicts);
+      if (conflicts.size() > 1) checkAccessStaticLevels(conflicts, true);
 
       final PsiType[] argTypes = mySignature.getParameterTypes();
       boolean hasReceiver = PsiMethodReferenceUtil.hasReceiver(argTypes, myQualifierResolveResult, myReferenceExpression);