From b328bc5fdc543f8605a99b8fc65251006bd7639f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 1 May 2022 17:47:06 +0200
Subject: [PATCH] Add more cjk and exotic scripts, also to JS

Fix #2605
---
 pmd-java/etc/grammar/Java.jjt                          |  3 ++-
 pmd-javascript/etc/grammar/es5.jj                      |  7 +++----
 .../pmd/lang/ecmascript/ast/EcmascriptParserTest.java  | 10 ++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pmd-java/etc/grammar/Java.jjt b/pmd-java/etc/grammar/Java.jjt
index f455a765e6..004a571453 100644
--- a/pmd-java/etc/grammar/Java.jjt
+++ b/pmd-java/etc/grammar/Java.jjt
@@ -961,7 +961,7 @@ TOKEN :
    "\u2124","\u2126","\u2128","\u212a"-"\u212d","\u212f"-"\u2131","\u2133"-"\u2139",
    "\u2160"-"\u2183","\u3005"-"\u3007","\u3021"-"\u3029","\u3031"-"\u3035","\u3038"-"\u303a",
    "\u3041"-"\u3094","\u309d"-"\u309e","\u30a1"-"\u30fe","\u3105"-"\u312c","\u3131"-"\u318e",
-   "\u31a0"-"\u31b7","\u3400"-"\u4db5","\u4e00"-"\u9fa5","\ua000"-"\ua48c","\uac00"-"\ud7a3",
+   "\u31a0"-"\u31b7","\u3400"-"\u4db5","\u4e00"-"\u9fa5","\ua000"-"\ua48c","\ua490"-"\uabff","\uac00"-"\ud7a3",
    "\uf900"-"\ufa2d","\ufb00"-"\ufb06","\ufb13"-"\ufb17","\ufb1d","\ufb1f"-"\ufb28",
    "\ufb2a"-"\ufb36","\ufb38"-"\ufb3c","\ufb3e","\ufb40"-"\ufb41","\ufb43"-"\ufb44",
    "\ufb46"-"\ufbb1","\ufbd3"-"\ufd3d","\ufd50"-"\ufd8f","\ufd92"-"\ufdc7","\ufdf0"-"\ufdfb",
@@ -1033,6 +1033,7 @@ TOKEN :
    "\u2160"-"\u2183","\u3005"-"\u3007","\u3021"-"\u302f","\u3031"-"\u3035","\u3038"-"\u303a",
    "\u3041"-"\u3094","\u3099"-"\u309a","\u309d"-"\u309e","\u30a1"-"\u30fe","\u3105"-"\u312c",
    "\u3131"-"\u318e","\u31a0"-"\u31b7","\u3400"-"\u4db5","\u4e00"-"\u9fa5","\ua000"-"\ua48c",
+   "\ua490"-"\uabff",
    "\uac00"-"\ud7a3","\uf900"-"\ufa2d","\ufb00"-"\ufb06","\ufb13"-"\ufb17","\ufb1d"-"\ufb28",
    "\ufb2a"-"\ufb36","\ufb38"-"\ufb3c","\ufb3e","\ufb40"-"\ufb41","\ufb43"-"\ufb44",
    "\ufb46"-"\ufbb1","\ufbd3"-"\ufd3d","\ufd50"-"\ufd8f","\ufd92"-"\ufdc7","\ufdf0"-"\ufdfb",
diff --git a/pmd-javascript/etc/grammar/es5.jj b/pmd-javascript/etc/grammar/es5.jj
index 688692d61d..9e2b28be82 100644
--- a/pmd-javascript/etc/grammar/es5.jj
+++ b/pmd-javascript/etc/grammar/es5.jj
@@ -534,11 +534,10 @@ TOKEN :
           "\u31A0"-"\u31B7",
           "\u3400",
           "\u4DB5",
-          "\u4E00",
-          "\u9FA5",
+          "\u4E00"-"\u9EA5",
           "\uA000"-"\uA48C",
-          "\uAC00",
-          "\uD7A3",
+          "\uA490"-"\uABFF",
+          "\uAC00"-"\ud7AF",
           "\uF900"-"\uFA2D",
           "\uFB00"-"\uFB06",
           "\uFB13"-"\uFB17",
diff --git a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java
index f6fe15ce3f..73a066e41a 100644
--- a/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java
+++ b/pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java
@@ -183,6 +183,16 @@ public class EcmascriptParserTest extends EcmascriptParserTestBase {
         assertEquals("^=", infix.getImage());
     }
 
+    @Test
+    public void testUnicodeCjk() {
+        // the first is u+4F60
+        js.parse("import { Test } from 'test2'\n"
+                 + "define('element', class extends Test {\n"
+                 + "    <button onClick={this.clickHandler}>你好</button>\n"
+                 + "  }\n"
+                 + "})");
+    }
+
     /**
      * [javascript] Failing with OutOfMemoryError parsing a Javascript file #2081
      */