Merge pull request microsoft#9002 from zhengbli/moreTsserverTests

Zhengbo Li · Zhengbo Li · commit cdf4cded154b · 2016-06-07T21:56:09.000-07:00
Add tests for tsserver project system
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -2,7 +2,7 @@
 
 namespace ts {
     export type FileWatcherCallback = (fileName: string, removed?: boolean) => void;
-    export type DirectoryWatcherCallback = (directoryName: string) => void;
+    export type DirectoryWatcherCallback = (fileName: string) => void;
     export interface WatchedFile {
         fileName: string;
         callback: FileWatcherCallback;
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -268,7 +268,7 @@ namespace ts.server {
         }
 
         removeRoot(info: ScriptInfo) {
-            if (!this.filenameToScript.contains(info.path)) {
+            if (this.filenameToScript.contains(info.path)) {
                 this.filenameToScript.remove(info.path);
                 this.roots = copyListRemovingItem(info, this.roots);
                 this.resolvedModuleNames.remove(info.path);
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -2919,6 +2919,7 @@ namespace ts {
             const changesInCompilationSettingsAffectSyntax = oldSettings &&
                 (oldSettings.target !== newSettings.target ||
                  oldSettings.module !== newSettings.module ||
+                 oldSettings.moduleResolution !== newSettings.moduleResolution ||
                  oldSettings.noResolve !== newSettings.noResolve ||
                  oldSettings.jsx !== newSettings.jsx ||
                  oldSettings.allowJs !== newSettings.allowJs);
diff --git a/tests/cases/unittests/tsserverProjectSystem.ts b/tests/cases/unittests/tsserverProjectSystem.ts

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ namespace ts.server {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`removeRoot(info: ScriptInfo) {`
`271`		`- if (!this.filenameToScript.contains(info.path)) {`
	`271`	`+ if (this.filenameToScript.contains(info.path)) {`
`272`	`272`	`this.filenameToScript.remove(info.path);`
`273`	`273`	`this.roots = copyListRemovingItem(info, this.roots);`
`274`	`274`	`this.resolvedModuleNames.remove(info.path);`