moved parsePrivateIdentifier into parsePrimaryExpression

Signed-off-by: Ashley Claymore <acutmore@users.noreply.github.com>
microsoft · sandersn · Sep 24, 2021 · Jun 17, 2021 · Jun 18, 2021 · Jun 18, 2021
commit 6f56c6afdb18c34d6c36ac39b2cd39e3b872bfb3
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -4737,14 +4737,6 @@ namespace ts {
          *
          */
         function parseUnaryExpressionOrHigher(): UnaryExpression | BinaryExpression {
-            /**
-             * If we have a PrivateIdentifier, parse this unconditionally.
-             * A privateIdentifier is only valid on its own in the RelationalExpression: `#field in expr`.
-             * The checker will emit an error if this is not the case.
-             */
-            if (token() === SyntaxKind.PrivateIdentifier) {
-                return parsePrivateIdentifier();
-            }
             /**
              * ES7 UpdateExpression:
              *      1) LeftHandSideExpression[?Yield]
@@ -5611,6 +5603,15 @@ namespace ts {
                     break;
                 case SyntaxKind.TemplateHead:
                     return parseTemplateExpression(/* isTaggedTemplate */ false);
+                case SyntaxKind.PrivateIdentifier:
+                    /**
+                     * If we have a PrivateIdentifier, parse this unconditionally. Even though a privateIdentifier is
+                     * only syntactically valid here when it in in the BinaryExpression: `#field in expr`.
+                     * The checker will emit an error for invalid cases.
+                     */
+                    if (token() === SyntaxKind.PrivateIdentifier) {
+                        return parsePrivateIdentifier();
+                    }
             }
 
             return parseIdentifier(Diagnostics.Expression_expected);

diff --git a/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.symbols b/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.symbols
@@ -15,6 +15,7 @@ export class Foo {
 >this : Symbol(Foo, Decl(main.ts, 0, 0))
 
         #field in this;
+>#field : Symbol(Foo.#field, Decl(main.ts, 0, 18))
 >this : Symbol(Foo, Decl(main.ts, 0, 0))
     }
 }

diff --git a/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.types b/tests/baselines/reference/importHelpersNoHelpersForPrivateFields.types
@@ -18,6 +18,7 @@ export class Foo {
 
         #field in this;
 >#field in this : boolean
+>#field : any
 >this : this
     }
 }