MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

method refs: take conflict subst into account

Browse Source
This commit is contained in:
anna
2012-10-02 18:00:42 +02:00
parent 6bfacbd790
commit 2e4e46f2ab
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
+4 -1
View File
@@ -589,7 +589,10 @@ public class LambdaUtil {
methodReferenceExpression.process(classRef, substRef);
final MethodSignature signature1 = method.getSignature(resolveResult.getSubstitutor());
final MethodSignature signature2 = ((PsiMethod)resolve).getSignature(substRef.get());
PsiSubstitutor subst = PsiSubstitutor.EMPTY;
subst = subst.putAll(result.getSubstitutor());
subst = subst.putAll(substRef.get());
final MethodSignature signature2 = ((PsiMethod)resolve).getSignature(subst);
if (areAcceptable(signature1, signature2, classRef.get(), substRef.get(), ((PsiMethod)resolve).isVarArgs())) return true;
}
}