MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 02:09:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

anonym -> lambda: check inferred type in the same context (IDEA-150947)

Browse Source
This commit is contained in:
Anna Kozlova
2016-01-28 18:41:00 +03:00
parent d80954316c
commit 62bdd90f58
3 changed files with 57 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java
View File

@@ -134,7 +134,7 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
return checker.hasForbiddenRefs();
}
private static PsiType getInferredType(PsiAnonymousClass aClass) {
private static PsiType getInferredType(PsiAnonymousClass aClass, PsiMethod method) {
final PsiExpression expression = (PsiExpression)aClass.getParent();
final PsiType psiType = PsiTypesUtil.getExpectedTypeByParent(expression);
if (psiType != null) {
@@ -151,35 +151,18 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
PsiExpressionList expressionList = (PsiExpressionList)parent;
final PsiElement callExpr = expressionList.getParent();
if (callExpr instanceof PsiCallExpression) {
final JavaResolveResult result = ((PsiCallExpression)callExpr).resolveMethodGenerics();
if (result instanceof MethodCandidateInfo) {
final PsiMethod method = ((MethodCandidateInfo)result).getElement();
PsiExpression[] expressions = expressionList.getExpressions();
int i = ArrayUtilRt.find(expressions, topExpr);
if (i < 0) return null;
expressions[i] = null;
final PsiParameter[] parameters = method.getParameterList().getParameters();
final PsiSubstitutor substitutor = PsiResolveHelper.SERVICE.getInstance(aClass.getProject())
.inferTypeArguments(method.getTypeParameters(), parameters, expressions,
((MethodCandidateInfo)result).getSiteSubstitutor(), callExpr.getParent(),
DefaultParameterTypeInferencePolicy.INSTANCE);
PsiType paramType;
if (i < parameters.length) {
paramType = parameters[i].getType();
}
else if (parameters.length > 0) {
paramType = parameters[parameters.length - 1].getType();
if (!(paramType instanceof PsiEllipsisType)) {
return null;
}
paramType = ((PsiEllipsisType)paramType).getComponentType();
}
else {
return null;
}
return substitutor.substitute(paramType);
PsiExpression[] expressions = expressionList.getExpressions();
int i = ArrayUtilRt.find(expressions, topExpr);
if (i < 0) return null;
final PsiCallExpression copy = (PsiCallExpression)callExpr.copy();
final PsiExpressionList argumentList = copy.getArgumentList();
if (argumentList != null) {
final PsiExpression classArg = argumentList.getExpressions()[i];
PsiExpression lambda = JavaPsiFacade.getElementFactory(aClass.getProject())
.createExpressionFromText(ReplaceWithLambdaFix.composeLambdaText(method), expression);
lambda = (PsiExpression)classArg.replace(lambda);
((PsiLambdaExpression)lambda).getBody().replace(method.getBody());
return LambdaUtil.getFunctionalInterfaceType(lambda, true);
}
}
}
@@ -224,7 +207,6 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
if (anonymousClass == null) return null;
ChangeContextUtil.encodeContextInfo(anonymousClass, true);
final PsiElement lambdaContext = anonymousClass.getParent().getParent();
final String canonicalText = anonymousClass.getBaseClassType().getCanonicalText();
final PsiMethod method;
@@ -438,7 +420,7 @@ public class AnonymousCanBeLambdaInspection extends BaseJavaBatchLocalInspection
PsiAnonymousClass aClass) {
myMethod = method;
myAnonymClass = aClass;
final PsiType inferredType = FunctionalInterfaceParameterizationUtil.getGroundTargetType(getInferredType(aClass));
final PsiType inferredType = FunctionalInterfaceParameterizationUtil.getGroundTargetType(getInferredType(aClass, method));
final PsiClassType baseClassType = aClass.getBaseClassType();
myInferredType = !baseClassType.equals(inferredType) ? inferredType : null;
}

19
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/afterInferredFromParentContextCall.java Normal file
View File

@@ -0,0 +1,19 @@
// "Replace with lambda" "true"
import java.util.function.*;
class Test {
public static Promise<Integer> some() {
return PromiseUtils.compose(
new Promise<String>(),
v -> new Promise<Long>(),
result -> 0);
}
}
class Promise<T> {}
class PromiseUtils {
public static <A, B, C> Promise<C> compose(Promise<A> aPromise, Function<A, Promise<B>> abTransform, Function<B, C> resultTransform) {
return null;
}
}

24
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/anonymous2lambda/beforeInferredFromParentContextCall.java Normal file
View File

@@ -0,0 +1,24 @@
// "Replace with lambda" "true"
import java.util.function.*;
class Test {
public static Promise<Integer> some() {
return PromiseUtils.compose(
new Promise<String>(),
v -> new Promise<Long>(),
new Funct<caret>ion<Long, Integer>() {
@Override
public Integer apply(Long result) {
return 0;
}
});
}
}
class Promise<T> {}
class PromiseUtils {
public static <A, B, C> Promise<C> compose(Promise<A> aPromise, Function<A, Promise<B>> abTransform, Function<B, C> resultTransform) {
return null;
}
}