Remove "sparseArray" constructor function and just use array literals

Andy Hanson · Andy Hanson · commit f510897dbd5d · 2016-12-28T08:58:31.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4084,7 +4084,7 @@ namespace ts {
                 enumType.symbol = symbol;
                 if (enumHasLiteralMembers(symbol)) {
                     const memberTypeList: Type[] = [];
-                    const memberTypes = sparseArray<EnumLiteralType>();
+                    const memberTypes: SparseArray<EnumLiteralType> = [];
                     for (const declaration of enumType.symbol.declarations) {
                         if (declaration.kind === SyntaxKind.EnumDeclaration) {
                             computeEnumMemberValues(<EnumDeclaration>declaration);
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -39,8 +39,6 @@ namespace ts {
         return map;
     }
 
-    export const sparseArray: <T>() => SparseArray<T> = createDictionaryObject;
-
     /** Create a new map. If a template object is provided, the map will copy entries from it. */
     export function createMap<T>(template?: MapLike<T>): Map<T> {
         const map: Map<T> = new MapCtr<T>();
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -3299,7 +3299,7 @@ namespace ts {
     export function collectExternalModuleInfo(sourceFile: SourceFile, resolver: EmitResolver, compilerOptions: CompilerOptions): ExternalModuleInfo {
         const externalImports: (ImportDeclaration | ImportEqualsDeclaration | ExportDeclaration)[] = [];
         const exportSpecifiers = createMap<ExportSpecifier[]>();
-        const exportedBindings = sparseArray<Identifier[]>();
+        const exportedBindings: SparseArray<Identifier[]> = [];
         const uniqueExports = createMap<boolean>();
         let exportedNames: Identifier[];
         let hasExportDefault = false;
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -388,7 +388,7 @@ namespace ts {
                     }
                 }
             }
-            
+
             function getCommonPrefix(directory: Path, resolution: string) {
                 if (resolution === undefined) {
                     return undefined;
@@ -418,7 +418,7 @@ namespace ts {
             trace(host, Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
         }
         const containingDirectory = getDirectoryPath(containingFile);
-        let perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
+        const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
         let result = perFolderCache && perFolderCache.get(moduleName);
 
         if (result) {
@@ -991,7 +991,7 @@ namespace ts {
      * - { value: <some-value> } - found - stop searching
      */
     type SearchResult<T> = { value: T | undefined } | undefined;
-    
+
     /**
      * Wraps value to SearchResult.
      * @returns undefined if value is undefined or { value } otherwise
diff --git a/src/compiler/transformers/generators.ts b/src/compiler/transformers/generators.ts
@@ -2096,7 +2096,7 @@ namespace ts {
 
             if (!renamedCatchVariables) {
                 renamedCatchVariables = createMap<boolean>();
-                renamedCatchVariableDeclarations = sparseArray<Identifier>();
+                renamedCatchVariableDeclarations = [];
                 context.enableSubstitution(SyntaxKind.Identifier);
             }
 
diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -39,8 +39,8 @@ namespace ts {
         context.enableSubstitution(SyntaxKind.ShorthandPropertyAssignment); // Substitutes shorthand property assignments for imported/exported symbols.
         context.enableEmitNotification(SyntaxKind.SourceFile); // Restore state when substituting nodes in a file.
 
-        const moduleInfoMap = sparseArray<ExternalModuleInfo>(); // The ExternalModuleInfo for each file.
-        const deferredExports = sparseArray<Statement[]>(); // Exports to defer until an EndOfDeclarationMarker is found.
+        const moduleInfoMap: SparseArray<ExternalModuleInfo> = []; // The ExternalModuleInfo for each file.
+        const deferredExports: SparseArray<Statement[]> = []; // Exports to defer until an EndOfDeclarationMarker is found.
 
         let currentSourceFile: SourceFile; // The current file.
         let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file.
@@ -1105,7 +1105,7 @@ namespace ts {
             if (node.kind === SyntaxKind.SourceFile) {
                 currentSourceFile = <SourceFile>node;
                 currentModuleInfo = moduleInfoMap[getOriginalNodeId(currentSourceFile)];
-                noSubstitution = sparseArray<boolean>();
+                noSubstitution = [];
 
                 previousOnEmitNode(emitContext, node, emitCallback);
 
diff --git a/src/compiler/transformers/module/system.ts b/src/compiler/transformers/module/system.ts
@@ -28,10 +28,10 @@ namespace ts {
         context.enableSubstitution(SyntaxKind.PostfixUnaryExpression); // Substitutes updates to exported symbols.
         context.enableEmitNotification(SyntaxKind.SourceFile); // Restore state when substituting nodes in a file.
 
-        const moduleInfoMap = sparseArray<ExternalModuleInfo>(); // The ExternalModuleInfo for each file.
-        const deferredExports = sparseArray<Statement[]>(); // Exports to defer until an EndOfDeclarationMarker is found.
-        const exportFunctionsMap = sparseArray<Identifier>(); // The export function associated with a source file.
-        const noSubstitutionMap = sparseArray<SparseArray<boolean>>(); // Set of nodes for which substitution rules should be ignored for each file.
+        const moduleInfoMap: SparseArray<ExternalModuleInfo> = []; // The ExternalModuleInfo for each file.
+        const deferredExports: SparseArray<Statement[]> = []; // Exports to defer until an EndOfDeclarationMarker is found.
+        const exportFunctionsMap: SparseArray<Identifier> = []; // The export function associated with a source file.
+        const noSubstitutionMap: SparseArray<SparseArray<boolean>> = []; // Set of nodes for which substitution rules should be ignored for each file.
 
         let currentSourceFile: SourceFile; // The current file.
         let moduleInfo: ExternalModuleInfo; // ExternalModuleInfo for the current file.
@@ -1771,7 +1771,7 @@ namespace ts {
          * @param node The node which should not be substituted.
          */
         function preventSubstitution<T extends Node>(node: T): T {
-            if (noSubstitution === undefined) noSubstitution = sparseArray<boolean>();
+            if (noSubstitution === undefined) noSubstitution = [];
             noSubstitution[getNodeId(node)] = true;
             return node;
         }
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
@@ -3125,7 +3125,7 @@ namespace ts {
                 context.enableSubstitution(SyntaxKind.Identifier);
 
                 // Keep track of class aliases.
-                classAliases = sparseArray<Identifier>();
+                classAliases = [];
             }
         }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1,4 +1,4 @@
-/// <reference path="sys.ts" />
+﻿/// <reference path="sys.ts" />
 
 /* @internal */
 namespace ts {
@@ -3365,7 +3365,7 @@ namespace ts {
         return false;
     }
 
-    const syntaxKindCache = sparseArray<string>();
+    const syntaxKindCache: SparseArray<string> = [];
 
     export function formatSyntaxKind(kind: SyntaxKind): string {
         const syntaxKindEnum = (<any>ts).SyntaxKind;
diff --git a/src/harness/unittests/session.ts b/src/harness/unittests/session.ts
@@ -416,7 +416,7 @@ namespace ts.server {
         class InProcClient {
             private server: InProcSession;
             private seq = 0;
-            private callbacks = sparseArray<(resp: protocol.Response) => void>();
+            private callbacks: SparseArray<(resp: protocol.Response) => void> = [];
             private eventHandlers = createMap<(args: any) => void>();
 
             handle(msg: protocol.Message): void {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -292,7 +292,7 @@ namespace ts.projectSystem {
     }
 
     export class Callbacks {
-        private map = sparseArray<TimeOutCallback>();
+        private map: SparseArray<TimeOutCallback> = [];
         private nextId = 1;
 
         register(cb: (...args: any[]) => void, args: any[]) {
@@ -319,7 +319,7 @@ namespace ts.projectSystem {
             for (const key in this.map) {
                 this.map[key]();
             }
-            this.map = sparseArray<TimeOutCallback>();
+            this.map = [];
         }
     }
 
diff --git a/src/services/codefixes/codeFixProvider.ts b/src/services/codefixes/codeFixProvider.ts
@@ -16,7 +16,7 @@ namespace ts {
     }
 
     export namespace codefix {
-        const codeFixes = sparseArray<CodeFix[]>();
+        const codeFixes: SparseArray<CodeFix[]> = [];
 
         export function registerCodeFix(action: CodeFix) {
             forEach(action.errorCodes, error => {
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -14,7 +14,7 @@ namespace ts.codefix {
     }
 
     class ImportCodeActionMap {
-        private symbolIdToActionMap = sparseArray<ImportCodeAction[]>();
+        private symbolIdToActionMap: SparseArray<ImportCodeAction[]> = [];
 
         addAction(symbolId: number, newAction: ImportCodeAction) {
             if (!newAction) {
@@ -125,7 +125,7 @@ namespace ts.codefix {
             const symbolIdActionMap = new ImportCodeActionMap();
 
             // this is a module id -> module import declaration map
-            const cachedImportDeclarations = sparseArray<(ImportDeclaration | ImportEqualsDeclaration)[]>();
+            const cachedImportDeclarations: SparseArray<(ImportDeclaration | ImportEqualsDeclaration)[]> = [];
             let cachedNewImportInsertPosition: number;
 
             const allPotentialModules = checker.getAmbientModules();

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,6 @@ namespace ts {`
`39`	`39`	`return map;`
`40`	`40`	`}`
`41`	`41`
`42`		`- export const sparseArray: <T>() => SparseArray<T> = createDictionaryObject;`
`43`		`-`
`44`	`42`	`/** Create a new map. If a template object is provided, the map will copy entries from it. */`
`45`	`43`	`export function createMap<T>(template?: MapLike<T>): Map<T> {`
`46`	`44`	`const map: Map<T> = new MapCtr<T>();`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ namespace ts {`
`388`	`388`	`}`
`389`	`389`	`}`
`390`	`390`	`}`
`391`		`-`
	`391`	`+`
`392`	`392`	`function getCommonPrefix(directory: Path, resolution: string) {`
`393`	`393`	`if (resolution === undefined) {`
`394`	`394`	`return undefined;`
`@@ -418,7 +418,7 @@ namespace ts {`
`418`	`418`	`trace(host, Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);`
`419`	`419`	`}`
`420`	`420`	`const containingDirectory = getDirectoryPath(containingFile);`
`421`		`- let perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);`
	`421`	`+ const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);`
`422`	`422`	`let result = perFolderCache && perFolderCache.get(moduleName);`
`423`	`423`
`424`	`424`	`if (result) {`
`@@ -991,7 +991,7 @@ namespace ts {`
`991`	`991`	`* - { value: <some-value> } - found - stop searching`
`992`	`992`	`*/`
`993`	`993`	`type SearchResult<T> = { value: T \| undefined } \| undefined;`
`994`		`-`
	`994`	`+`
`995`	`995`	`/**`
`996`	`996`	`* Wraps value to SearchResult.`
`997`	`997`	`* @returns undefined if value is undefined or { value } otherwise`
Original file line number	Diff line number	Diff line change
`@@ -2096,7 +2096,7 @@ namespace ts {`
`2096`	`2096`
`2097`	`2097`	`if (!renamedCatchVariables) {`
`2098`	`2098`	`renamedCatchVariables = createMap<boolean>();`
`2099`		`- renamedCatchVariableDeclarations = sparseArray<Identifier>();`
	`2099`	`+ renamedCatchVariableDeclarations = [];`
`2100`	`2100`	`context.enableSubstitution(SyntaxKind.Identifier);`
`2101`	`2101`	`}`
`2102`	`2102`
Original file line number	Diff line number	Diff line change
`@@ -3125,7 +3125,7 @@ namespace ts {`
`3125`	`3125`	`context.enableSubstitution(SyntaxKind.Identifier);`
`3126`	`3126`
`3127`	`3127`	`// Keep track of class aliases.`
`3128`		`- classAliases = sparseArray<Identifier>();`
	`3128`	`+ classAliases = [];`
`3129`	`3129`	`}`
`3130`	`3130`	`}`
`3131`	`3131`