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

MoveFieldAssignmentToInitializer: disable for self-references

Browse Source 
Fixes IDEA-174956 "Move assignment to field declaration" produces red code
This commit is contained in:
Tagir Valeev
2017-06-28 10:34:33 +03:00
parent 9643e2d238
commit cdce28fae8
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java-impl/src/com/intellij/codeInspection/MoveFieldAssignmentToInitializerInspection.java
View File

@@ -115,13 +115,16 @@ public class MoveFieldAssignmentToInitializerInspection extends BaseJavaBatchLoc
super.visitReferenceExpression(expression);
PsiElement resolved = expression.resolve();
if (resolved == null) return;
if (resolved == field) {
result.set(Boolean.FALSE);
return;
}
if (PsiTreeUtil.isAncestor(ctrOrInitializer, resolved, false) && !PsiTreeUtil.isAncestor(initializer, resolved, false)) {
// resolved somewhere inside constructor but outside initializer
result.set(Boolean.FALSE);
return;
}
if (resolved instanceof PsiMember &&
resolved != field &&
((PsiMember)resolved).getContainingClass() == field.getContainingClass()) {
if (resolved instanceof PsiMember && ((PsiMember)resolved).getContainingClass() == field.getContainingClass()) {
if (field.hasModifierProperty(PsiModifier.STATIC) ||
!((PsiMember)resolved).hasModifierProperty(PsiModifier.STATIC)) {
// refers to another field/method of the same class (except referring from non-static member to static)

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeSelfRef.java Normal file
View File

@@ -0,0 +1,11 @@
// "Move assignment to field declaration" "false"
class Foo {
int[] s;
void foo() {
if (s != null) {
s = s.cl<caret>one();
}
}
}