Skip to content

Commit 52ac031

Browse files
committed
Revert "feat(47595): allow using private fields in type queries (microsoft#47696)"
This reverts commit 063eaa7.
1 parent f579f33 commit 52ac031

File tree

6 files changed

+8
-130
lines changed

6 files changed

+8
-130
lines changed

Diff for: src/compiler/parser.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ namespace ts {
944944
initializeState("", content, languageVersion, /*syntaxCursor*/ undefined, ScriptKind.JS);
945945
// Prime the scanner.
946946
nextToken();
947-
const entityName = parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ false);
947+
const entityName = parseEntityName(/*allowReservedWords*/ true);
948948
const isInvalid = token() === SyntaxKind.EndOfFileToken && !parseDiagnostics.length;
949949
clearState();
950950
return isInvalid ? entityName : undefined;
@@ -2829,7 +2829,7 @@ namespace ts {
28292829
return createMissingList<T>();
28302830
}
28312831

2832-
function parseEntityName(allowReservedWords: boolean, allowPrivateIdentifiers: boolean, diagnosticMessage?: DiagnosticMessage): EntityName {
2832+
function parseEntityName(allowReservedWords: boolean, diagnosticMessage?: DiagnosticMessage): EntityName {
28332833
const pos = getNodePos();
28342834
let entity: EntityName = allowReservedWords ? parseIdentifierName(diagnosticMessage) : parseIdentifier(diagnosticMessage);
28352835
let dotPos = getNodePos();
@@ -2843,7 +2843,7 @@ namespace ts {
28432843
entity = finishNode(
28442844
factory.createQualifiedName(
28452845
entity,
2846-
parseRightSideOfDot(allowReservedWords, allowPrivateIdentifiers) as Identifier
2846+
parseRightSideOfDot(allowReservedWords, /* allowPrivateIdentifiers */ false) as Identifier
28472847
),
28482848
pos
28492849
);
@@ -3028,7 +3028,7 @@ namespace ts {
30283028
// TYPES
30293029

30303030
function parseEntityNameOfTypeReference() {
3031-
return parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ false, Diagnostics.Type_expected);
3031+
return parseEntityName(/*allowReservedWords*/ true, Diagnostics.Type_expected);
30323032
}
30333033

30343034
function parseTypeArgumentsOfTypeReference() {
@@ -3188,7 +3188,7 @@ namespace ts {
31883188
function parseTypeQuery(): TypeQueryNode {
31893189
const pos = getNodePos();
31903190
parseExpected(SyntaxKind.TypeOfKeyword);
3191-
const entityName = parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ true);
3191+
const entityName = parseEntityName(/*allowReservedWords*/ true);
31923192
// Make sure we perform ASI to prevent parsing the next line's type arguments as part of an instantiation expression.
31933193
const typeArguments = !scanner.hasPrecedingLineBreak() ? tryParseTypeArguments() : undefined;
31943194
return finishNode(factory.createTypeQueryNode(entityName, typeArguments), pos);
@@ -7470,7 +7470,7 @@ namespace ts {
74707470
function parseModuleReference() {
74717471
return isExternalModuleReference()
74727472
? parseExternalModuleReference()
7473-
: parseEntityName(/*allowReservedWords*/ false, /*allowPrivateIdentifiers*/ false);
7473+
: parseEntityName(/*allowReservedWords*/ false);
74747474
}
74757475

74767476
function parseExternalModuleReference() {
@@ -7743,7 +7743,7 @@ namespace ts {
77437743
const pos = getNodePos();
77447744
const hasBrace = parseOptional(SyntaxKind.OpenBraceToken);
77457745
const p2 = getNodePos();
7746-
let entityName: EntityName | JSDocMemberName = parseEntityName(/* allowReservedWords*/ false, /*allowPrivateIdentifiers*/ false);
7746+
let entityName: EntityName | JSDocMemberName = parseEntityName(/* allowReservedWords*/ false);
77477747
while (token() === SyntaxKind.PrivateIdentifier) {
77487748
reScanHashToken(); // rescan #id as # id
77497749
nextTokenJSDoc(); // then skip the #
@@ -8206,7 +8206,7 @@ namespace ts {
82068206
// parseEntityName logs an error for non-identifier, so create a MissingNode ourselves to avoid the error
82078207
const p2 = getNodePos();
82088208
let name: EntityName | JSDocMemberName | undefined = tokenIsIdentifierOrKeyword(token())
8209-
? parseEntityName(/*allowReservedWords*/ true, /*allowPrivateIdentifiers*/ false)
8209+
? parseEntityName(/*allowReservedWords*/ true)
82108210
: undefined;
82118211
if (name) {
82128212
while (token() === SyntaxKind.PrivateIdentifier) {

Diff for: tests/baselines/reference/privateNameInTypeQuery.errors.txt

-21
This file was deleted.

Diff for: tests/baselines/reference/privateNameInTypeQuery.js

-25
This file was deleted.

Diff for: tests/baselines/reference/privateNameInTypeQuery.symbols

-28
This file was deleted.

Diff for: tests/baselines/reference/privateNameInTypeQuery.types

-34
This file was deleted.

Diff for: tests/cases/conformance/classes/members/privateNames/privateNameInTypeQuery.ts

-14
This file was deleted.

0 commit comments

Comments
 (0)