MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

inference: skip constraints and everything dependant above overload resolution

Browse Source
This commit is contained in:
Anna.Kozlova
2018-11-15 16:31:25 +01:00
parent 7f09661d00
commit 8b768f2e94
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+2 -7
View File
@@ -412,12 +412,8 @@ public class InferenceSession {
final PsiSubstitutor nestedSubstitutor = myInferenceSessionContainer.findNestedSubstitutor(arg, myInferenceSubstitution);
final PsiType parameterType = nestedSubstitutor.substitute(getParameterType(parameters, i, siteSubstitutor, varargs));
if (!isPertinentToApplicability(arg, parentMethod)) {
if (arg instanceof PsiLambdaExpression && ignoreConstraintTree(ignoredConstraints, arg, parameterType)) {
continue;
}
ExpressionCompatibilityConstraint compatibilityConstraint = new ExpressionCompatibilityConstraint(arg, parameterType);
if (dependsOnIgnoredConstraint(ignoredConstraints, compatibilityConstraint)) {
if (arg instanceof PsiLambdaExpression && ignoreConstraintTree(arg) || dependsOnIgnoredConstraint(ignoredConstraints, compatibilityConstraint)) {
ignoredConstraints.add(compatibilityConstraint);
continue;
}
@@ -461,7 +457,7 @@ public class InferenceSession {
return false;
}
private static boolean ignoreConstraintTree(Set<? super ConstraintFormula> ignoredConstraints, PsiExpression arg, PsiType parameterType) {
private static boolean ignoreConstraintTree(PsiExpression arg) {
for (Object expr : MethodCandidateInfo.ourOverloadGuard.currentStack()) {
if (PsiTreeUtil.getParentOfType((PsiElement)expr, PsiLambdaExpression.class) == arg) {
return true;
@@ -470,7 +466,6 @@ public class InferenceSession {
for (Object expr : LambdaUtil.ourParameterGuard.currentStack()) {
if (expr instanceof PsiParameter && ((PsiParameter)expr).getDeclarationScope() == arg) {
ignoredConstraints.add(new ExpressionCompatibilityConstraint(arg, parameterType));
return true;
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/expressions/LambdaParameterDeterminesNeighbourLambdaType.java
+2 -3
View File
@@ -10,9 +10,8 @@ class TestClass {
}
class A {
static B getB(A a) {
return null;
}
static B getB(A a) { return null; }
static B getB(String a) { return null; }
}
interface B {