Merge branch 'pmd/7.0.x' into pmd7-replace-commons-io

pmd-javascript/etc/grammar/Ecmascript5.jj

@@ -488,6 +488,7 @@ TOKEN :
           "\u1E00"-"\u1E9B",
           "\u1EA0"-"\u1EE0",
           "\u1EE1"-"\u1EF9",
+          "\u1EE1"-"\u1EEF",
           "\u1F00"-"\u1F15",
           "\u1F18"-"\u1F1D",
           "\u1F20"-"\u1F39",
@@ -534,11 +535,10 @@ TOKEN :
           "\u31A0"-"\u31B7",
           "\u3400",
           "\u4DB5",
-          "\u4E00",
-          "\u9FA5",
+          "\u4E00"-"\u9EA5",
           "\uA000"-"\uA48C",
-          "\uAC00",
-          "\uD7A3",
+          "\uA490"-"\uABFF",
+          "\uAC00"-"\ud7AF",
           "\uF900"-"\uFA2D",
           "\uFB00"-"\uFB06",
           "\uFB13"-"\uFB17",

pmd-javascript/src/test/java/net/sourceforge/pmd/lang/ecmascript/ast/EcmascriptParserTest.java

@@ -180,6 +180,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
      */