Issue checkstyle#14765: fix OverloadMethodsDeclarationOrderCheck

Zopsss · Apr 11, 2024 · 1f7b5dc · 1f7b5dc
1 parent ffbeac5
commit 1f7b5dc
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 4 deletions.
diff --git a/...a/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java b/...a/com/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheck.java
@@ -110,7 +110,11 @@ private void checkOverloadMethodsGrouping(DetailAST objectBlock) {
                 final String methodName =
                         currentToken.findFirstToken(TokenTypes.IDENT).getText();
                 final Integer previousIndex = methodIndexMap.get(methodName);
-                if (previousIndex != null && currentIndex - previousIndex > allowedDistance) {
+                final DetailAST previousSibling = currentToken.getPreviousSibling();
+                final boolean isMethod = previousSibling.getType() == TokenTypes.METHOD_DEF;
+
+                if (previousIndex != null
+                        && (currentIndex - previousIndex > allowedDistance || !isMethod)) {
                     final int previousLineWithOverloadMethod =
                             methodLineNumberMap.get(methodName);
                     log(currentToken, MSG_KEY,

diff --git a/...m/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java b/...m/puppycrawl/tools/checkstyle/checks/coding/OverloadMethodsDeclarationOrderCheckTest.java
@@ -41,8 +41,12 @@ public void testDefault() throws Exception {
         final String[] expected = {
             "32:5: " + getCheckMessage(MSG_KEY, 21),
             "60:9: " + getCheckMessage(MSG_KEY, 49),
-            "72:5: " + getCheckMessage(MSG_KEY, 70),
-            "115:5: " + getCheckMessage(MSG_KEY, 104),
+            "65:9: " + getCheckMessage(MSG_KEY, 60),
+            "79:5: " + getCheckMessage(MSG_KEY, 77),
+            "122:5: " + getCheckMessage(MSG_KEY, 111),
+            "133:5: " + getCheckMessage(MSG_KEY, 127),
+            "144:9: " + getCheckMessage(MSG_KEY, 138),
+            "147:5: " + getCheckMessage(MSG_KEY, 133),
         };
         verifyWithInlineConfigParser(
                 getPath("InputOverloadMethodsDeclarationOrder.java"), expected);
@@ -55,6 +59,7 @@ public void testOverloadMethodsDeclarationOrderRecords() throws Exception {
             "21:9: " + getCheckMessage(MSG_KEY, 15),
             "41:9: " + getCheckMessage(MSG_KEY, 35),
             "57:9: " + getCheckMessage(MSG_KEY, 50),
+            "63:9: " + getCheckMessage(MSG_KEY, 57),
         };
         verifyWithInlineConfigParser(
                 getNonCompilablePath("InputOverloadMethodsDeclarationOrderRecords.java"),

diff --git a/...s/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderRecords.java b/...s/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrderRecords.java
@@ -60,7 +60,7 @@ public void foo() { // violation
         public MyClass() {
         }
 
-        public void foo(int i, String s) {
+        public void foo(int i, String s) { // violation
         }
 
         public void foo(String s, int i) {

diff --git a/...e/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java b/...e/checks/coding/overloadmethodsdeclarationorder/InputOverloadMethodsDeclarationOrder.java
@@ -60,6 +60,13 @@ public void fooMethod()
         public void overloadMethod(String s, Boolean b, int i) // violation
         {
             //some foo code
+        };
+
+        public void overloadMethod(double d) // violation
+                                            // because there is an unnecessary semicolon at the
+                                            // end of the method
+        {
+            // some foo code
         }
     };
 }
@@ -116,6 +123,28 @@ public void overloadMethod(String s, Boolean b, int i) // violation
     {
         //some foo code
     }
+
+    void test() {}
+
+    String str;
+
+    private interface Testing {}
+
+    void test(int x) {} // violation
+
+    private class Inner {
+        void test() {}
+
+        void test(String str) {}
+
+        void test2() {}
+
+        String str;
+
+        void test(int x) {} // violation
+    }
+
+    void test(double d) {} // violation
 }
 
 enum Foo2 {

diff --git a/...om/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example1.txt b/...om/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example1.txt
@@ -12,4 +12,5 @@ public void foo(String s) {}
 public void foo(String s, int i) {}
 public void foo(int i, String s) {}
 public void notFoo() {}
+private interface Testing() {}
 // xdoc section -- end
diff --git a/...om/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example2.txt b/...om/puppycrawl/tools/checkstyle/checks/coding/overloadmethodsdeclarationorder/Example2.txt
@@ -12,4 +12,6 @@ public void foo(String s) {} // OK
 public void notFoo() {} // violation. Have to be after foo(String s, int i)
 public void foo(int i, String s) {}
 public void foo(String s, int i) {}
+private interface Testing() {}
+public void foo(double d) {} // violation. Have to be after foo(String s, int i)
 // xdoc section -- end
diff --git a/src/xdocs/checks/coding/overloadmethodsdeclarationorder.xml b/src/xdocs/checks/coding/overloadmethodsdeclarationorder.xml
@@ -32,6 +32,7 @@ public void foo(String s) {}
 public void foo(String s, int i) {}
 public void foo(int i, String s) {}
 public void notFoo() {}
+private interface Testing() {}
         </source>
         <p id="Example2-code">Example of incorrect grouping of overloaded methods:</p>
         <source>
@@ -40,6 +41,8 @@ public void foo(String s) {} // OK
 public void notFoo() {} // violation. Have to be after foo(String s, int i)
 public void foo(int i, String s) {}
 public void foo(String s, int i) {}
+private interface Testing() {}
+public void foo(double d) {} // violation. Have to be after foo(String s, int i)
         </source>
       </subsection>