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

create constant from usage: set static/final before insert field in order to get correct anchor (IDEA-100867)

Browse Source
This commit is contained in:
anna
2013-02-14 21:15:36 +01:00
parent 2794f2c106
commit 3de6d80c2e
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java
+11 -13
View File
@@ -78,24 +78,22 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix {
PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true);
}
if (createConstantField()) {
PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true);
PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true);
} else {
if (!targetClass.isInterface() && shouldCreateStaticMember(myReferenceExpression, targetClass)) {
PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true);
}
if (shouldCreateFinalMember(myReferenceExpression, targetClass)) {
PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true);
}
}
field = CreateFieldFromUsageHelper.insertField(targetClass, field, myReferenceExpression);
setupVisibility(parentClass, targetClass, field.getModifierList());
if (!targetClass.isInterface() && shouldCreateStaticMember(myReferenceExpression, targetClass)) {
PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true);
}
if (shouldCreateFinalMember(myReferenceExpression, targetClass)) {
PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true);
}
if (createConstantField()) {
PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true);
PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true);
}
final Editor newEditor = positionCursor(project, targetFile, field);
if (newEditor == null) return;
Template template =
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterDependantConstant.java
+5
View File
@@ -0,0 +1,5 @@
// "Create Constant Field 'SOME_REGEXP'" "true"
class IntroduceConstant {
private static final String SOME_REGEXP = ;
private static final String SOME_PATTERN = SOME_REGEXP;
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/beforeDependantConstant.java
+4
View File
@@ -0,0 +1,4 @@
// "Create Constant Field 'SOME_REGEXP'" "true"
class IntroduceConstant {
private static final String SOME_PATTERN = SOME_RE<caret>GEXP;
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromUsageTest.java
+4
View File
@@ -48,6 +48,10 @@ public class CreateFieldFromUsageTest extends LightQuickFixTestCase{
doSingleTest();
}
public void testDependantConstant() throws Exception {
doSingleTest();
}
protected void doSingleTest() {
doSingleTest(getTestName(false) + ".java");
}