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

introduce constant: add after dependant code (IDEA-66414)

Browse Source
This commit is contained in:
anna
2011-03-10 21:05:24 +01:00
parent 9cc7758d3a
commit cae6eb927a
4 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+26 -1
View File
@@ -70,6 +70,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase implements RefactoringActionHandler {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.introduceField.BaseExpressionToFieldHandler");
@@ -223,7 +224,12 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
destClass.addBefore(CodeEditUtil.createLineFeed(field.getManager()), anchorMember);
}
else {
field = (PsiField)destClass.add(field);
final PsiField forwardReference = checkForwardRefs(initializer);
if (forwardReference != null) {
field = (PsiField)destClass.addAfter(field, forwardReference);
} else {
field = (PsiField)destClass.add(field);
}
}
if (!settings.isIntroduceEnumConstant()) {
VisibilityUtil.fixVisibility(occurrences, field, settings.getFieldVisibility());
@@ -320,6 +326,25 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
LOG.error(e);
}
}
private PsiField checkForwardRefs(PsiExpression initializer) {
final PsiField[] refConstantFields = new PsiField[1];
initializer.accept(new JavaRecursiveElementWalkingVisitor() {
@Override
public void visitReferenceExpression(PsiReferenceExpression expression) {
super.visitReferenceExpression(expression);
final PsiElement resolve = expression.resolve();
if (resolve instanceof PsiField &&
((PsiField)resolve).hasModifierProperty(PsiModifier.FINAL) &&
PsiTreeUtil.isAncestor(myParentClass, resolve, false) && ((PsiField)resolve).hasInitializer()) {
if (refConstantFields[0] == null || refConstantFields[0].getTextOffset() < resolve.getTextOffset()) {
refConstantFields[0] = (PsiField)resolve;
}
}
}
});
return refConstantFields[0];
}
};
CommandProcessor.getInstance().executeCommand(