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

ensure local classes are not suggested to be made static (IDEA-167085)

Browse Source
This commit is contained in:
Anna Kozlova
2017-01-25 13:39:56 +03:00
parent 4a80eba22c
commit 32b5f1d747
5 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java
View File

@@ -305,15 +305,17 @@ public class HighlightClassUtil {
HighlightInfo result = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(keyword).descriptionAndTooltip(message).create();
QuickFixAction.registerQuickFixAction(result, QUICK_FIX_FACTORY.createModifierListFix(field, PsiModifier.STATIC, false, false));
PsiClass aClass = field.getContainingClass();
if (aClass != null) {
QuickFixAction.registerQuickFixAction(result, QUICK_FIX_FACTORY.createModifierListFix(aClass, PsiModifier.STATIC, true, false));
}
registerMakeInnerClassStatic(result, field.getContainingClass());
return result;
}
private static void registerMakeInnerClassStatic(HighlightInfo result, PsiClass aClass) {
if (aClass != null && aClass.getContainingClass() != null) {
QuickFixAction.registerQuickFixAction(result, QUICK_FIX_FACTORY.createModifierListFix(aClass, PsiModifier.STATIC, true, false));
}
}
@Nullable
private static HighlightInfo checkStaticMethodDeclarationInInnerClass(PsiKeyword keyword) {
if (getEnclosingStaticClass(keyword, PsiMethod.class) == null) {
@@ -324,7 +326,7 @@ public class HighlightClassUtil {
String message = JavaErrorMessages.message("static.declaration.in.inner.class");
HighlightInfo result = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(keyword).descriptionAndTooltip(message).create();
QuickFixAction.registerQuickFixAction(result, QUICK_FIX_FACTORY.createModifierListFix(method, PsiModifier.STATIC, false, false));
QuickFixAction.registerQuickFixAction(result, QUICK_FIX_FACTORY.createModifierListFix((PsiClass)keyword.getParent().getParent().getParent(), PsiModifier.STATIC, true, false));
registerMakeInnerClassStatic(result, (PsiClass)keyword.getParent().getParent().getParent());
return result;
}
@@ -338,8 +340,7 @@ public class HighlightClassUtil {
String message = JavaErrorMessages.message("static.declaration.in.inner.class");
HighlightInfo result = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(keyword).descriptionAndTooltip(message).create();
QuickFixAction.registerQuickFixAction(result, QUICK_FIX_FACTORY.createModifierListFix(initializer, PsiModifier.STATIC, false, false));
PsiClass owner = (PsiClass)keyword.getParent().getParent().getParent();
QuickFixAction.registerQuickFixAction(result, QUICK_FIX_FACTORY.createModifierListFix(owner, PsiModifier.STATIC, true, false));
registerMakeInnerClassStatic(result, (PsiClass)keyword.getParent().getParent().getParent());
return result;
}
@@ -390,9 +391,7 @@ public class HighlightClassUtil {
QuickFixAction.registerQuickFixAction(info, QUICK_FIX_FACTORY.createModifierListFix(aClass, PsiModifier.STATIC, false, false));
}
PsiClass containingClass = aClass.getContainingClass();
if (containingClass != null) {
QuickFixAction.registerQuickFixAction(info, QUICK_FIX_FACTORY.createModifierListFix(containingClass, PsiModifier.STATIC, true, false));
}
registerMakeInnerClassStatic(info, containingClass);
return info;
}
@@ -899,9 +898,7 @@ public class HighlightClassUtil {
String description = JavaErrorMessages.message("is.not.an.enclosing.class", HighlightUtil.formatClass(outerClass));
HighlightInfo highlightInfo =
HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(elementToHighlight).descriptionAndTooltip(description).create();
if (aClass != null) {
QuickFixAction.registerQuickFixAction(highlightInfo, QUICK_FIX_FACTORY.createModifierListFix(aClass, PsiModifier.STATIC, true, false));
}
registerMakeInnerClassStatic(highlightInfo, aClass);
return highlightInfo;
}
PsiModifierListOwner staticParent = PsiUtil.getEnclosingStaticElement(place, outerClass);

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeLocalClassWithNestedClass.java Normal file
View File

@@ -0,0 +1,10 @@
// "Make 'inner' static" "false"
import java.io.*;
class a {
void foo() {
class inner {
<caret>static class nested {}
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeLocalClassWithStaticField.java Normal file
View File

@@ -0,0 +1,10 @@
// "Make 'inner' static" "false"
import java.io.*;
class a {
void foo() {
class inner {
<caret>static int f;
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeLocalClassWithStaticInitializer.java Normal file
View File

@@ -0,0 +1,10 @@
// "Make 'inner' static" "false"
import java.io.*;
class a {
void foo() {
class inner {
<caret>static {}
}
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/modifier/beforeLocalClassWithStaticMethod.java Normal file
View File

@@ -0,0 +1,10 @@
// "Make 'inner' static" "false"
import java.io.*;
class a {
void foo() {
class inner {
<caret>static void f() {}
}
}
}