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

predict functional type in assignment context (IDEA-199264)

Browse Source
This commit is contained in:
Anna.Kozlova
2019-01-07 18:45:43 +01:00
parent d7e14d75df
commit 55820ccd15
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java
View File

@@ -29,6 +29,7 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.*;
import com.intellij.util.ArrayUtil;
import com.intellij.util.JavaPsiConstructorUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Stack;
import com.siyeh.ig.psiutils.TypeUtils;
@@ -125,8 +126,9 @@ public class ExpectedTypesProvider {
final boolean voidable, boolean usedAfter) {
if (expr == null) return ExpectedTypeInfo.EMPTY_ARRAY;
PsiElement parent = expr.getParent();
if (expr instanceof PsiFunctionalExpression && parent instanceof PsiExpressionStatement && !(parent.getParent() instanceof PsiSwitchLabeledRuleStatement)) {
final Collection<? extends PsiType> types = FunctionalInterfaceSuggester.suggestFunctionalInterfaces((PsiFunctionalExpression)expr);
PsiFunctionalExpression functionalExpression = extractFunctionalExpression(expr);
if (functionalExpression != null) {
final Collection<? extends PsiType> types = FunctionalInterfaceSuggester.suggestFunctionalInterfaces(functionalExpression);
if (types.isEmpty()) {
return ExpectedTypeInfo.EMPTY_ARRAY;
}
@@ -146,6 +148,20 @@ public class ExpectedTypesProvider {
return visitor.getResult();
}
private static PsiFunctionalExpression extractFunctionalExpression(PsiExpression expr) {
PsiElement parent = expr.getParent();
if (expr instanceof PsiFunctionalExpression && parent instanceof PsiExpressionStatement && !(parent.getParent() instanceof PsiSwitchLabeledRuleStatement)) {
return (PsiFunctionalExpression)expr;
}
parent = PsiTreeUtil.skipParentsOfType(expr, PsiParenthesizedExpression.class);
if (parent instanceof PsiAssignmentExpression &&
parent.getParent() instanceof PsiExpressionStatement &&
PsiTreeUtil.isAncestor(((PsiAssignmentExpression)parent).getLExpression(), expr, false)) {
return ObjectUtils.tryCast(((PsiAssignmentExpression)parent).getRExpression(), PsiFunctionalExpression.class);
}
return null;
}
@NotNull
public static PsiType[] processExpectedTypes(@NotNull ExpectedTypeInfo[] infos,
@NotNull PsiTypeVisitor<? extends PsiType> visitor, @NotNull Project project) {

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/afterFunctionalInAssignment.java Normal file
View File

@@ -0,0 +1,11 @@
// "Create local variable 'foo'" "true"
class Foo {
{
A foo = (s, s1) -> {
};
}
}
@FunctionalInterface
interface A {
void m(String s, String s1);
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createLocalFromUsage/beforeFunctionalInAssignment.java Normal file
View File

@@ -0,0 +1,10 @@
// "Create local variable 'foo'" "true"
class Foo {
{
f<caret>oo = (s, s1) -> {};
}
}
@FunctionalInterface
interface A {
void m(String s, String s1);
}