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

ensure non-initialized fields used inside lambdas are rejected if lambda is inside class initializer only (IDEA-154305)

Browse Source
This commit is contained in:
Anna.Kozlova
2016-04-07 15:13:00 +02:00
parent 66a8aa11b8
commit 0ed05632ff
3 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
+21 -2
View File
@@ -403,13 +403,32 @@ public class HighlightControlFlowUtil {
private static boolean inInnerClass(@NotNull PsiElement psiElement, @Nullable PsiClass containingClass, @NotNull PsiFile containingFile) {
PsiElement element = psiElement;
while (element != null) {
if (element instanceof PsiLambdaExpression) return false;
if (element instanceof PsiClass) return !containingFile.getManager().areElementsEquivalent(element, containingClass);
if (element instanceof PsiClass) {
final boolean innerClass = !containingFile.getManager().areElementsEquivalent(element, containingClass);
if (innerClass) {
final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(psiElement, PsiLambdaExpression.class);
return lambdaExpression == null || !inLambdaInsideClassInitialization(containingClass, (PsiClass)element);
}
return false;
}
element = element.getParent();
}
return false;
}
private static boolean inLambdaInsideClassInitialization(@Nullable PsiClass containingClass, PsiClass aClass) {
PsiMember member = aClass;
while (member != null) {
if (member.getContainingClass() == containingClass) {
return member instanceof PsiField ||
member instanceof PsiMethod && ((PsiMethod)member).isConstructor() ||
member instanceof PsiClassInitializer;
}
member = PsiTreeUtil.getParentOfType(member, PsiMember.class, true);
}
return false;
}
public static boolean isReassigned(@NotNull PsiVariable variable,
@NotNull Map<PsiElement, Collection<ControlFlowUtil.VariableInfo>> finalVarProblems) {
if (variable instanceof PsiLocalVariable) {