post PR review improvements:

- simplify obtaining private fields's static or instance type
- make visitor node test more specific
- clean up warnings about static class fields in tests

Signed-off-by: Ashley Claymore <[email protected]>

Author: acutmore

src/compiler/checker.ts

@@ -23245,16 +23245,15 @@ namespace ts {
                 }
                 const classSymbol = symbol.parent!;
                 const classType = <InterfaceType>getTypeOfSymbol(classSymbol);
-                const firstDecl = symbol.declarations?.[0];
-                Debug.assert(firstDecl, "should always have a declaration");
+                const classDecl = symbol.valueDeclaration;
+                Debug.assert(classDecl, "should always have a declaration");
                 let targetType: Type;
-                if (hasSyntacticModifier(firstDecl, ModifierFlags.Static)) {
+                if (hasStaticModifier(classDecl)) {
                     targetType = classType;
                 }
                 else {
-                    const ctorSigs = getSignaturesOfType(classType, SignatureKind.Construct);
-                    Debug.assert(ctorSigs.length > 0, "should always have a constructor");
-                    targetType = getReturnTypeOfSignature(ctorSigs[0]);
+                    const classInstanceType = getDeclaredTypeOfSymbol(classSymbol);
+                    targetType = classInstanceType;
                 }
                 return getNarrowedType(type, targetType, assumeTrue, isTypeDerivedFrom);
             }

src/compiler/transformers/classFields.ts

@@ -220,7 +220,6 @@ namespace ts {
             }
 
             // Private name has not been declared. Subsequent transformers will handle this error
-            // TODO(aclaymore): confirm this is how we want to handle the error
             return visitEachChild(node, visitor, context);
         }
 

src/compiler/utilities.ts

@@ -3580,9 +3580,6 @@ namespace ts {
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
 
-            case SyntaxKind.PrivateIdentifierInInExpression:
-                return OperatorPrecedence.Relational;
-
             // TODO: Should prefix `++` and `--` be moved to the `Update` precedence?
             case SyntaxKind.TypeAssertionExpression:
             case SyntaxKind.NonNullExpression:
@@ -3609,6 +3606,7 @@ namespace ts {
                 return OperatorPrecedence.Member;
 
             case SyntaxKind.AsExpression:
+            case SyntaxKind.PrivateIdentifierInInExpression:
                 return OperatorPrecedence.Relational;
 
             case SyntaxKind.ThisKeyword:

src/compiler/visitorPublic.ts

@@ -795,7 +795,7 @@ namespace ts {
 
             case SyntaxKind.PrivateIdentifierInInExpression:
                 return factory.updatePrivateIdentifierInInExpression(<PrivateIdentifierInInExpression>node,
-                    nodeVisitor((<PrivateIdentifierInInExpression>node).name, visitor, isExpression),
+                    nodeVisitor((<PrivateIdentifierInInExpression>node).name, visitor, isMemberName),
                     nodeVisitor((<PrivateIdentifierInInExpression>node).inToken, tokenVisitor, isToken),
                     nodeVisitor((<PrivateIdentifierInInExpression>node).expression, visitor, isExpression));
 

tests/baselines/reference/privateNameInInExpression.errors.txt

@@ -1,4 +1,3 @@
-tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts(3,27): error TS2805: Static fields with private names can't have initializers when the '--useDefineForClassFields' flag is not specified with a '--target' of 'esnext'. Consider adding the '--useDefineForClassFields' flag.
 tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts(21,29): error TS2571: Object is of type 'unknown'.
 tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts(23,19): error TS2552: Cannot find name '#fiel'. Did you mean '#field'?
 tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts(25,20): error TS2304: Cannot find name '#field'.
@@ -10,12 +9,10 @@ tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.t
 tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts(108,12): error TS18016: Private identifiers are not allowed outside class bodies.
 
 
-==== tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts (10 errors) ====
+==== tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts (9 errors) ====
     class Foo {
         #field = 1;
         static #staticField = 2;
-                              ~
-!!! error TS2805: Static fields with private names can't have initializers when the '--useDefineForClassFields' flag is not specified with a '--target' of 'esnext'. Consider adding the '--useDefineForClassFields' flag.
         #method() {}
         static #staticMethod() {}
 

tests/baselines/reference/privateNameInInExpression.js

@@ -113,11 +113,8 @@ function badSyntax(v: Foo) {
 //// [privateNameInInExpression.js]
 "use strict";
 class Foo {
-    constructor() {
-        this.#field = 1;
-    }
-    #field;
-    static #staticField;
+    #field = 1;
+    static #staticField = 2;
     #method() { }
     static #staticMethod() { }
     goodRhs(v) {
@@ -202,17 +199,11 @@ class Foo {
         }
     }
 }
-Foo.#staticField = 2;
 class FooSub extends Foo {
-    constructor() {
-        super(...arguments);
-        this.subTypeOfFoo = true;
-    }
+    subTypeOfFoo = true;
 }
 class Bar {
-    constructor() {
-        this.notFoo = true;
-    }
+    notFoo = true;
 }
 function badSyntax(v) {
     return #field in v; // Bad - outside of class

tests/cases/conformance/classes/members/privateNames/privateNameInInExpression.ts

@@ -1,5 +1,6 @@
 // @strict: true
 // @target: esnext
+// @useDefineForClassFields: true
 
 class Foo {
     #field = 1;