MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

new inference inside enum constants (IDEA-145211)

Browse Source
This commit is contained in:
Anna Kozlova
2015-09-17 13:40:11 +03:00
parent 5a0bf31a5d
commit 76c7aaf56e
5 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
View File

@@ -192,7 +192,7 @@ public class PsiTypesUtil {
}
@Nullable
public static PsiType getExpectedTypeByParent(PsiExpression methodCall) {
public static PsiType getExpectedTypeByParent(PsiElement methodCall) {
final PsiElement parent = PsiUtil.skipParenthesizedExprUp(methodCall.getParent());
if (parent instanceof PsiVariable) {
if (PsiUtil.checkSameExpression(methodCall, ((PsiVariable)parent).getInitializer())) {

37
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
View File

@@ -156,8 +156,8 @@ public class InferenceSession {
}
private static MethodCandidateInfo.CurrentCandidateProperties getCurrentProperties(PsiElement parent) {
if (parent instanceof PsiCallExpression) {
return MethodCandidateInfo.getCurrentMethod(((PsiCallExpression)parent).getArgumentList());
if (parent instanceof PsiCall) {
return MethodCandidateInfo.getCurrentMethod(((PsiCall)parent).getArgumentList());
}
return null;
}
@@ -269,7 +269,7 @@ public class InferenceSession {
}
if (properties != null && !properties.isApplicabilityCheck()) {
initReturnTypeConstraint(properties.getMethod(), (PsiCallExpression)parent);
initReturnTypeConstraint(properties.getMethod(), (PsiCall)parent);
if (!repeatInferencePhases(true)) {
return prepareSubstitution();
}
@@ -338,12 +338,12 @@ public class InferenceSession {
additionalConstraints.add(new ExpressionCompatibilityConstraint(arg, parameterType));
}
additionalConstraints.add(new CheckedExceptionCompatibilityConstraint(arg, parameterType));
if (arg instanceof PsiCallExpression) {
if (arg instanceof PsiCall) {
//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 PsiMethod calledMethod = getCalledMethod((PsiCallExpression)arg);
final PsiMethod calledMethod = getCalledMethod((PsiCall)arg);
if (calledMethod != null && PsiPolyExpressionUtil.isMethodCallPolyExpression(arg, calledMethod)) {
collectAdditionalConstraints(additionalConstraints, (PsiCallExpression)arg);
collectAdditionalConstraints(additionalConstraints, (PsiCall)arg);
}
}
else if (arg instanceof PsiLambdaExpression &&
@@ -355,7 +355,7 @@ public class InferenceSession {
}
}
private static PsiMethod getCalledMethod(PsiCallExpression arg) {
private static PsiMethod getCalledMethod(PsiCall arg) {
final PsiExpressionList argumentList = arg.getArgumentList();
if (argumentList == null) {
return null;
@@ -408,7 +408,7 @@ public class InferenceSession {
}
private void collectAdditionalConstraints(final Set<ConstraintFormula> additionalConstraints,
final PsiCallExpression callExpression) {
final PsiCall callExpression) {
PsiExpressionList argumentList = callExpression.getArgumentList();
if (argumentList != null) {
final JavaResolveResult result = getMethodResult(callExpression);
@@ -425,7 +425,7 @@ public class InferenceSession {
}
}
private static JavaResolveResult getMethodResult(final PsiCallExpression callExpression) {
private static JavaResolveResult getMethodResult(final PsiCall callExpression) {
final PsiExpressionList argumentList = callExpression.getArgumentList();
final PsiLambdaExpression expression = PsiTreeUtil.getParentOfType(argumentList, PsiLambdaExpression.class);
@@ -442,7 +442,7 @@ public class InferenceSession {
: PsiResolveHelper.ourGraphGuard.doPreventingRecursion(expression, false, computableResolve);
}
public static JavaResolveResult getResolveResult(PsiCallExpression callExpression, PsiExpressionList argumentList) {
public static JavaResolveResult getResolveResult(PsiCall callExpression, PsiExpressionList argumentList) {
if (callExpression instanceof PsiNewExpression) {
final PsiJavaCodeReferenceElement classReference = ((PsiNewExpression)callExpression).getClassOrAnonymousClassReference();
final JavaResolveResult resolveResult = classReference != null ? classReference.advancedResolve(false) : null;
@@ -522,8 +522,9 @@ public class InferenceSession {
return result.toArray(new InferenceVariable[result.size()]);
}
private void initReturnTypeConstraint(PsiMethod method, final PsiCallExpression context) {
if (PsiPolyExpressionUtil.isMethodCallPolyExpression(context, method)) {
private void initReturnTypeConstraint(PsiMethod method, final PsiCall context) {
if (context instanceof PsiCallExpression &&
PsiPolyExpressionUtil.isMethodCallPolyExpression((PsiExpression)context, method)) {
PsiType returnType = method.getReturnType();
if (!PsiType.VOID.equals(returnType) && returnType != null) {
PsiType targetType = getTargetType(context);
@@ -636,7 +637,7 @@ public class InferenceSession {
return false;
}
public static PsiType getTargetType(final PsiExpression context) {
public static PsiType getTargetType(final PsiElement context) {
PsiType targetType = PsiTypesUtil.getExpectedTypeByParent(context);
if (targetType != null) {
return targetType;
@@ -694,7 +695,7 @@ public class InferenceSession {
return null;
}
private static PsiType getTypeByMethod(PsiExpression context,
private static PsiType getTypeByMethod(PsiElement context,
PsiExpressionList argumentList,
PsiElement parentMethod,
boolean varargs,
@@ -1132,7 +1133,7 @@ public class InferenceSession {
Set<ConstraintFormula> additionalConstraints) {
if (formula instanceof ExpressionCompatibilityConstraint) {
final PsiExpression expression = ((ExpressionCompatibilityConstraint)formula).getExpression();
final PsiCallExpression callExpression = PsiTreeUtil.getParentOfType(expression, PsiCallExpression.class, false);
final PsiCall callExpression = PsiTreeUtil.getParentOfType(expression, PsiCall.class, false);
if (callExpression != null) {
final InferenceSession session = myNestedSessions.get(callExpression);
if (session != null) {
@@ -1148,8 +1149,8 @@ public class InferenceSession {
return false;
}
if (myContext instanceof PsiCallExpression) {
PsiExpressionList argumentList = ((PsiCallExpression)myContext).getArgumentList();
if (myContext instanceof PsiCall) {
PsiExpressionList argumentList = ((PsiCall)myContext).getArgumentList();
LOG.assertTrue(argumentList != null);
MethodCandidateInfo.updateSubstitutor(argumentList, substitutor);
}
@@ -1609,7 +1610,7 @@ public class InferenceSession {
}
public InferenceSession findNestedCallSession(PsiExpression arg) {
InferenceSession session = myNestedSessions.get(PsiTreeUtil.getParentOfType(arg, PsiCallExpression.class));
InferenceSession session = myNestedSessions.get(PsiTreeUtil.getParentOfType(arg, PsiCall.class));
if (session == null) {
session = this;
}

8
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/ExpressionCompatibilityConstraint.java
View File

@@ -80,13 +80,13 @@ public class ExpressionCompatibilityConstraint extends InputOutputConstraintForm
return true;
}
if (myExpression instanceof PsiCallExpression) {
final PsiExpressionList argumentList = ((PsiCallExpression)myExpression).getArgumentList();
if (myExpression instanceof PsiCall) {
final PsiExpressionList argumentList = ((PsiCall)myExpression).getArgumentList();
if (argumentList != null) {
final MethodCandidateInfo.CurrentCandidateProperties candidateProperties = MethodCandidateInfo.getCurrentMethod(((PsiCallExpression)myExpression).getArgumentList());
final MethodCandidateInfo.CurrentCandidateProperties candidateProperties = MethodCandidateInfo.getCurrentMethod(((PsiCall)myExpression).getArgumentList());
PsiType returnType = null;
PsiTypeParameter[] typeParams = null;
final JavaResolveResult resolveResult = candidateProperties != null ? null : InferenceSession.getResolveResult((PsiCallExpression)myExpression, argumentList);
final JavaResolveResult resolveResult = candidateProperties != null ? null : InferenceSession.getResolveResult((PsiCall)myExpression, argumentList);
PsiMethod method = null;
if (candidateProperties != null) {
method = candidateProperties.getMethod();

20
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/EnumConstantsAsContext.java Normal file
View File

@@ -0,0 +1,20 @@
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.function.BiFunction;
interface I {
default Optional<AtomicReference<String>> track(final String key) {
return null;
}
}
enum Args {
track(I::track, AtomicReference::get, "", "");
<T, U, V> Args(final BiFunction<I, String, Optional<T>> ctor,
final Function<T, V> unctor, final String oldValue,
final V oldExpected) {
}
}

4
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
View File

@@ -430,6 +430,10 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testEnumConstantsAsContext() throws Exception {
doTest();
}
private void doTest() {
doTest(false);
}