[#1197] fix static via this rule

yegor256 · Mar 13, 2024 · 4cf643c · 4cf643c
1 parent 2d2dfef
commit 4cf643c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml b/qulice-pmd/src/main/resources/com/qulice/pmd/ruleset.xml
@@ -182,8 +182,8 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
           //PrimaryExpression[
             (./PrimaryPrefix[@ThisModifier=true()]) and
             (./PrimarySuffix[
-              @Image=//FieldDeclaration[@Static=true()]/VariableDeclarator/VariableDeclaratorId/@Name
-              or @Image=//MethodDeclaration[@Static=true()]/@MethodName
+              @Image=./ancestor::ClassOrInterfaceBody[1]/ClassOrInterfaceBodyDeclaration/FieldDeclaration[@Static=true()]/VariableDeclarator/VariableDeclaratorId/@Name
+              or @Image=./ancestor::ClassOrInterfaceBody[1]/ClassOrInterfaceBodyDeclaration/MethodDeclaration[@Static=true()]/@MethodName
             ])
           ]
         ]]></value>

diff --git a/qulice-pmd/src/test/resources/com/qulice/pmd/StaticAccessToStaticFields.java b/qulice-pmd/src/test/resources/com/qulice/pmd/StaticAccessToStaticFields.java
@@ -12,6 +12,21 @@ public int another() {
     }
 
     public int addToNum(final int another) {
-        return another + StaticAccessToStaticFields.number();
+        return another + StaticAccessToStaticFields.number() + this.another();
+    }
+
+    class InternalClass {
+        final int num;
+
+        InternalClass(final int par) {
+            this.num = par;
+        }
+        static int another() {
+            return 1;
+        }
+
+        public int add(final int a) {
+            return a + this.num;
+        }
     }
 }