Skip to content

Commit 1267fd3

Browse files
author
Andy Hanson
committed
Don't use nameTable for type keywords, and don't handle keyof.
1 parent 2d232c2 commit 1267fd3

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed

src/services/findAllReferences.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,7 @@ namespace ts.FindAllReferences {
353353
const references: ReferenceEntry[] = [];
354354
for (const sourceFile of sourceFiles) {
355355
cancellationToken.throwIfCancellationRequested();
356-
if (sourceFileHasName(sourceFile, name)) {
357-
addReferencesForKeywordInFile(sourceFile, keywordKind, name, cancellationToken, references);
358-
}
356+
addReferencesForKeywordInFile(sourceFile, keywordKind, name, cancellationToken, references);
359357
}
360358

361359
return [{ definition, references }];

src/services/services.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,20 +1975,11 @@ namespace ts {
19751975
setNameTable((<LiteralExpression>node).text, node);
19761976
}
19771977
break;
1978-
case SyntaxKind.TypeOperator:
1979-
setNameTable(tokenToString((node as ts.TypeOperatorNode).operator), node);
1980-
forEachChild(node, walk);
1981-
break;
19821978
default:
1983-
if (isTypeKeyword(node.kind)) {
1984-
setNameTable(tokenToString(node.kind), node);
1985-
}
1986-
else {
1987-
forEachChild(node, walk);
1988-
if (node.jsDoc) {
1989-
for (const jsDoc of node.jsDoc) {
1990-
forEachChild(jsDoc, walk);
1991-
}
1979+
forEachChild(node, walk);
1980+
if (node.jsDoc) {
1981+
for (const jsDoc of node.jsDoc) {
1982+
forEachChild(jsDoc, walk);
19921983
}
19931984
}
19941985
}

src/services/utilities.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// These utilities are common to multiple language service features.
1+
// These utilities are common to multiple language service features.
22
/* @internal */
33
namespace ts {
44
export const scanner: Scanner = createScanner(ScriptTarget.Latest, /*skipTrivia*/ true);
@@ -1126,7 +1126,6 @@ namespace ts {
11261126
case SyntaxKind.BooleanKeyword:
11271127
case SyntaxKind.NeverKeyword:
11281128
case SyntaxKind.NumberKeyword:
1129-
case SyntaxKind.KeyOfKeyword:
11301129
case SyntaxKind.ObjectKeyword:
11311130
case SyntaxKind.StringKeyword:
11321131
case SyntaxKind.SymbolKeyword:

tests/cases/fourslash/findAllRefsPrimitive.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
////function v(v: [|void|]): [|void|];
2323

24-
////function k(x: [|keyof|] Date): [|keyof|] Date;
25-
2624
// @Filename: b.ts
2725
// const z: [|any|] = 0;
2826

0 commit comments

Comments
 (0)