Incorporate checker PR feedback

Signed-off-by: Max Heiber <[email protected]>

Author: Max Heiber

src/compiler/checker.ts

@@ -2680,7 +2680,7 @@ namespace ts {
         }
 
         // A reserved member name starts with two underscores, but the third character cannot be an underscore,
-        // @ or #. A third underscore indicates an escaped form of an identifer that started
+        // @, or #. A third underscore indicates an escaped form of an identifer that started
         // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
         // Symbol instance and the # indicates that the name is a PrivateName.
         function isReservedMemberName(name: __String) {
@@ -12219,7 +12219,7 @@ namespace ts {
                                 reportError(
                                     Diagnostics.Property_0_is_missing_in_type_1_While_type_1_has_a_private_member_with_the_same_spelling_its_declaration_and_accessibility_are_distinct,
                                     diagnosticName(privateNameDescription),
-                                    diagnosticName(source.symbol.valueDeclaration.name || ("anonymous" as __String))
+                                    diagnosticName(source.symbol.valueDeclaration.name || ("(anonymous)" as __String))
                                 );
                                 hasReported = true;
                             }
@@ -18457,7 +18457,7 @@ namespace ts {
                                 right,
                                 Diagnostics.This_usage_of_0_refers_to_the_private_member_declared_in_its_enclosing_class_While_type_1_has_a_private_member_with_the_same_spelling_its_declaration_and_accessibility_are_distinct,
                                 diagnosticName(right),
-                                diagnosticName(classWithShadowedPrivateName.name || ("anonymous" as __String))
+                                diagnosticName(classWithShadowedPrivateName.name || ("(anonymous)" as __String))
                             );
                             return undefined;
                         }
@@ -21439,14 +21439,11 @@ namespace ts {
             }
             if (expr.kind === SyntaxKind.PropertyAccessExpression && isPrivateName((expr as PropertyAccessExpression).name)) {
                 error(expr, Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_private_name);
-
             }
             const links = getNodeLinks(expr);
             const symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
-            if (symbol) {
-                if (isReadonlySymbol(symbol)) {
-                    error(expr, Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_read_only_property);
-                }
+            if (symbol && isReadonlySymbol(symbol)) {
+                error(expr, Diagnostics.The_operand_of_a_delete_operator_cannot_be_a_read_only_property);
             }
             return booleanType;
         }

src/compiler/diagnosticMessages.json

@@ -4307,7 +4307,7 @@
         "category": "Error",
         "code": 18005
     },
-    "#constructor is a reserved word.": {
+    "'#constructor' is a reserved word.": {
         "category": "Error",
         "code": 18006
     },

tests/baselines/reference/privateNameConstructorReserved.errors.txt

@@ -1,22 +1,10 @@
-tests/cases/conformance/classes/members/privateNames/privateNameConstructorReserved.ts(1,7): error TS2300: Duplicate identifier 'A'.
-tests/cases/conformance/classes/members/privateNames/privateNameConstructorReserved.ts(2,5): error TS18006: #constructor is a reserved word.
-tests/cases/conformance/classes/members/privateNames/privateNameConstructorReserved.ts(5,7): error TS2300: Duplicate identifier 'A'.
-tests/cases/conformance/classes/members/privateNames/privateNameConstructorReserved.ts(6,5): error TS18006: #constructor is a reserved word.
+tests/cases/conformance/classes/members/privateNames/privateNameConstructorReserved.ts(2,5): error TS18006: '#constructor' is a reserved word.
 
 
-==== tests/cases/conformance/classes/members/privateNames/privateNameConstructorReserved.ts (4 errors) ====
+==== tests/cases/conformance/classes/members/privateNames/privateNameConstructorReserved.ts (1 errors) ====
     class A {
-          ~
-!!! error TS2300: Duplicate identifier 'A'.
         #constructor() {}      // Error: `#constructor` is a reserved word.
         ~~~~~~~~~~~~
-!!! error TS18006: #constructor is a reserved word.
+!!! error TS18006: '#constructor' is a reserved word.
     }
-    
-    class A {
-          ~
-!!! error TS2300: Duplicate identifier 'A'.
-        #constructor = 5       // Error: `#constructor` is a reserved word.
-        ~~~~~~~~~~~~
-!!! error TS18006: #constructor is a reserved word.
-    }
+    

tests/baselines/reference/privateNameConstructorReserved.js

@@ -2,10 +2,7 @@
 class A {
     #constructor() {}      // Error: `#constructor` is a reserved word.
 }
-
-class A {
-    #constructor = 5       // Error: `#constructor` is a reserved word.
-}
+
 
 //// [privateNameConstructorReserved.js]
 var A = /** @class */ (function () {
@@ -14,9 +11,3 @@ var A = /** @class */ (function () {
     A.prototype.#constructor = function () { }; // Error: `#constructor` is a reserved word.
     return A;
 }());
-var A = /** @class */ (function () {
-    function A() {
-        this.#constructor = 5; // Error: `#constructor` is a reserved word.
-    }
-    return A;
-}());

tests/baselines/reference/privateNameConstructorReserved.symbols

@@ -6,9 +6,3 @@ class A {
 >#constructor : Symbol(A[#constructor], Decl(privateNameConstructorReserved.ts, 0, 9))
 }
 
-class A {
->A : Symbol(A, Decl(privateNameConstructorReserved.ts, 2, 1))
-
-    #constructor = 5       // Error: `#constructor` is a reserved word.
->#constructor : Symbol(A[#constructor], Decl(privateNameConstructorReserved.ts, 4, 9))
-}

tests/baselines/reference/privateNameConstructorReserved.types

@@ -6,10 +6,3 @@ class A {
 >#constructor : () => void
 }
 
-class A {
->A : A
-
-    #constructor = 5       // Error: `#constructor` is a reserved word.
->#constructor : number
->5 : 5
-}

tests/baselines/reference/privateNameDuplicateField.errors.txt

@@ -0,0 +1,11 @@
+tests/cases/conformance/classes/members/privateNames/privateNameDuplicateField.ts(3,5): error TS2300: Duplicate identifier '#foo'.
+
+
+==== tests/cases/conformance/classes/members/privateNames/privateNameDuplicateField.ts (1 errors) ====
+    class A {
+        #foo;
+        #foo;
+        ~~~~
+!!! error TS2300: Duplicate identifier '#foo'.
+    }
+    

tests/baselines/reference/privateNameDuplicateField.js

@@ -0,0 +1,13 @@
+//// [privateNameDuplicateField.ts]
+class A {
+    #foo;
+    #foo;
+}
+
+
+//// [privateNameDuplicateField.js]
+var A = /** @class */ (function () {
+    function A() {
+    }
+    return A;
+}());

tests/baselines/reference/privateNameDuplicateField.symbols

@@ -0,0 +1,11 @@
+=== tests/cases/conformance/classes/members/privateNames/privateNameDuplicateField.ts ===
+class A {
+>A : Symbol(A, Decl(privateNameDuplicateField.ts, 0, 0))
+
+    #foo;
+>#foo : Symbol(A[#foo], Decl(privateNameDuplicateField.ts, 0, 9), Decl(privateNameDuplicateField.ts, 1, 9))
+
+    #foo;
+>#foo : Symbol(A[#foo], Decl(privateNameDuplicateField.ts, 0, 9), Decl(privateNameDuplicateField.ts, 1, 9))
+}
+

tests/baselines/reference/privateNameDuplicateField.types

@@ -0,0 +1,11 @@
+=== tests/cases/conformance/classes/members/privateNames/privateNameDuplicateField.ts ===
+class A {
+>A : A
+
+    #foo;
+>#foo : any
+
+    #foo;
+>#foo : any
+}
+

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

@@ -1,7 +1,3 @@
 class A {
     #constructor() {}      // Error: `#constructor` is a reserved word.
 }
-
-class A {
-    #constructor = 5       // Error: `#constructor` is a reserved word.
-}

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

@@ -0,0 +1,4 @@
+class A {
+    #foo;
+    #foo;
+}