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

forbid references on final fields from another ones (IDEA-100237)

Browse Source
This commit is contained in:
anna
2013-10-22 21:02:23 +02:00
parent 34f23fba00
commit 18ee2d80f1
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
View File

@@ -276,10 +276,10 @@ public class HighlightControlFlowUtil {
&& HighlightUtil.findEnclosingFieldInitializer(expression) == null) {
return null;
}
// access to final fields from inner classes always allowed
if (inInnerClass(expression, ((PsiField)variable).getContainingClass(),containingFile)) return null;
if (topBlock == null) return null;
final PsiElement parent = topBlock.getParent();
// access to final fields from inner classes always allowed
if ((parent instanceof PsiMethod || parent instanceof PsiClassInitializer) && inInnerClass(expression, ((PsiField)variable).getContainingClass(),containingFile)) return null;
final PsiCodeBlock block;
final PsiClass aClass;
if (parent instanceof PsiMethod) {
@@ -317,7 +317,7 @@ public class HighlightControlFlowUtil {
if (aClass == null || isFieldInitializedInOtherFieldInitializer(aClass, field, field.hasModifierProperty(PsiModifier.STATIC))) {
return null;
}
final PsiField anotherField = PsiTreeUtil.getParentOfType(expression, PsiField.class);
final PsiField anotherField = PsiTreeUtil.getTopmostParentOfType(expression, PsiField.class);
if (anotherField != null && anotherField.getContainingClass() == aClass) {
startOffset = 0;
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FinalFieldInit.java
View File

@@ -227,4 +227,16 @@ class Y {
}
}
class IDEA100237 {
static class Foo {
final int bar;
Foo() {
bar = 1;
}
final Object baz = new Object() {
final int qux = <error descr="Variable 'bar' might not have been initialized">bar</error>.hashCode() + 1;
};
}
}