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

new inference: cheat about isPolyExpression to minimize resolution costs

Browse Source
This commit is contained in:
Anna Kozlova
2014-09-03 16:54:32 +04:00
parent 44253d03be
commit cfebe161e6
1 changed files with 16 additions and 4 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
+16 -4
View File
@@ -278,8 +278,7 @@ public class InferenceSession {
if (arg instanceof PsiCallExpression) {
//If the expression is a poly class instance creation expression (15.9) or a poly method invocation expression (15.12),
//the set contains all constraint formulas that would appear in the set C when determining the poly expression's invocation type.
final JavaResolveResult resolveResult = getMethodResult((PsiCallExpression)arg);
final PsiMethod calledMethod = resolveResult instanceof MethodCandidateInfo ? (PsiMethod)resolveResult.getElement() : null;
final PsiMethod calledMethod = getCalledMethod((PsiCallExpression)arg);
if (PsiPolyExpressionUtil.isMethodCallPolyExpression(arg, calledMethod)) {
collectAdditionalConstraints(additionalConstraints, (PsiCallExpression)arg);
}
@@ -290,6 +289,20 @@ public class InferenceSession {
}
}
private static PsiMethod getCalledMethod(PsiCallExpression arg) {
final PsiExpressionList argumentList = arg.getArgumentList();
if (argumentList == null || argumentList.getExpressions().length == 0) {
return null;
}
MethodCandidateInfo.CurrentCandidateProperties properties = MethodCandidateInfo.getCurrentMethod(argumentList);
if (properties != null) {
return properties.getMethod();
}
final JavaResolveResult resolveResult = getMethodResult(arg);
return resolveResult instanceof MethodCandidateInfo ? (PsiMethod)resolveResult.getElement() : null;
}
private void collectLambdaReturnExpression(Set<ConstraintFormula> additionalConstraints,
PsiLambdaExpression lambdaExpression,
PsiType parameterType) {
@@ -306,8 +319,7 @@ public class InferenceSession {
PsiExpression returnExpression,
PsiType functionalType) {
if (returnExpression instanceof PsiCallExpression) {
final JavaResolveResult resolveResult = getMethodResult((PsiCallExpression)returnExpression);
final PsiMethod calledMethod = resolveResult instanceof MethodCandidateInfo ? (PsiMethod)resolveResult.getElement() : null;
final PsiMethod calledMethod = getCalledMethod((PsiCallExpression)returnExpression);
if (PsiPolyExpressionUtil.isMethodCallPolyExpression(returnExpression, calledMethod)) {
collectAdditionalConstraints(additionalConstraints, (PsiCallExpression)returnExpression);
}