Merge pull request microsoft#5336 from zhengbli/fixWatcherIssue

Zhengbo Li · Zhengbo Li · commit f431c8229627 · 2015-10-23T11:47:54.000-07:00
Issue fix for config file watcher callback
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1268,11 +1268,15 @@ namespace ts.server {
                             if (info.isOpen) {
                                 if (this.openFileRoots.indexOf(info) >= 0) {
                                     this.openFileRoots = copyListRemovingItem(info, this.openFileRoots);
+                                    if (info.defaultProject && !info.defaultProject.isConfiguredProject()) {
+                                        this.removeProject(info.defaultProject);
+                                    }
                                 }
                                 if (this.openFilesReferenced.indexOf(info) >= 0) {
                                     this.openFilesReferenced = copyListRemovingItem(info, this.openFilesReferenced);
                                 }
                                 this.openFileRootsConfigured.push(info);
+                                info.defaultProject = project;
                             }
                         }
                         project.addRoot(info);

Original file line number	Diff line number	Diff line change
`@@ -1268,11 +1268,15 @@ namespace ts.server {`
`1268`	`1268`	`if (info.isOpen) {`
`1269`	`1269`	`if (this.openFileRoots.indexOf(info) >= 0) {`
`1270`	`1270`	`this.openFileRoots = copyListRemovingItem(info, this.openFileRoots);`
	`1271`	`+ if (info.defaultProject && !info.defaultProject.isConfiguredProject()) {`
	`1272`	`+ this.removeProject(info.defaultProject);`
	`1273`	`+ }`
`1271`	`1274`	`}`
`1272`	`1275`	`if (this.openFilesReferenced.indexOf(info) >= 0) {`
`1273`	`1276`	`this.openFilesReferenced = copyListRemovingItem(info, this.openFilesReferenced);`
`1274`	`1277`	`}`
`1275`	`1278`	`this.openFileRootsConfigured.push(info);`
	`1279`	`+ info.defaultProject = project;`
`1276`	`1280`	`}`
`1277`	`1281`	`}`
`1278`	`1282`	`project.addRoot(info);`