Issue #2219: NoWhitespaceAfter, NoWhitespaceBefore and WhitespaceArou…

…nd don't support GENERIC_START nor GENERIC_END tokens
checkstyle · Sep 21, 2015 · 03f2be4 · 03f2be4
1 parent 690b097
commit 03f2be4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
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
@@ -103,6 +103,8 @@ public int[] getAcceptableTokens() {
             TokenTypes.DOT,
             TokenTypes.TYPECAST,
             TokenTypes.ARRAY_DECLARATOR,
+            TokenTypes.GENERIC_START,
+            TokenTypes.GENERIC_END,
         };
     }
 

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceBeforeCheck.java
@@ -89,6 +89,8 @@ public int[] getAcceptableTokens() {
             TokenTypes.POST_INC,
             TokenTypes.POST_DEC,
             TokenTypes.DOT,
+            TokenTypes.GENERIC_START,
+            TokenTypes.GENERIC_END,
         };
     }
 

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundCheck.java
@@ -275,6 +275,8 @@ public int[] getAcceptableTokens() {
             TokenTypes.LITERAL_ASSERT,
             TokenTypes.TYPE_EXTENSION_AND,
             TokenTypes.WILDCARD_TYPE,
+            TokenTypes.GENERIC_START,
+            TokenTypes.GENERIC_END,
         };
     }
 

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/WhitespaceAroundTest.java
@@ -278,6 +278,8 @@ public void testGetAcceptableTokens() {
             TokenTypes.LITERAL_ASSERT,
             TokenTypes.TYPE_EXTENSION_AND,
             TokenTypes.WILDCARD_TYPE,
+            TokenTypes.GENERIC_START,
+            TokenTypes.GENERIC_END,
         };
         assertArrayEquals(expected, actual);
     }