From 873dd1717bea663260442c5114f77b3120701346 Mon Sep 17 00:00:00 2001
From: Nick Mancuso <nicholas.mancuso13@gmail.com>
Date: Thu, 1 Dec 2022 23:47:00 -0500
Subject: [PATCH] Issue #12486: NoWhitespaceAfter shouldn't check synchronized
 method

---
 .../whitespace/NoWhitespaceAfterCheck.java    | 23 +++++++-
 .../whitespace/NoWhitespaceAfterCheck.xml     | 18 ++++++
 .../NoWhitespaceAfterCheckTest.java           | 11 ++++
 .../InputNoWhitespaceAfterSynchronized.java   | 59 +++++++++++++++++++
 src/xdocs/config_whitespace.xml               | 17 ++++++
 5 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterSynchronized.java

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java
index 82aff06b9f4..8683f36d8fa 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheck.java
@@ -55,6 +55,24 @@
  * <pre>
  * public void foo(final char @NotNull [] param) {} // No violation
  * </pre>
+ * <p>
+ * This check processes the
+ * <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
+ * LITERAL_SYNCHRONIZED</a> token only when it appears as a part of a
+ * <a href="https://docs.oracle.com/javase/specs/jls/se19/html/jls-14.html#jls-14.19">
+ * synchronized statement</a>.
+ * </p>
+ * <p>
+ * Example:
+ * </p>
+ * <pre>
+ * void m1() {
+ *     synchronized(this) {} // ok
+ *     synchronized (this) {} // violation
+ * }
+ * synchronized &lt;T&gt; void m2() {} // ok
+ * synchronized&lt;T&gt; void m3() {} // ok
+ * </pre>
  * <ul>
  * <li>
  * Property {@code allowLineBreaks} - Control whether whitespace is allowed
@@ -284,7 +302,10 @@ private static DetailAST getWhitespaceFollowedNode(DetailAST ast) {
      */
     private static boolean shouldCheckWhitespaceAfter(DetailAST ast) {
         final DetailAST previousSibling = ast.getPreviousSibling();
-        return previousSibling == null || previousSibling.getType() != TokenTypes.ANNOTATIONS;
+        final boolean isSynchronizedMethod = ast.getType() == TokenTypes.LITERAL_SYNCHRONIZED
+                        && ast.getFirstChild() == null;
+        return !isSynchronizedMethod
+                && (previousSibling == null || previousSibling.getType() != TokenTypes.ANNOTATIONS);
     }
 
     /**
diff --git a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/NoWhitespaceAfterCheck.xml b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/NoWhitespaceAfterCheck.xml
index bfd69888671..270683ae6ac 100644
--- a/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/NoWhitespaceAfterCheck.xml
+++ b/src/main/resources/com/puppycrawl/tools/checkstyle/meta/checks/whitespace/NoWhitespaceAfterCheck.xml
@@ -30,6 +30,24 @@
  &lt;/p&gt;
  &lt;pre&gt;
  public void foo(final char @NotNull [] param) {} // No violation
+ &lt;/pre&gt;
+ &lt;p&gt;
+ This check processes the
+ &lt;a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED"&gt;
+ LITERAL_SYNCHRONIZED&lt;/a&gt; token only when it appears as a part of a
+ &lt;a href="https://docs.oracle.com/javase/specs/jls/se19/html/jls-14.html#jls-14.19"&gt;
+ synchronized statement&lt;/a&gt;.
+ &lt;/p&gt;
+ &lt;p&gt;
+ Example:
+ &lt;/p&gt;
+ &lt;pre&gt;
+ void m1() {
+     synchronized(this) {} // ok
+     synchronized (this) {} // violation
+ }
+ synchronized &amp;lt;T&amp;gt; void m2() {} // ok
+ synchronized&amp;lt;T&amp;gt; void m3() {} // ok
  &lt;/pre&gt;</description>
          <properties>
             <property default-value="true" name="allowLineBreaks" type="boolean">
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
index 262664fff98..f5d8feb8783 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
@@ -354,6 +354,17 @@ public void testNoWhitespaceAfterWithEmoji() throws Exception {
                 getPath("InputNoWhitespaceAfterWithEmoji.java"), expected);
     }
 
+    @Test
+    public void testNoWhitespaceAfterSynchronized() throws Exception {
+        final String[] expected = {
+            "18:9: " + getCheckMessage(MSG_KEY, "synchronized"),
+        };
+
+        verifyWithInlineConfigParser(
+                getPath("InputNoWhitespaceAfterSynchronized.java"),
+                expected);
+    }
+
     /**
      * Creates MOCK lexical token and returns AST node for this token.
      *
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterSynchronized.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterSynchronized.java
new file mode 100644
index 00000000000..74bc3446132
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterSynchronized.java
@@ -0,0 +1,59 @@
+/*
+NoWhitespaceAfter
+allowLineBreaks = (default)true
+tokens = LITERAL_SYNCHRONIZED
+
+
+*/
+package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespaceafter;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+public class InputNoWhitespaceAfterSynchronized<T> {
+
+    private final Object lock = new Object();
+
+    void m1() {
+        synchronized (lock) {} // violation
+        synchronized(lock) {} // ok
+    }
+
+    synchronized int m2() { // ok
+        return 2;
+    }
+
+    synchronized private int[] m3() { // ok
+        return new int[]{2};
+    }
+
+    synchronized int[] m4() { // ok
+        return new int[]{2};
+    }
+
+    private final synchronized int m5() { // ok
+        return 2;
+    }
+
+    synchronized T m6() { // ok
+        return null;
+    }
+
+    @SyncAnno synchronized T m7() { // ok
+        return null;
+    }
+
+    @SyncAnno private synchronized T m8() { // ok
+        return null;
+    }
+
+    // Note that we do not check 'synchronized' as a modifier,
+    // convention is to have type parameters of a generic method
+    // be surrounded by whitespace.
+    synchronized <T2> void m9() {} // ok
+    synchronized<T2> void m10() {} // ok
+}
+
+@Target(ElementType.METHOD)
+@interface SyncAnno {
+}
diff --git a/src/xdocs/config_whitespace.xml b/src/xdocs/config_whitespace.xml
index 55e3ac40676..609e2ea99ae 100644
--- a/src/xdocs/config_whitespace.xml
+++ b/src/xdocs/config_whitespace.xml
@@ -1353,6 +1353,23 @@ import static java.math.BigInteger.ZERO;
         <source>
 public void foo(final char @NotNull [] param) {} // No violation
         </source>
+        <p>
+          This check processes the <a href="https://checkstyle.org/apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_SYNCHRONIZED">
+          LITERAL_SYNCHRONIZED</a> token only when it appears as a part of a
+          <a href="https://docs.oracle.com/javase/specs/jls/se19/html/jls-14.html#jls-14.19">
+          synchronized statement</a>.
+        </p>
+        <p>
+          Example:
+        </p>
+        <source>
+void m1() {
+  synchronized(this) {} // ok
+  synchronized (this) {} // violation
+}
+synchronized &lt;T&gt; void m2() {} // ok
+synchronized&lt;T&gt; void m3() {} // ok
+        </source>
       </subsection>
 
       <subsection name="Properties" id="NoWhitespaceAfter_Properties">