Merge pull request microsoft#10434 from Microsoft/multi_map_add

Andy · web-flow · commit 3bcfb6ba537c · 2016-09-02T06:31:36.000-07:00
Add `multiMapAdd` helper
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -566,6 +566,21 @@ namespace ts {
         return result;
     }
 
+    /**
+     * Adds the value to an array of values associated with the key, and returns the array.
+     * Creates the array if it does not already exist.
+     */
+    export function multiMapAdd<V>(map: Map<V[]>, key: string, value: V): V[] {
+        const values = map[key];
+        if (values) {
+            values.push(value);
+            return values;
+        }
+        else {
+            return map[key] = [value];
+        }
+    }
+
     /**
      * Tests whether a value is an array.
      */
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -6851,7 +6851,7 @@ const _super = (function (geti, seti) {
                                 // export { x, y }
                                 for (const specifier of (<ExportDeclaration>node).exportClause.elements) {
                                     const name = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name] || (exportSpecifiers[name] = [])).push(specifier);
+                                    multiMapAdd(exportSpecifiers, name, specifier);
                                 }
                             }
                             break;
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -267,7 +267,7 @@ namespace ts {
                 }
 
                 function addFileWatcherCallback(filePath: string, callback: FileWatcherCallback): void {
-                    (fileWatcherCallbacks[filePath] || (fileWatcherCallbacks[filePath] = [])).push(callback);
+                    multiMapAdd(fileWatcherCallbacks, filePath, callback);
                 }
 
                 function addFile(fileName: string, callback: FileWatcherCallback): WatchedFile {
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -1649,8 +1649,7 @@ namespace FourSlash {
             const result = ts.createMap<Range[]>();
             for (const range of this.getRanges()) {
                 const text = this.rangeText(range);
-                const ranges = result[text] || (result[text] = []);
-                ranges.push(range);
+                ts.multiMapAdd(result, text, range);
             }
             return result;
         }
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -198,9 +198,8 @@ namespace ts {
 
         watchDirectory(directoryName: string, callback: DirectoryWatcherCallback, recursive: boolean): DirectoryWatcher {
             const path = this.toPath(directoryName);
-            const callbacks = this.watchedDirectories[path] || (this.watchedDirectories[path] = []);
             const cbWithRecursive = { cb: callback, recursive };
-            callbacks.push(cbWithRecursive);
+            const callbacks = multiMapAdd(this.watchedDirectories, path, cbWithRecursive);
             return {
                 referenceCount: 0,
                 directoryName,
@@ -235,8 +234,7 @@ namespace ts {
 
         watchFile(fileName: string, callback: FileWatcherCallback) {
             const path = this.toPath(fileName);
-            const callbacks = this.watchedFiles[path] || (this.watchedFiles[path] = []);
-            callbacks.push(callback);
+            const callbacks = multiMapAdd(this.watchedFiles, path, callback);
             return {
                 close: () => {
                     unorderedRemoveItem(callbacks, callback);
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -987,8 +987,7 @@ namespace ts {
             function addDeclaration(declaration: Declaration) {
                 const name = getDeclarationName(declaration);
                 if (name) {
-                    const declarations = getDeclarations(name);
-                    declarations.push(declaration);
+                    multiMapAdd(result, name, declaration);
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -6851,7 +6851,7 @@ const _super = (function (geti, seti) {`
`6851`	`6851`	`// export { x, y }`
`6852`	`6852`	`for (const specifier of (<ExportDeclaration>node).exportClause.elements) {`
`6853`	`6853`	`const name = (specifier.propertyName \|\| specifier.name).text;`
`6854`		`- (exportSpecifiers[name] \|\| (exportSpecifiers[name] = [])).push(specifier);`
	`6854`	`+ multiMapAdd(exportSpecifiers, name, specifier);`
`6855`	`6855`	`}`
`6856`	`6856`	`}`
`6857`	`6857`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ namespace ts {`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`function addFileWatcherCallback(filePath: string, callback: FileWatcherCallback): void {`
`270`		`- (fileWatcherCallbacks[filePath] \|\| (fileWatcherCallbacks[filePath] = [])).push(callback);`
	`270`	`+ multiMapAdd(fileWatcherCallbacks, filePath, callback);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`function addFile(fileName: string, callback: FileWatcherCallback): WatchedFile {`
Original file line number	Diff line number	Diff line change
`@@ -1649,8 +1649,7 @@ namespace FourSlash {`
`1649`	`1649`	`const result = ts.createMap<Range[]>();`
`1650`	`1650`	`for (const range of this.getRanges()) {`
`1651`	`1651`	`const text = this.rangeText(range);`
`1652`		`- const ranges = result[text] \|\| (result[text] = []);`
`1653`		`- ranges.push(range);`
	`1652`	`+ ts.multiMapAdd(result, text, range);`
`1654`	`1653`	`}`
`1655`	`1654`	`return result;`
`1656`	`1655`	`}`
Original file line number	Diff line number	Diff line change
`@@ -987,8 +987,7 @@ namespace ts {`
`987`	`987`	`function addDeclaration(declaration: Declaration) {`
`988`	`988`	`const name = getDeclarationName(declaration);`
`989`	`989`	`if (name) {`
`990`		`- const declarations = getDeclarations(name);`
`991`		`- declarations.push(declaration);`
	`990`	`+ multiMapAdd(result, name, declaration);`
`992`	`991`	`}`
`993`	`992`	`}`
`994`	`993`