More PR feedback

Author: rbuckton

src/compiler/types.ts

@@ -1013,11 +1013,6 @@ export type ForEachChildNodes =
     | JSDocOverloadTag
     ;
 
-/** @internal */
-export type VisitEachChildNodes =
-    | HasChildren
-    ;
-
 /** @internal */
 export type HasChildren =
     | QualifiedName

src/compiler/utilitiesPublic.ts

@@ -190,6 +190,7 @@ import {
     JsxExpression,
     JsxOpeningLikeElement,
     JsxTagNameExpression,
+    KeywordSyntaxKind,
     LabeledStatement,
     lastOrUndefined,
     LeftHandSideExpression,
@@ -769,7 +770,7 @@ export function idText(identifierOrPrivateName: Identifier | PrivateIdentifier):
  * If the text of an Identifier matches a keyword (including contextual and TypeScript-specific keywords), returns the
  * SyntaxKind for the matching keyword.
  */
-export function identifierToKeywordKind(node: Identifier) {
+export function identifierToKeywordKind(node: Identifier): KeywordSyntaxKind | undefined {
     const token = stringToToken(node.escapedText as string);
     return token ? tryCast(token, isKeyword) : undefined;
 }

src/harness/harnessUtils.ts

@@ -1,6 +1,5 @@
 import * as ts from "./_namespaces/ts";
 import * as Harness from "./_namespaces/Harness";
-import { isIdentifier } from "./_namespaces/ts";
 
 export function encodeString(s: string): string {
     return ts.sys.bufferFrom!(s).toString("utf8");
@@ -221,7 +220,7 @@ export function sourceFileToJSON(file: ts.Node): string {
                     // data we don't care about in the dump. We only care what the parser set directly
                     // on the AST.
                     let flags = n.flags & ~(ts.NodeFlags.JavaScriptFile | ts.NodeFlags.HasAggregatedChildData);
-                    if (isIdentifier(n)) {
+                    if (ts.isIdentifier(n)) {
                         if (flags & ts.NodeFlags.IdentifierHasExtendedUnicodeEscape) {
                             o.hasExtendedUnicodeEscape = true;
                             flags &= ~ts.NodeFlags.IdentifierHasExtendedUnicodeEscape;

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -4414,8 +4414,7 @@ declare namespace ts {
         ReachabilityCheckFlags = 768,
         ReachabilityAndEmitFlags = 2816,
         ContextFlags = 50720768,
-        TypeExcludesFlags = 40960,
-        IdentifierIsInJSDocNamespace = 2048
+        TypeExcludesFlags = 40960
     }
     enum ModifierFlags {
         None = 0,
@@ -4585,14 +4584,16 @@ declare namespace ts {
          * Text of identifier, but if the identifier begins with two underscores, this will begin with three.
          */
         readonly escapedText: __String;
-        /** @deprecated Use `idKeyword(identifier)` instead. */
-        readonly originalKeywordKind?: SyntaxKind;
-        /** @deprecated Use `identifier.flags & NodeFlags.IdentifierIsInJSDocNamespace` instead. */
-        readonly isInJSDocNamespace?: boolean;
     }
     interface Identifier {
         readonly text: string;
     }
+    interface Identifier {
+        /** @deprecated Use `idKeyword(identifier)` instead. */
+        readonly originalKeywordKind?: SyntaxKind;
+        /** @deprecated Use `.parent` or the surrounding context to determine this instead. */
+        readonly isInJSDocNamespace?: boolean;
+    }
     interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
     }
@@ -8605,7 +8606,7 @@ declare namespace ts {
      * If the text of an Identifier matches a keyword (including contextual and TypeScript-specific keywords), returns the
      * SyntaxKind for the matching keyword.
      */
-    function idKeyword(node: Identifier): SyntaxKind | undefined;
+    function identifierToKeywordKind(node: Identifier): KeywordSyntaxKind | undefined;
     function symbolName(symbol: Symbol): string;
     function getNameOfJSDocTypedef(declaration: JSDocTypedefTag): Identifier | PrivateIdentifier | undefined;
     function getNameOfDeclaration(declaration: Declaration | Expression | undefined): DeclarationName | undefined;

tests/baselines/reference/api/typescript.d.ts

@@ -479,8 +479,7 @@ declare namespace ts {
         ReachabilityCheckFlags = 768,
         ReachabilityAndEmitFlags = 2816,
         ContextFlags = 50720768,
-        TypeExcludesFlags = 40960,
-        IdentifierIsInJSDocNamespace = 2048
+        TypeExcludesFlags = 40960
     }
     enum ModifierFlags {
         None = 0,
@@ -650,14 +649,16 @@ declare namespace ts {
          * Text of identifier, but if the identifier begins with two underscores, this will begin with three.
          */
         readonly escapedText: __String;
-        /** @deprecated Use `idKeyword(identifier)` instead. */
-        readonly originalKeywordKind?: SyntaxKind;
-        /** @deprecated Use `identifier.flags & NodeFlags.IdentifierIsInJSDocNamespace` instead. */
-        readonly isInJSDocNamespace?: boolean;
     }
     interface Identifier {
         readonly text: string;
     }
+    interface Identifier {
+        /** @deprecated Use `idKeyword(identifier)` instead. */
+        readonly originalKeywordKind?: SyntaxKind;
+        /** @deprecated Use `.parent` or the surrounding context to determine this instead. */
+        readonly isInJSDocNamespace?: boolean;
+    }
     interface TransientIdentifier extends Identifier {
         resolvedSymbol: Symbol;
     }
@@ -4670,7 +4671,7 @@ declare namespace ts {
      * If the text of an Identifier matches a keyword (including contextual and TypeScript-specific keywords), returns the
      * SyntaxKind for the matching keyword.
      */
-    function idKeyword(node: Identifier): SyntaxKind | undefined;
+    function identifierToKeywordKind(node: Identifier): KeywordSyntaxKind | undefined;
     function symbolName(symbol: Symbol): string;
     function getNameOfJSDocTypedef(declaration: JSDocTypedefTag): Identifier | PrivateIdentifier | undefined;
     function getNameOfDeclaration(declaration: Declaration | Expression | undefined): DeclarationName | undefined;