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

IDEA-117191 (Inspection "Inner class may be static" not working if inner class is return type)

Browse Source
This commit is contained in:
Bas Leijdekkers
2013-11-29 13:10:20 +01:00
parent 2ea48a5832
commit c613f66907
4 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InnerClassMayBeStaticInspection.java
+2 -1
View File
@@ -54,7 +54,8 @@ public class InnerClassMayBeStaticInspection extends BaseInspection {
}
private static class InnerClassMayBeStaticFix extends InspectionGadgetsFix {
@Override
@Override
@NotNull
public String getFamilyName() {
return getName();
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/InnerClassReferenceVisitor.java
+3 -8
View File
@@ -136,18 +136,13 @@ public class InnerClassReferenceVisitor extends JavaRecursiveElementVisitor {
else if (element instanceof PsiLocalVariable || element instanceof PsiParameter) {
final PsiElement containingMethod = PsiTreeUtil.getParentOfType(reference, PsiMethod.class);
final PsiElement referencedMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class);
if (containingMethod != null && referencedMethod != null &&
!containingMethod.equals(referencedMethod)) {
if (containingMethod != null && referencedMethod != null && !containingMethod.equals(referencedMethod)) {
referencesStaticallyAccessible = false;
}
}
else if ((element instanceof PsiClass)) {
else if (element instanceof PsiClass) {
final PsiClass aClass = (PsiClass)element;
final PsiElement scope = aClass.getScope();
if (!(scope instanceof PsiClass)) {
return;
}
referencesStaticallyAccessible &= aClass.hasModifierProperty(PsiModifier.STATIC);
referencesStaticallyAccessible &= isClassStaticallyAccessible(aClass);
}
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/performance/inner_class_may_be_static/InnerClassMayBeStaticInspection.java
+14 -1
View File
@@ -44,16 +44,29 @@ class D {
void foo() {
new Object() {
class Y {}
}
};
}
}
class StaticInnerClass {
private int foo;
int bar;
public class Baz extends StaticInnerClass {
Baz() {
foo = -1;
}
}
class C extends StaticInnerClass {{
bar = 1;
}}
}
class SomeBeanUnitTest {
private class BeanCreator {
public BeanCreator withQuery() {
return null;
}
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/performance/inner_class_may_be_static/expected.xml
+20 -6
View File
@@ -1,9 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>InnerClassMayBeStaticInspection.java</file>
<line>6</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Inner class may be 'static'</problem_class>
<description>Inner class &lt;code&gt;Nested&lt;/code&gt; may be 'static' #loc</description>
</problem>
<problem>
<file>InnerClassMayBeStaticInspection.java</file>
<line>6</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Inner class may be 'static'</problem_class>
<description>Inner class &lt;code&gt;Nested&lt;/code&gt; may be 'static' #loc</description>
</problem>
<problem>
<file>InnerClassMayBeStaticInspection.java</file>
<line>60</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Inner class may be 'static'</problem_class>
<description>Inner class &lt;code&gt;C&lt;/code&gt; may be 'static' #loc</description>
</problem>
<problem>
<file>InnerClassMayBeStaticInspection.java</file>
<line>66</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Inner class may be 'static'</problem_class>
<description>Inner class &lt;code&gt;BeanCreator&lt;/code&gt; may be 'static' #loc</description>
</problem>
</problems>