Merge pull request microsoft#5263 from zhengbli/pr5127cr

Zhengbo Li · Zhengbo Li · commit 1b3640760b96 · 2015-10-19T22:01:15.000-07:00
Address code review of microsoft#5127
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -844,9 +844,9 @@ namespace ts {
 
     export function copyListRemovingItem<T>(item: T, list: T[]) {
         let copiedList: T[] = [];
-        for (var i = 0, len = list.length; i < len; i++) {
-            if (list[i] !== item) {
-                copiedList.push(list[i]);
+        for (let e of list) {
+            if (e !== item) {
+                copiedList.push(e);
             }
         }
         return copiedList;
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -407,7 +407,7 @@ namespace ts {
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
                     return _fs.watch(
                         path,
-                        { persisten: true, recursive: !!recursive },
+                        { persistent: true, recursive: !!recursive },
                         (eventName: string, relativeFileName: string) => {
                             // In watchDirectory we only care about adding and removing files (when event name is
                             // "rename"); changes made within files are handled by corresponding fileWatchers (when
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -360,7 +360,8 @@ namespace ts {
             let newFileNames = ts.map(parsedCommandLine.fileNames, compilerHost.getCanonicalFileName);
             let canonicalRootFileNames = ts.map(rootFileNames, compilerHost.getCanonicalFileName);
 
-            if (!arrayStructurallyIsEqualTo(newFileNames, canonicalRootFileNames)) {
+            // We check if the project file list has changed. If so, we just throw away the old program and start fresh.
+            if (!arrayIsEqualTo(newFileNames && newFileNames.sort(), canonicalRootFileNames && canonicalRootFileNames.sort())) {
                 setCachedProgram(undefined);
                 startTimerForRecompilation();
             }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -82,17 +82,17 @@ namespace ts {
         return node.end - node.pos;
     }
 
-    export function arrayIsEqualTo<T>(arr1: T[], arr2: T[], comparer?: (a: T, b: T) => boolean): boolean {
-        if (!arr1 || !arr2) {
-            return arr1 === arr2;
+    export function arrayIsEqualTo<T>(array1: T[], array2: T[], equaler?: (a: T, b: T) => boolean): boolean {
+        if (!array1 || !array2) {
+            return array1 === array2;
         }
 
-        if (arr1.length !== arr2.length) {
+        if (array1.length !== array2.length) {
             return false;
         }
 
-        for (let i = 0; i < arr1.length; ++i) {
-            let equals = comparer ? comparer(arr1[i], arr2[i]) : arr1[i] === arr2[i];
+        for (let i = 0; i < array1.length; ++i) {
+            let equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
             if (!equals) {
                 return false;
             }
@@ -2414,16 +2414,4 @@ namespace ts {
             }
         }
     }
-
-    export function arrayStructurallyIsEqualTo<T>(array1: Array<T>, array2: Array<T>): boolean {
-        if (!array1 || !array2) {
-            return false;
-        }
-
-        if (array1.length !== array2.length) {
-            return false;
-        }
-
-        return arrayIsEqualTo(array1.sort(), array2.sort());
-    }
 }
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -576,7 +576,8 @@ namespace ts.server {
             let newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
             let currentRootFiles = project.getRootFiles().map((f => this.getCanonicalFileName(f)));
 
-            if (!arrayStructurallyIsEqualTo(currentRootFiles, newRootFiles)) {
+            // We check if the project file list has changed. If so, we update the project.
+            if (!arrayIsEqualTo(currentRootFiles && currentRootFiles.sort(), newRootFiles && newRootFiles.sort())) {
                 // For configured projects, the change is made outside the tsconfig file, and
                 // it is not likely to affect the project for other files opened by the client. We can 
                 // just update the current project.

Original file line number	Diff line number	Diff line change
`@@ -844,9 +844,9 @@ namespace ts {`
`844`	`844`
`845`	`845`	`export function copyListRemovingItem<T>(item: T, list: T[]) {`
`846`	`846`	`let copiedList: T[] = [];`
`847`		`- for (var i = 0, len = list.length; i < len; i++) {`
`848`		`- if (list[i] !== item) {`
`849`		`- copiedList.push(list[i]);`
	`847`	`+ for (let e of list) {`
	`848`	`+ if (e !== item) {`
	`849`	`+ copiedList.push(e);`
`850`	`850`	`}`
`851`	`851`	`}`
`852`	`852`	`return copiedList;`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,8 @@ namespace ts {`
`360`	`360`	`let newFileNames = ts.map(parsedCommandLine.fileNames, compilerHost.getCanonicalFileName);`
`361`	`361`	`let canonicalRootFileNames = ts.map(rootFileNames, compilerHost.getCanonicalFileName);`
`362`	`362`
`363`		`- if (!arrayStructurallyIsEqualTo(newFileNames, canonicalRootFileNames)) {`
	`363`	`+ // We check if the project file list has changed. If so, we just throw away the old program and start fresh.`
	`364`	`+ if (!arrayIsEqualTo(newFileNames && newFileNames.sort(), canonicalRootFileNames && canonicalRootFileNames.sort())) {`
`364`	`365`	`setCachedProgram(undefined);`
`365`	`366`	`startTimerForRecompilation();`
`366`	`367`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,17 +82,17 @@ namespace ts {`
`82`	`82`	`return node.end - node.pos;`
`83`	`83`	`}`
`84`	`84`
`85`		`- export function arrayIsEqualTo<T>(arr1: T[], arr2: T[], comparer?: (a: T, b: T) => boolean): boolean {`
`86`		`- if (!arr1 \|\| !arr2) {`
`87`		`- return arr1 === arr2;`
	`85`	`+ export function arrayIsEqualTo<T>(array1: T[], array2: T[], equaler?: (a: T, b: T) => boolean): boolean {`
	`86`	`+ if (!array1 \|\| !array2) {`
	`87`	`+ return array1 === array2;`
`88`	`88`	`}`
`89`	`89`
`90`		`- if (arr1.length !== arr2.length) {`
	`90`	`+ if (array1.length !== array2.length) {`
`91`	`91`	`return false;`
`92`	`92`	`}`
`93`	`93`
`94`		`- for (let i = 0; i < arr1.length; ++i) {`
`95`		`- let equals = comparer ? comparer(arr1[i], arr2[i]) : arr1[i] === arr2[i];`
	`94`	`+ for (let i = 0; i < array1.length; ++i) {`
	`95`	`+ let equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];`
`96`	`96`	`if (!equals) {`
`97`	`97`	`return false;`
`98`	`98`	`}`
`@@ -2414,16 +2414,4 @@ namespace ts {`
`2414`	`2414`	`}`
`2415`	`2415`	`}`
`2416`	`2416`	`}`
`2417`		`-`
`2418`		`- export function arrayStructurallyIsEqualTo<T>(array1: Array<T>, array2: Array<T>): boolean {`
`2419`		`- if (!array1 \|\| !array2) {`
`2420`		`- return false;`
`2421`		`- }`
`2422`		`-`
`2423`		`- if (array1.length !== array2.length) {`
`2424`		`- return false;`
`2425`		`- }`
`2426`		`-`
`2427`		`- return arrayIsEqualTo(array1.sort(), array2.sort());`
`2428`		`- }`
`2429`	`2417`	`}`