microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 11:35:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

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

Browse Source 
Fixes: #36345
This commit is contained in:
Klaus Meinhardt 2020-01-23 22:18:10 +01:00 committed by Daniel Rosenwasser
parent 677e45ccb8
commit 49eb0d7a2b
6 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/checker.ts
View File

@ -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!);
}

22
tests/baselines/reference/privateNamesIncompatibleModifiers.errors.txt
View File

@ -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
}

1
tests/baselines/reference/privateNamesIncompatibleModifiers.js
View File

@ -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 {

7
tests/baselines/reference/privateNamesIncompatibleModifiers.symbols
View File

@ -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))
}

3
tests/baselines/reference/privateNamesIncompatibleModifiers.types
View File

@ -17,6 +17,9 @@ class A {
readonly #qux = 3; // OK
>#qux : 3
>3 : 3
declare #what: number; // Error
>#what : number
}
abstract class B {

1
tests/cases/conformance/classes/members/privateNames/privateNamesIncompatibleModifiers.ts
View File

@ -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 {