diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java index f4c0fc9c4bf5..916ac00dc8be 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java @@ -182,7 +182,7 @@ public class UnnecessarilyQualifiedStaticUsageInspection PsiClass.class); final PsiClass qualifyingClass = (PsiClass)resolvedQualifier; if (containingClass == null || - !containingClass.equals(qualifyingClass)) { + !PsiTreeUtil.isAncestor(qualifyingClass, containingClass, false)) { return false; } final Project project = referenceElement.getProject(); diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/UnnecessarilyQualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/UnnecessarilyQualifiedStaticUsageInspection.java index 5f3d167a6071..280807e68454 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/UnnecessarilyQualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/UnnecessarilyQualifiedStaticUsageInspection.java @@ -65,4 +65,19 @@ class X { l.add("b"); l.add("c"); } +} + +class InnerClassTest { + public static int foo = 0; + + public static void bar() { + System.out.println(); + } + + public static class Inner { + public void test1() { + InnerClassTest.bar(); // (1) + System.out.println(InnerClassTest.foo); // (2) + } + } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/expected.xml index 40b4c19d339f..8b0891f73fa2 100644 --- a/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/expected.xml +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/style/unnecessarily_qualified_static_usage/expected.xml @@ -36,6 +36,20 @@ 64 Unnecessarily qualified static access Unnecessarily qualified static access <code>X.l</code> #loc + + + + UnnecessarilyQualifiedStaticUsageInspection.java + 79 + Unnecessarily qualified static access + Unnecessarily qualified static method call <code>InnerClassTest.bar()</code> #loc + + + + UnnecessarilyQualifiedStaticUsageInspection.java + 80 + Unnecessarily qualified static access + Unnecessarily qualified static access <code>InnerClassTest.foo</code> #loc \ No newline at end of file