From c1343868982921a2cbcfff20d6184fc48300076a Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Tue, 4 Apr 2023 19:09:15 +0200
Subject: [PATCH] [typescript] Exclude TypeScriptLexerBase from checkstyle, fix
 PMD issues

---
 ...pmd-javascript-checkstyle-suppressions.xml |  8 +++
 pmd-javascript/pom.xml                        |  8 +++
 .../typescript/ast/TypeScriptLexerBase.java   | 62 ++++++++++---------
 3 files changed, 49 insertions(+), 29 deletions(-)
 create mode 100644 pmd-javascript/pmd-javascript-checkstyle-suppressions.xml

diff --git a/pmd-javascript/pmd-javascript-checkstyle-suppressions.xml b/pmd-javascript/pmd-javascript-checkstyle-suppressions.xml
new file mode 100644
index 0000000000..24e5d8c32f
--- /dev/null
+++ b/pmd-javascript/pmd-javascript-checkstyle-suppressions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+     "-//Puppy Crawl//DTD Suppressions 1.0//EN"
+     "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
+<suppressions>
+    <suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
+    <suppress files="[\\/]src[\\/]main[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]typescript[\\/]ast[\\/]TypeScriptLexerBase.java" checks="[a-zA-Z0-9]*"/>
+</suppressions>
diff --git a/pmd-javascript/pom.xml b/pmd-javascript/pom.xml
index a3efe157ec..e5cdefc231 100644
--- a/pmd-javascript/pom.xml
+++ b/pmd-javascript/pom.xml
@@ -78,6 +78,14 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <suppressionsLocation>pmd-javascript-checkstyle-suppressions.xml</suppressionsLocation>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <dependencies>
diff --git a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/typescript/ast/TypeScriptLexerBase.java b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/typescript/ast/TypeScriptLexerBase.java
index 5a62443d7e..a81164c360 100644
--- a/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/typescript/ast/TypeScriptLexerBase.java
+++ b/pmd-javascript/src/main/java/net/sourceforge/pmd/lang/typescript/ast/TypeScriptLexerBase.java
@@ -7,17 +7,16 @@
 
 package net.sourceforge.pmd.lang.typescript.ast;
 
-import java.util.Stack;
+import org.antlr.v4.runtime.*;
 
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.Token;
+import java.util.Stack;
 
 /**
  * All lexer methods that used in grammar (IsStrictMode)
  * should start with Upper Case Char similar to Lexer rules.
  */
-abstract class TypeScriptLexerBase extends Lexer {
+abstract class TypeScriptLexerBase extends Lexer
+{
     /**
      * Stores values of nested modes. By default mode is strict or
      * defined externally (useStrictDefault)
@@ -102,21 +101,26 @@ abstract class TypeScriptLexerBase extends Lexer {
         return next;
     }
 
-    protected void ProcessOpenBrace() {
+    protected void ProcessOpenBrace()
+    {
         bracesDepth++;
         useStrictCurrent = scopeStrictModes.size() > 0 && scopeStrictModes.peek() || useStrictDefault;
         scopeStrictModes.push(useStrictCurrent);
     }
 
-    protected void ProcessCloseBrace() {
+    protected void ProcessCloseBrace()
+    {
         bracesDepth--;
         useStrictCurrent = scopeStrictModes.size() > 0 ? scopeStrictModes.pop() : useStrictDefault;
     }
 
-    protected void ProcessStringLiteral() {
-        if (lastToken == null || lastToken.getType() == TypeScriptLexer.OpenBrace) {
+    protected void ProcessStringLiteral()
+    {
+        if (lastToken == null || lastToken.getType() == TypeScriptLexer.OpenBrace)
+        {
             String text = getText();
-            if ("\"use strict\"".equals(text) || "'use strict'".equals(text)) {
+            if ("\"use strict\"".equals(text) || "'use strict'".equals(text))
+            {
                 if (scopeStrictModes.size() > 0) {
                     scopeStrictModes.pop();
                 }
@@ -138,31 +142,31 @@ abstract class TypeScriptLexerBase extends Lexer {
      * Returns {@code true} if the lexer can match a regex literal.
      */
     protected boolean IsRegexPossible() {
-                                       
+
         if (this.lastToken == null) {
             // No token has been produced yet: at the start of the input,
             // no division is possible, so a regex literal _is_ possible.
             return true;
         }
-        
+
         switch (this.lastToken.getType()) {
-        case TypeScriptLexer.Identifier:
-        case TypeScriptLexer.NullLiteral:
-        case TypeScriptLexer.BooleanLiteral:
-        case TypeScriptLexer.This:
-        case TypeScriptLexer.CloseBracket:
-        case TypeScriptLexer.CloseParen:
-        case TypeScriptLexer.OctalIntegerLiteral:
-        case TypeScriptLexer.DecimalLiteral:
-        case TypeScriptLexer.HexIntegerLiteral:
-        case TypeScriptLexer.StringLiteral:
-        case TypeScriptLexer.PlusPlus:
-        case TypeScriptLexer.MinusMinus:
-            // After any of the tokens above, no regex literal can follow.
-            return false;
-        default:
-            // In all other cases, a regex literal _is_ possible.
-            return true;
+            case TypeScriptLexer.Identifier:
+            case TypeScriptLexer.NullLiteral:
+            case TypeScriptLexer.BooleanLiteral:
+            case TypeScriptLexer.This:
+            case TypeScriptLexer.CloseBracket:
+            case TypeScriptLexer.CloseParen:
+            case TypeScriptLexer.OctalIntegerLiteral:
+            case TypeScriptLexer.DecimalLiteral:
+            case TypeScriptLexer.HexIntegerLiteral:
+            case TypeScriptLexer.StringLiteral:
+            case TypeScriptLexer.PlusPlus:
+            case TypeScriptLexer.MinusMinus:
+                // After any of the tokens above, no regex literal can follow.
+                return false;
+            default:
+                // In all other cases, a regex literal _is_ possible.
+                return true;
         }
     }
 }