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

IDEA-86852 Add final modifier to Create Field implemented

Browse Source
This commit is contained in:
Danila Ponomarenko
2012-06-05 16:51:25 +04:00
parent 4d1dfd52e9
commit 750f741eb8
1 changed files with 21 additions and 1 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
+21 -1
View File
@@ -66,7 +66,7 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix {
PsiClass parentClass;
do {
enclosingContext = PsiTreeUtil.getParentOfType(enclosingContext == null ? myReferenceExpression : enclosingContext, PsiMethod.class,
PsiField.class, PsiClassInitializer.class);
PsiField.class, PsiClassInitializer.class);
parentClass = enclosingContext == null ? null : enclosingContext.getContainingClass();
}
while (parentClass instanceof PsiAnonymousClass);
@@ -104,6 +104,10 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix {
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);
@@ -146,6 +150,22 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix {
});
}
private static boolean shouldCreateFinalMember(@NotNull PsiReferenceExpression ref, @NotNull PsiClass targetClass) {
if (!PsiTreeUtil.isAncestor(targetClass, ref, true)) {
return false;
}
final PsiElement element = PsiTreeUtil.getParentOfType(ref, PsiClassInitializer.class, PsiMethod.class);
if (element instanceof PsiClassInitializer){
return true;
}
if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()){
return true;
}
return false;
}
@Override
@NotNull
public String getFamilyName() {