Move auto-generated identifier info into separate object

Author: rbuckton

after.log

@@ -0,0 +1,35 @@
+$ node --log-deopt --redirect-code-traces --redirect-code-traces-to=\\.\NUL --log-ic --log-maps --log-maps-details --log-code --log-source-code --prof --log-internal-timer-events --detailed-line-info --logfile=monaco-autoGenerate-v8.log --no-logfile-per-isolate D:/dev/TypeScript-Polymorph/built/local/tsc.js -p D:\Dev\TypeScript\internal\cases\perf\solutions\monaco\ --outDir C:\Users\rbuckton\AppData\Local\Temp\perf-outDir
+error TS2318: Cannot find global type 'Extract'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/base/dom/builder.ts(86,43): error TS2358: The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/base/dom/mockDom.ts(189,14): error TS2420: Class 'MockElement' incorrectly implements interface 'Element'.
+  Types of property 'addEventListener' are incompatible.
+    Type '(type: string, listener: EventListener, useCapture?: boolean) => void' is not assignable to type '{ (type: "pointerenter", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; (type: "pointerout", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; (type: "pointerdown", listener: (ev: PointerEvent) => any, useCapture?: boolean): void; (type: "pointerup", listener: (ev: PointerEvent) =>...'.
+      Types of parameters 'listener' and 'listener' are incompatible.
+        Types of parameters 'ev' and 'evt' are incompatible.
+          Type 'Event' is not assignable to type 'PointerEvent'.
+            Type 'Event' is missing the following properties from type 'PointerEvent': width, rotation, pressure, pointerType, and 38 more.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/base/ui/widgets/tree/treeDefaults.ts(108,8): error TS1345: An expression of type 'void' cannot be tested for truthiness.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/editor/contrib/goToDeclaration/goToDeclaration.ts(246,15): error TS1345: An expression of type 'void' cannot be tested for truthiness.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/languages/monarch/monarch.ts(336,4): error TS2559: Type 'string' has no properties in common with type 'IAction'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/languages/monarch/monarchCompile.ts(222,3): error TS2559: Type 'string' has no properties in common with type 'IAction'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/languages/monarch/monarchCompile.ts(301,4): error TS2322: Type '(id: string, matches: string[], state: string, eos: boolean) => string | IAction' is not assignable to type '(id: string, matches: string[], state: string, eos: boolean) => IAction'.
+  Type 'string | IAction' is not assignable to type 'IAction'.
+    Type 'string' has no properties in common with type 'IAction'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/languages/monarch/monarchCompile.ts(315,3): error TS2559: Type '""' has no properties in common with type 'IAction'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/languages/typescript/lib/ts09/typescriptServices09.d.ts(266,16): error TS2416: Property 'every' in type 'DualStringHashTable' is not assignable to the same property in base type 'IHashTable'.
+  Types of parameters 'fn' and 'fn' are incompatible.
+    Type 'void' is not assignable to type 'boolean'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/languages/typescript/lib/ts09/typescriptServices09.d.ts(267,16): error TS2416: Property 'some' in type 'DualStringHashTable' is not assignable to the same property in base type 'IHashTable'.
+  Types of parameters 'fn' and 'fn' are incompatible.
+    Type 'void' is not assignable to type 'boolean'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/languages/typescript/resources/errorCollection.ts(15,14): error TS2559: Type 'UnitErrors' has no properties in common with type 'ILinkedResource'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/platform/markers/markersWorker.ts(75,9): error TS2416: Property 'forEach' in type 'SingleMarkerReadAccessor' is not assignable to the same property in base type 'IMarkerReadAccessor'.
+  Type '(callback: (marker: IMarker, index: number) => void) => void' is not assignable to type '(callback: (marker: IMarker, index: number, values: IMarker[]) => void) => void'.
+    Types of parameters 'callback' and 'callback' are incompatible.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/platform/markers/markersWorker.ts(135,13): error TS2345: Argument of type 'SingleMarkerReadAccessor' is not assignable to parameter of type 'IMarkerReadAccessor'.
+  Types of property 'forEach' are incompatible.
+    Type '(callback: (marker: IMarker, index: number) => void) => void' is not assignable to type '(callback: (marker: IMarker, index: number, values: IMarker[]) => void) => void'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/workbench/contrib/debug/debuggerActions.ts(35,29): error TS2845: This condition will always return 'false'.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/workbench/contrib/files/explorerActions.ts(393,35): error TS2345: Argument of type '(c: () => void, e: () => void, p: () => void) => any' is not assignable to parameter of type '(complete: ValueCallback, error: ErrorCallback, progress: ProgressCallback) => void'.
+  Types of parameters 'c' and 'complete' are incompatible.
+../TypeScript/internal/cases/perf/solutions/monaco/client/vs/workbench/contrib/work/workViewlet.ts(361,9): error TS2610: 'id' is defined as an accessor in class 'Action', but is overridden here in 'ViewletAction' as an instance property.

src/compiler/emitter.ts

@@ -5628,15 +5628,15 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
      * Generate the text for a generated identifier.
      */
     function generateName(name: GeneratedIdentifier | GeneratedPrivateIdentifier) {
-        if ((name.autoGenerateFlags & GeneratedIdentifierFlags.KindMask) === GeneratedIdentifierFlags.Node) {
+        if ((name.autoGenerate.flags & GeneratedIdentifierFlags.KindMask) === GeneratedIdentifierFlags.Node) {
             // Node names generate unique names based on their original node
             // and are cached based on that node's id.
-            return generateNameCached(getNodeForGeneratedName(name), isPrivateIdentifier(name), name.autoGenerateFlags, name.autoGeneratePrefix, name.autoGenerateSuffix);
+            return generateNameCached(getNodeForGeneratedName(name), isPrivateIdentifier(name), name.autoGenerate.flags, name.autoGenerate.prefix, name.autoGenerate.suffix);
         }
         else {
             // Auto, Loop, and Unique names are cached based on their unique
             // autoGenerateId.
-            const autoGenerateId = name.autoGenerateId!;
+            const autoGenerateId = name.autoGenerate.id;
             return autoGeneratedIdToGeneratedName[autoGenerateId] || (autoGeneratedIdToGeneratedName[autoGenerateId] = makeName(name));
         }
     }
@@ -5889,27 +5889,27 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
      * Generates a unique identifier for a node.
      */
     function makeName(name: GeneratedIdentifier | GeneratedPrivateIdentifier) {
-        const prefix = formatGeneratedNamePart(name.autoGeneratePrefix, generateName);
-        const suffix = formatGeneratedNamePart (name.autoGenerateSuffix);
-        switch (name.autoGenerateFlags & GeneratedIdentifierFlags.KindMask) {
+        const prefix = formatGeneratedNamePart(name.autoGenerate.prefix, generateName);
+        const suffix = formatGeneratedNamePart (name.autoGenerate.suffix);
+        switch (name.autoGenerate.flags & GeneratedIdentifierFlags.KindMask) {
             case GeneratedIdentifierFlags.Auto:
-                return makeTempVariableName(TempFlags.Auto, !!(name.autoGenerateFlags & GeneratedIdentifierFlags.ReservedInNestedScopes), isPrivateIdentifier(name), prefix, suffix);
+                return makeTempVariableName(TempFlags.Auto, !!(name.autoGenerate.flags & GeneratedIdentifierFlags.ReservedInNestedScopes), isPrivateIdentifier(name), prefix, suffix);
             case GeneratedIdentifierFlags.Loop:
                 Debug.assertNode(name, isIdentifier);
-                return makeTempVariableName(TempFlags._i, !!(name.autoGenerateFlags & GeneratedIdentifierFlags.ReservedInNestedScopes), /*privateName*/ false, prefix, suffix);
+                return makeTempVariableName(TempFlags._i, !!(name.autoGenerate.flags & GeneratedIdentifierFlags.ReservedInNestedScopes), /*privateName*/ false, prefix, suffix);
             case GeneratedIdentifierFlags.Unique:
                 return makeUniqueName(
                     idText(name),
-                    (name.autoGenerateFlags & GeneratedIdentifierFlags.FileLevel) ? isFileLevelUniqueName : isUniqueName,
-                    !!(name.autoGenerateFlags & GeneratedIdentifierFlags.Optimistic),
-                    !!(name.autoGenerateFlags & GeneratedIdentifierFlags.ReservedInNestedScopes),
+                    (name.autoGenerate.flags & GeneratedIdentifierFlags.FileLevel) ? isFileLevelUniqueName : isUniqueName,
+                    !!(name.autoGenerate.flags & GeneratedIdentifierFlags.Optimistic),
+                    !!(name.autoGenerate.flags & GeneratedIdentifierFlags.ReservedInNestedScopes),
                     isPrivateIdentifier(name),
                     prefix,
                     suffix
                 );
         }
 
-        return Debug.fail(`Unsupported GeneratedIdentifierKind: ${Debug.formatEnum(name.autoGenerateFlags & GeneratedIdentifierFlags.KindMask, (ts as any).GeneratedIdentifierFlags, /*isFlags*/ true)}.`);
+        return Debug.fail(`Unsupported GeneratedIdentifierKind: ${Debug.formatEnum(name.autoGenerate.flags & GeneratedIdentifierFlags.KindMask, (ts as any).GeneratedIdentifierFlags, /*isFlags*/ true)}.`);
     }
 
     // Comments

src/compiler/factory/nodeFactory.ts

@@ -1154,16 +1154,24 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
         const node = baseFactory.createBaseIdentifierNode(SyntaxKind.Identifier) as Mutable<Identifier>;
         node.originalKeywordKind = originalKeywordKind;
         node.escapedText = escapedText;
-        node.autoGenerateFlags = GeneratedIdentifierFlags.None;
+        node.autoGenerate = undefined;
+        node.typeArguments = undefined;
+        node.hasExtendedUnicodeEscape = undefined;
+        node.jsDoc = undefined; // initialized by parser (JsDocContainer)
+        node.jsDocCache = undefined; // initialized by parser (JsDocContainer)
+        node.flowNode = undefined; // initialized by binder (FlowContainer)
+        node.symbol = undefined!; // initialized by checker
         return node;
     }
 
     function createBaseGeneratedIdentifier(text: string, autoGenerateFlags: GeneratedIdentifierFlags, prefix: string | GeneratedNamePart | undefined, suffix: string | undefined) {
         const node = createBaseIdentifier(escapeLeadingUnderscores(text), /*originalKeywordKind*/ undefined) as Mutable<GeneratedIdentifier>;
-        node.autoGenerateFlags = autoGenerateFlags;
-        node.autoGenerateId = nextAutoGenerateId;
-        node.autoGeneratePrefix = prefix;
-        node.autoGenerateSuffix = suffix;
+        node.autoGenerate = {
+            flags: autoGenerateFlags,
+            id: nextAutoGenerateId,
+            prefix,
+            suffix
+        };
         nextAutoGenerateId++;
         return node;
     }
@@ -1180,10 +1188,6 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
         const node = createBaseIdentifier(escapeLeadingUnderscores(text), originalKeywordKind);
         node.typeArguments = asNodeArray(typeArguments);
         node.hasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
-        node.jsDoc = undefined; // initialized by parser (JsDocContainer)
-        node.jsDocCache = undefined; // initialized by parser (JsDocContainer)
-        node.flowNode = undefined; // initialized by binder (FlowContainer)
-        node.symbol = undefined!; // initialized by checker
 
         // NOTE: we do not include transform flags of typeArguments in an identifier as they do not contribute to transformations
         if (node.originalKeywordKind === SyntaxKind.AwaitKeyword) {
@@ -1246,7 +1250,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
     function createBasePrivateIdentifier(escapedText: __String) {
         const node = baseFactory.createBasePrivateIdentifierNode(SyntaxKind.PrivateIdentifier) as Mutable<PrivateIdentifier>;
         node.escapedText = escapedText;
-        node.autoGenerateFlags = GeneratedIdentifierFlags.None;
+        node.autoGenerate = undefined;
         node.transformFlags |= TransformFlags.ContainsClassFields;
         return node;
     }
@@ -1259,10 +1263,12 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
 
     function createBaseGeneratedPrivateIdentifier(text: string, autoGenerateFlags: GeneratedIdentifierFlags, prefix: string | GeneratedNamePart | undefined, suffix: string | undefined) {
         const node = createBasePrivateIdentifier(escapeLeadingUnderscores(text));
-        node.autoGenerateFlags = autoGenerateFlags;
-        node.autoGenerateId = nextAutoGenerateId;
-        node.autoGeneratePrefix = prefix;
-        node.autoGenerateSuffix = suffix;
+        node.autoGenerate = {
+            flags: autoGenerateFlags,
+            id: nextAutoGenerateId,
+            prefix,
+            suffix,
+        };
         nextAutoGenerateId++;
         return node;
     }
@@ -6374,10 +6380,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
     function cloneGeneratedIdentifier(node: GeneratedIdentifier): GeneratedIdentifier {
         const clone = createBaseIdentifier(node.escapedText, /*originalKeywordKind*/ undefined) as Mutable<GeneratedIdentifier>;
         clone.flags |= node.flags & ~NodeFlags.Synthesized;
-        clone.autoGenerateFlags = node.autoGenerateFlags;
-        clone.autoGenerateId = node.autoGenerateId;
-        clone.autoGeneratePrefix = node.autoGeneratePrefix;
-        clone.autoGenerateSuffix = node.autoGenerateSuffix;
+        clone.autoGenerate = { ...node.autoGenerate };
         clone.transformFlags = node.transformFlags;
         setOriginalNode(clone, node);
         return clone;
@@ -6400,10 +6403,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
     function cloneGeneratedPrivateIdentifier(node: GeneratedPrivateIdentifier): GeneratedPrivateIdentifier {
         const clone = createBasePrivateIdentifier(node.escapedText) as Mutable<GeneratedPrivateIdentifier>;
         clone.flags |= node.flags & ~NodeFlags.Synthesized;
-        clone.autoGenerateFlags = node.autoGenerateFlags;
-        clone.autoGenerateId = node.autoGenerateId;
-        clone.autoGeneratePrefix = node.autoGeneratePrefix;
-        clone.autoGenerateSuffix = node.autoGenerateSuffix;
+        clone.autoGenerate = { ...node.autoGenerate };
         clone.transformFlags = node.transformFlags;
         setOriginalNode(clone, node);
         return clone;

src/compiler/factory/utilities.ts

@@ -1489,17 +1489,18 @@ export function elideNodes<T extends Node>(factory: NodeFactory, nodes: NodeArra
  * @internal
  */
 export function getNodeForGeneratedName(name: GeneratedIdentifier | GeneratedPrivateIdentifier) {
-    if (name.autoGenerateFlags & GeneratedIdentifierFlags.Node) {
-        const autoGenerateId = name.autoGenerateId;
+    if (name.autoGenerate.flags & GeneratedIdentifierFlags.Node) {
+        const autoGenerateId = name.autoGenerate.id;
         let node = name as Node;
         let original = node.original;
         while (original) {
             node = original;
 
             // if "node" is a different generated name (having a different "autoGenerateId"), use it and stop traversing.
-            if (isMemberName(node)
-                && !!(node.autoGenerateFlags! & GeneratedIdentifierFlags.Node)
-                && node.autoGenerateId !== autoGenerateId) {
+            if (isMemberName(node) && (
+                node.autoGenerate === undefined ||
+                !!(node.autoGenerate.flags & GeneratedIdentifierFlags.Node) &&
+                node.autoGenerate.id !== autoGenerateId)) {
                 break;
             }
 

src/compiler/transformers/classFields.ts

@@ -1512,7 +1512,7 @@ export function transformClassFields(context: TransformationContext): (x: Source
                     // record an alias as the class name is not in scope for statics.
                     enableSubstitutionForClassAliases();
                     const alias = factory.cloneNode(temp) as GeneratedIdentifier;
-                    alias.autoGenerateFlags &= ~GeneratedIdentifierFlags.ReservedInNestedScopes;
+                    alias.autoGenerate.flags &= ~GeneratedIdentifierFlags.ReservedInNestedScopes;
                     classAliases[getOriginalNodeId(node)] = alias;
                 }
 

src/compiler/transformers/module/module.ts

@@ -2064,7 +2064,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
             }
             return node;
         }
-        else if (!(isGeneratedIdentifier(node) && !(node.autoGenerateFlags & GeneratedIdentifierFlags.AllowNameSubstitution)) && !isLocalName(node)) {
+        else if (!(isGeneratedIdentifier(node) && !(node.autoGenerate.flags & GeneratedIdentifierFlags.AllowNameSubstitution)) && !isLocalName(node)) {
             const exportContainer = resolver.getReferencedExportContainer(node, isExportName(node));
             if (exportContainer && exportContainer.kind === SyntaxKind.SourceFile) {
                 return setTextRange(