Disallow 'declare' modifier on private named properties (microsoft#36381)

ajafff · DanielRosenwasser · commit 49eb0d7a2b87 · 2020-01-23T13:18:10.000-08:00
Fixes: microsoft#36345
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -35350,6 +35350,9 @@ namespace ts {
                                 return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "abstract");
                             }
                         }
+                        else if (isPrivateIdentifierPropertyDeclaration(node)) {
+                            return grammarErrorOnNode(modifier, Diagnostics.An_accessibility_modifier_cannot_be_used_with_a_private_identifier);
+                        }
                         flags |= modifierToFlag(modifier.kind);
                         break;
 
@@ -35436,6 +35439,9 @@ namespace ts {
                         else if ((node.parent.flags & NodeFlags.Ambient) && node.parent.kind === SyntaxKind.ModuleBlock) {
                             return grammarErrorOnNode(modifier, Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
+                        else if (isPrivateIdentifierPropertyDeclaration(node)) {
+                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "declare");
+                        }
                         flags |= ModifierFlags.Ambient;
                         lastDeclare = modifier;
                         break;
@@ -35462,7 +35468,7 @@ namespace ts {
                             }
                         }
                         if (isNamedDeclaration(node) && node.name.kind === SyntaxKind.PrivateIdentifier) {
-                            return grammarErrorOnNode(node, Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "abstract");
+                            return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "abstract");
                         }
 
                         flags |= ModifierFlags.Abstract;
@@ -35508,9 +35514,6 @@ namespace ts {
             else if (node.kind === SyntaxKind.Parameter && (flags & ModifierFlags.ParameterPropertyModifier) && (<ParameterDeclaration>node).dotDotDotToken) {
                 return grammarErrorOnNode(node, Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
-            else if (isNamedDeclaration(node) && (flags & ModifierFlags.AccessibilityModifier) && node.name.kind === SyntaxKind.PrivateIdentifier) {
-                return grammarErrorOnNode(node, Diagnostics.An_accessibility_modifier_cannot_be_used_with_a_private_identifier);
-            }
             if (flags & ModifierFlags.Async) {
                 return checkGrammarAsyncModifier(node, lastAsync!);
             }
diff --git a/tests/baselines/reference/privateNamesIncompatibleModifiers.errors.txt b/tests/baselines/reference/privateNamesIncompatibleModifiers.errors.txt
@@ -1,26 +1,30 @@
-tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(2,12): error TS18010: An accessibility modifier cannot be used with a private identifier.
-tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(3,13): error TS18010: An accessibility modifier cannot be used with a private identifier.
-tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(4,15): error TS18010: An accessibility modifier cannot be used with a private identifier.
-tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(9,14): error TS18019: 'abstract' modifier cannot be used with a private identifier
+tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(2,5): error TS18010: An accessibility modifier cannot be used with a private identifier.
+tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(3,5): error TS18010: An accessibility modifier cannot be used with a private identifier.
+tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(4,5): error TS18010: An accessibility modifier cannot be used with a private identifier.
+tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(6,5): error TS18019: 'declare' modifier cannot be used with a private identifier
+tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts(10,5): error TS18019: 'abstract' modifier cannot be used with a private identifier
 
 
-==== tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts (4 errors) ====
+==== tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts (5 errors) ====
     class A {
         public #foo = 3;         // Error
-               ~~~~
+        ~~~~~~
 !!! error TS18010: An accessibility modifier cannot be used with a private identifier.
         private #bar = 3;        // Error
-                ~~~~
+        ~~~~~~~
 !!! error TS18010: An accessibility modifier cannot be used with a private identifier.
         protected #baz = 3;      // Error
-                  ~~~~
+        ~~~~~~~~~
 !!! error TS18010: An accessibility modifier cannot be used with a private identifier.
         readonly #qux = 3;       // OK
+        declare #what: number;   // Error
+        ~~~~~~~
+!!! error TS18019: 'declare' modifier cannot be used with a private identifier
     }
     
     abstract class B {
         abstract #quux = 3;      // Error
-                 ~~~~~
+        ~~~~~~~~
 !!! error TS18019: 'abstract' modifier cannot be used with a private identifier
     }
     
diff --git a/tests/baselines/reference/privateNamesIncompatibleModifiers.js b/tests/baselines/reference/privateNamesIncompatibleModifiers.js
@@ -4,6 +4,7 @@ class A {
     private #bar = 3;        // Error
     protected #baz = 3;      // Error
     readonly #qux = 3;       // OK
+    declare #what: number;   // Error
 }
 
 abstract class B {
diff --git a/tests/baselines/reference/privateNamesIncompatibleModifiers.symbols b/tests/baselines/reference/privateNamesIncompatibleModifiers.symbols
@@ -13,12 +13,15 @@ class A {
 
     readonly #qux = 3;       // OK
 >#qux : Symbol(A.#qux, Decl(privateNamesIncompatibleModifiers.ts, 3, 23))
+
+    declare #what: number;   // Error
+>#what : Symbol(A.#what, Decl(privateNamesIncompatibleModifiers.ts, 4, 22))
 }
 
 abstract class B {
->B : Symbol(B, Decl(privateNamesIncompatibleModifiers.ts, 5, 1))
+>B : Symbol(B, Decl(privateNamesIncompatibleModifiers.ts, 6, 1))
 
     abstract #quux = 3;      // Error
->#quux : Symbol(B.#quux, Decl(privateNamesIncompatibleModifiers.ts, 7, 18))
+>#quux : Symbol(B.#quux, Decl(privateNamesIncompatibleModifiers.ts, 8, 18))
 }
 
diff --git a/tests/baselines/reference/privateNamesIncompatibleModifiers.types b/tests/baselines/reference/privateNamesIncompatibleModifiers.types
@@ -17,6 +17,9 @@ class A {
     readonly #qux = 3;       // OK
 >#qux : 3
 >3 : 3
+
+    declare #what: number;   // Error
+>#what : number
 }
 
 abstract class B {
diff --git a/tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts b/tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts
@@ -6,6 +6,7 @@ class A {
     private #bar = 3;        // Error
     protected #baz = 3;      // Error
     readonly #qux = 3;       // OK
+    declare #what: number;   // Error
 }
 
 abstract class B {

Original file line number	Diff line number	Diff line change
`@@ -35350,6 +35350,9 @@ namespace ts {`
`35350`	`35350`	`return grammarErrorOnNode(modifier, Diagnostics._0_modifier_must_precede_1_modifier, text, "abstract");`
`35351`	`35351`	`}`
`35352`	`35352`	`}`
	`35353`	`+ else if (isPrivateIdentifierPropertyDeclaration(node)) {`
	`35354`	`+ return grammarErrorOnNode(modifier, Diagnostics.An_accessibility_modifier_cannot_be_used_with_a_private_identifier);`
	`35355`	`+ }`
`35353`	`35356`	`flags \|= modifierToFlag(modifier.kind);`
`35354`	`35357`	`break;`
`35355`	`35358`
`@@ -35436,6 +35439,9 @@ namespace ts {`
`35436`	`35439`	`else if ((node.parent.flags & NodeFlags.Ambient) && node.parent.kind === SyntaxKind.ModuleBlock) {`
`35437`	`35440`	`return grammarErrorOnNode(modifier, Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);`
`35438`	`35441`	`}`
	`35442`	`+ else if (isPrivateIdentifierPropertyDeclaration(node)) {`
	`35443`	`+ return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "declare");`
	`35444`	`+ }`
`35439`	`35445`	`flags \|= ModifierFlags.Ambient;`
`35440`	`35446`	`lastDeclare = modifier;`
`35441`	`35447`	`break;`
`@@ -35462,7 +35468,7 @@ namespace ts {`
`35462`	`35468`	`}`
`35463`	`35469`	`}`
`35464`	`35470`	`if (isNamedDeclaration(node) && node.name.kind === SyntaxKind.PrivateIdentifier) {`
`35465`		`- return grammarErrorOnNode(node, Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "abstract");`
	`35471`	`+ return grammarErrorOnNode(modifier, Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "abstract");`
`35466`	`35472`	`}`
`35467`	`35473`
`35468`	`35474`	`flags \|= ModifierFlags.Abstract;`
`@@ -35508,9 +35514,6 @@ namespace ts {`
`35508`	`35514`	`else if (node.kind === SyntaxKind.Parameter && (flags & ModifierFlags.ParameterPropertyModifier) && (<ParameterDeclaration>node).dotDotDotToken) {`
`35509`	`35515`	`return grammarErrorOnNode(node, Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);`
`35510`	`35516`	`}`
`35511`		`- else if (isNamedDeclaration(node) && (flags & ModifierFlags.AccessibilityModifier) && node.name.kind === SyntaxKind.PrivateIdentifier) {`
`35512`		`- return grammarErrorOnNode(node, Diagnostics.An_accessibility_modifier_cannot_be_used_with_a_private_identifier);`
`35513`		`- }`
`35514`	`35517`	`if (flags & ModifierFlags.Async) {`
`35515`	`35518`	`return checkGrammarAsyncModifier(node, lastAsync!);`
`35516`	`35519`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ class A {`
`4`	`4`	`private #bar = 3; // Error`
`5`	`5`	`protected #baz = 3; // Error`
`6`	`6`	`readonly #qux = 3; // OK`
	`7`	`+ declare #what: number; // Error`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`abstract class B {`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,15 @@ class A {`
`13`	`13`
`14`	`14`	`readonly #qux = 3; // OK`
`15`	`15`	`>#qux : Symbol(A.#qux, Decl(privateNamesIncompatibleModifiers.ts, 3, 23))`
	`16`	`+`
	`17`	`+ declare #what: number; // Error`
	`18`	`+>#what : Symbol(A.#what, Decl(privateNamesIncompatibleModifiers.ts, 4, 22))`
`16`	`19`	`}`
`17`	`20`
`18`	`21`	`abstract class B {`
`19`		`->B : Symbol(B, Decl(privateNamesIncompatibleModifiers.ts, 5, 1))`
	`22`	`+>B : Symbol(B, Decl(privateNamesIncompatibleModifiers.ts, 6, 1))`
`20`	`23`
`21`	`24`	`abstract #quux = 3; // Error`
`22`		`->#quux : Symbol(B.#quux, Decl(privateNamesIncompatibleModifiers.ts, 7, 18))`
	`25`	`+>#quux : Symbol(B.#quux, Decl(privateNamesIncompatibleModifiers.ts, 8, 18))`
`23`	`26`	`}`
`24`	`27`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ class A {`
`17`	`17`	`readonly #qux = 3; // OK`
`18`	`18`	`>#qux : 3`
`19`	`19`	`>3 : 3`
	`20`	`+`
	`21`	`+ declare #what: number; // Error`
	`22`	`+>#what : number`
`20`	`23`	`}`
`21`	`24`
`22`	`25`	`abstract class B {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ class A {`
`6`	`6`	`private #bar = 3; // Error`
`7`	`7`	`protected #baz = 3; // Error`
`8`	`8`	`readonly #qux = 3; // OK`
	`9`	`+ declare #what: number; // Error`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`abstract class B {`