fix(lexer): fixed ZWJ issue in identifierPart validation

meriyah · May 26, 2019 · 3708214 · 3708214
1 parent 81b5bbc
commit 3708214
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/lexer/charClassifier.ts b/src/lexer/charClassifier.ts
@@ -1,4 +1,5 @@
 import { unicodeLookup } from '../unicode';
+import { Chars } from '../chars';
 
 export const enum CharFlags {
   None = 0,
@@ -168,7 +169,7 @@ export function isIdentifierStart(code: number): number {
     : (unicodeLookup[(code >>> 5) + 34816] >>> code) & 31 & 1;
 }
 
-export function isIdentifierPart(code: number): number {
+export function isIdentifierPart(code: number): any {
   /*
    * ES2020 11.6 IdentifierPart
    *  $ (dollar sign)
@@ -181,5 +182,5 @@ export function isIdentifierPart(code: number): number {
    */
   return code <= 0x7F
     ? CharTypes[code] & CharFlags.IdentifierPart
-    : (unicodeLookup[(code >>> 5) + 0] >>> code) & 31 & 1;
+    : (unicodeLookup[(code >>> 5) + 0] >>> code) & 31 & 1 || (code === Chars.ZeroWidthJoiner || code === Chars.ZeroWidthNonJoiner);
 }
diff --git a/test/parser/miscellaneous/pass.ts b/test/parser/miscellaneous/pass.ts
@@ -2925,7 +2925,7 @@ if (a) {
         a();
       } while (false);
     }());`,
-    // `T‍ = []`,
+    `T‍ = []`,
     `function a(b, c) {
       function d() {
           e();

diff --git a/test/parser/next/private_methods.ts b/test/parser/next/private_methods.ts
@@ -27,7 +27,6 @@ describe('Next - Private methods', () => {
     ['class A {  #x; x() { delete ((this.#m ));  } async #m() {} }', Context.OptionsNext],
     ['class A { # x }', Context.OptionsNext],
     ['class A { #\\u0000; }', Context.OptionsNext],
-    ['class A { #\\u200D_ZWJ;; }', Context.OptionsNext],
     ['class A { * # m() {} }', Context.OptionsNext],
     ['class A { # x; }', Context.OptionsNext],
     ['class A { #x; m() { this.# x; }}', Context.OptionsNext],
@@ -106,8 +105,7 @@ describe('Next - Private methods', () => {
     'static #x = /*{ initializer }*/;',
     '#x = () => super();',
     '#x = super();',
-    '#\\u0000;',
-    '#\\u200D_ZWJ;'
+    '#\\u0000;'
   ]) {
     it(`class C { ${arg} }`, () => {
       t.throws(() => {