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

IDEA-177602 'Move assignment to field declaration' doesn't work if rhs contains field reference

Browse Source
This commit is contained in:
Tagir Valeev
2017-08-18 12:23:33 +07:00
parent 9dea74218b
commit 009ceae493
5 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import com.intellij.psi.search.LocalSearchScope;
import com.intellij.psi.search.searches.ReferencesSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.ObjectUtils;
import com.siyeh.ig.psiutils.CommentTracker;
import com.siyeh.ig.psiutils.ConstructionUtils;
@@ -109,6 +110,8 @@ public class MoveFieldAssignmentToInitializerInspection extends BaseJavaBatchLoc
if (initializer == null) return false;
if (!ExceptionUtil.getThrownCheckedExceptions(initializer).isEmpty()) return false;
final Ref<Boolean> result = new Ref<>(Boolean.TRUE);
PsiClass aClass = field.getContainingClass();
if (aClass == null) return false;
initializer.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
@@ -124,12 +127,23 @@ public class MoveFieldAssignmentToInitializerInspection extends BaseJavaBatchLoc
result.set(Boolean.FALSE);
return;
}
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)
result.set(Boolean.FALSE);
if (resolved instanceof PsiMember && ((PsiMember)resolved).getContainingClass() == aClass) {
// refers to another field/method of the same class (except referring from non-static member to static and
// referring to initialized field which is probably ok)
boolean nonStaticRefersToStatic =
!field.hasModifierProperty(PsiModifier.STATIC) && ((PsiMember)resolved).hasModifierProperty(PsiModifier.STATIC);
if (nonStaticRefersToStatic) return;
boolean initializedField = resolved instanceof PsiField && ((PsiField)resolved).getInitializer() != null;
if (initializedField) {
PsiField[] fields = aClass.getFields();
int indexSource = ArrayUtil.indexOf(fields, field);
int indexTarget = ArrayUtil.indexOf(fields, resolved);
if (indexTarget >= 0 && indexSource > indexTarget) {
// we can refer to already initialized field if it's declared before our field
return;
}
}
result.set(Boolean.FALSE);
}
}
});

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/afterAnotherFIeldReferenced.java Normal file
View File

@@ -0,0 +1,8 @@
// "Move assignment to field declaration" "true"
public class Test {
String myField = "foo";
private String value = myField.trim();
void f() {
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeAnotherFIeldReferenced.java Normal file
View File

@@ -0,0 +1,9 @@
// "Move assignment to field declaration" "true"
public class Test {
String myField = "foo";
private String value;
void f() {
<caret>value = myField.trim();
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeAnotherFIeldReferencedForwardRef.java Normal file
View File

@@ -0,0 +1,9 @@
// "Move assignment to field declaration" "false"
public class Test {
private String value;
String myField = "foo";
void f() {
<caret>value = myField.trim();
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveFieldAssignmentToInitializer/beforeAnotherFIeldReferencedNotInitialized.java Normal file
View File

@@ -0,0 +1,9 @@
// "Move assignment to field declaration" "false"
public class Test {
String myField;
private String value;
void f() {
<caret>value = myField.trim();
}
}