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

graph inference: conditional expressions then/else branches inference based on context (IDEA-100453)

Browse Source
This commit is contained in:
anna
2013-02-11 17:29:53 +01:00
parent b2ffa6a8d1
commit cc9724c489
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
View File

@@ -943,7 +943,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
}
private static Pair<PsiType, ConstraintType> inferMethodTypeParameterFromParent(PsiElement parent,
PsiCallExpression methodCall,
PsiExpression methodCall,
final PsiTypeParameter typeParameter,
PsiSubstitutor substitutor,
ParameterTypeInferencePolicy policy) {
@@ -998,6 +998,10 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
}
} else if (parent instanceof PsiTypeCastExpression) {
expectedType = ((PsiTypeCastExpression)parent).getType();
} else if (parent instanceof PsiConditionalExpression) {
if (PsiUtil.isLanguageLevel8OrHigher(parent)) {
return inferMethodTypeParameterFromParent(parent.getParent(), (PsiExpression)parent, typeParameter, substitutor, policy);
}
}
final PsiManager manager = typeParameter.getManager();
@@ -1005,7 +1009,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
PsiType returnType = null;
if (constraint == null) {
if (expectedType == null) {
expectedType = policy.getDefaultExpectedType(methodCall);
expectedType = methodCall instanceof PsiCallExpression ? policy.getDefaultExpectedType((PsiCallExpression)methodCall) : null;
}
returnType = ((PsiMethod)typeParameter.getOwner()).getReturnType();
@@ -1029,9 +1033,9 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
}
final Pair<PsiType, ConstraintType> result;
if (constraint == null) {
if (constraint == null && methodCall instanceof PsiCallExpression) {
final PsiExpressionList argumentList = methodCall.getArgumentList();
final PsiExpressionList argumentList = ((PsiCallExpression)methodCall).getArgumentList();
if (argumentList != null && preparedKey == null && PsiUtil.getLanguageLevel(argumentList).isAtLeast(LanguageLevel.JDK_1_8)) {
for (PsiExpression expression : argumentList.getExpressions()) {
if (expression instanceof PsiLambdaExpression || expression instanceof PsiMethodReferenceExpression) {
@@ -1089,7 +1093,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
return result;
}
private static Pair<PsiType, ConstraintType> graphInferenceFromCallContext(@NotNull PsiCallExpression methodCall,
private static Pair<PsiType, ConstraintType> graphInferenceFromCallContext(@NotNull PsiExpression methodCall,
@NotNull PsiTypeParameter typeParameter,
@NotNull PsiCallExpression parentCall) {
final PsiExpressionList argumentList = parentCall.getArgumentList();

16
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/ConditionalExpressionsInference.java Normal file
View File

@@ -0,0 +1,16 @@
class Test<U> {
public Optional<U> bar(boolean empty, U state) {
Optional<U> o = empty ? Optional.empty() : Optional.of(state);
return empty ? Optional.empty() : Optional.empty();
}
static class Optional<T> {
public static <U> Optional<U> empty() {
return null;
}
public static <U> Optional<U> of(U state) {
return null;
}
}
}

8
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
View File

@@ -48,6 +48,14 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase
doTest();
}
public void _testChainedInferenceTypeParamsOrderIndependent() throws Exception {
doTest();
}
public void testConditionalExpressionsInference() throws Exception {
doTest();
}
private void doTest() throws Exception {
doTest(false);
}