Refactor wrapSymbolTrackerToReportForContext to improve perf

microsoft · Dec 13, 2022 · afc0496 · afc0496
1 parent d4c2ef3
commit afc0496
Show file tree

Hide file tree

Showing 6 changed files with 200 additions and 120 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -28,7 +28,8 @@ import {
     BundleFileTextLikeKind,
     CallExpression,
     CallSignatureDeclaration,
-    canHaveLocals, CaseBlock,
+    canHaveLocals,
+    CaseBlock,
     CaseClause,
     CaseOrDefaultClause,
     cast,
@@ -181,7 +182,8 @@ import {
     getTransformers,
     getTypeNode,
     guessIndentation,
-    HasLocals, hasRecordedExternalHelpers,
+    HasLocals,
+    hasRecordedExternalHelpers,
     HeritageClause,
     Identifier,
     idText,
@@ -412,7 +414,8 @@ import {
     tracing,
     TransformationResult,
     transformNodes,
-    tryCast, tryParseRawSourceMap,
+    tryCast,
+    tryParseRawSourceMap,
     TryStatement,
     TupleTypeNode,
     TypeAliasDeclaration,

diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -896,10 +896,13 @@ export interface Node extends ReadonlyTextRange {
     /** @internal */ modifierFlagsCache: ModifierFlags;
     /** @internal */ readonly transformFlags: TransformFlags; // Flags for transforms
     /** @internal */ id?: NodeId;                          // Unique id (used to look up NodeLinks)
-    readonly parent: Node;                                // Parent node (initialized by binding)
+    readonly parent: Node;                                 // Parent node (initialized by binding)
     /** @internal */ original?: Node;                      // The original node if this is an updated node.
-
     /** @internal */ emitNode?: EmitNode;                  // Associated EmitNode (initialized by transforms)
+    // NOTE: `symbol` and `localSymbol` have been moved to `Declaration`
+    //       `locals` and `nextContainer` have been moved to `LocalsContainer`
+    //       `flowNode` has been moved to `FlowContainer`
+    //       see: https://github.com/microsoft/TypeScript/pull/51682
 }
 
 export interface JSDocContainer extends Node {
@@ -5381,7 +5384,7 @@ export interface SymbolWalker {
 
 // This was previously deprecated in our public API, but is still used internally
 /** @internal */
-export interface SymbolWriter extends SymbolTracker {
+export interface SymbolWriter {
     writeKeyword(text: string): void;
     writeOperator(text: string): void;
     writePunctuation(text: string): void;

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -607,10 +607,6 @@ function createSingleLineStringWriter(): EmitTextWriter {
         increaseIndent: noop,
         decreaseIndent: noop,
         clear: () => str = "",
-        trackSymbol: () => false,
-        reportInaccessibleThisError: noop,
-        reportInaccessibleUniqueSymbolError: noop,
-        reportPrivateInBaseOfClassExpression: noop,
     };
 }
 
@@ -5325,10 +5321,6 @@ export function createTextWriter(newLine: string): EmitTextWriter {
         hasTrailingComment: () => hasTrailingComment,
         hasTrailingWhitespace: () => !!output.length && isWhiteSpaceLike(output.charCodeAt(output.length - 1)),
         clear: reset,
-        reportInaccessibleThisError: noop,
-        reportPrivateInBaseOfClassExpression: noop,
-        reportInaccessibleUniqueSymbolError: noop,
-        trackSymbol: () => false,
         writeKeyword: write,
         writeOperator: write,
         writeParameter: write,

diff --git a/src/services/inlayHints.ts b/src/services/inlayHints.ts
@@ -387,7 +387,7 @@ export function provideInlayHints(context: InlayHintsContext): InlayHint[] {
         const printer = createPrinter(options);
 
         return usingSingleLineStringWriter(writer => {
-            const typeNode = checker.typeToTypeNode(type, /*enclosingDeclaration*/ undefined, flags, writer);
+            const typeNode = checker.typeToTypeNode(type, /*enclosingDeclaration*/ undefined, flags);
             Debug.assertIsDefined(typeNode, "should always get typenode");
             printer.writeNode(EmitHint.Unspecified, typeNode, /*sourceFile*/ file, writer);
         });

diff --git a/src/services/utilities.ts b/src/services/utilities.ts
@@ -271,7 +271,6 @@ import {
     nodeIsMissing,
     nodeIsPresent,
     nodeIsSynthesized,
-    noop,
     normalizePath,
     NoSubstitutionTemplateLiteral,
     notImplemented,
@@ -2721,10 +2720,6 @@ function getDisplayPartWriter(): DisplayPartsSymbolWriter {
         increaseIndent: () => { indent++; },
         decreaseIndent: () => { indent--; },
         clear: resetWriter,
-        trackSymbol: () => false,
-        reportInaccessibleThisError: noop,
-        reportInaccessibleUniqueSymbolError: noop,
-        reportPrivateInBaseOfClassExpression: noop,
     };
 
     function writeIndent() {