Fix merging issues and multiple project scenario

zhengbli · zhengbli · commit d387050aaab9 · 2016-06-09T15:30:55.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1219,7 +1219,7 @@ namespace ts {
                 (oldOptions.noLib !== options.noLib) ||
                 (oldOptions.jsx !== options.jsx) ||
                 (oldOptions.allowJs !== options.allowJs) ||
-		(oldOptions.disableSizeLimit !== options.disableSizeLimit) ||
+                (oldOptions.disableSizeLimit !== options.disableSizeLimit) ||
                 (oldOptions.rootDir !== options.rootDir) ||
                 (oldOptions.typesSearchPaths !== options.typesSearchPaths) ||
                 (oldOptions.configFilePath !== options.configFilePath) ||
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -28,7 +28,7 @@ namespace ts {
         getDirectories(path: string): string[];
         readDirectory(path: string, extension?: string, exclude?: string[]): string[];
         readDirectoryWithMultipleExtensions?(path: string, extensions: string[], exclude?: string[]): string[];
-	getModifiedTime?(path: string): Date;
+        getModifiedTime?(path: string): Date;
         createHash?(data: string): string;
         getMemoryUsage?(): number;
         exit(exitCode?: number): void;
@@ -549,7 +549,7 @@ namespace ts {
                 getDirectories,
                 readDirectory,
                 readDirectoryWithMultipleExtensions,
-		getModifiedTime(path) {
+                getModifiedTime(path) {
                     try {
                         return _fs.statSync(path).mtime;
                     }
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1217,7 +1217,7 @@ namespace ts.server {
             else {
                 this.log("No config files found.");
             }
-	    this.log("end openOrUpdateConfiguredProjectForFile: " + new Date().getTime());
+            this.log("end openOrUpdateConfiguredProjectForFile: " + new Date().getTime());
             return configFileName ? { configFileName } : {};
         }
 
@@ -1398,7 +1398,7 @@ namespace ts.server {
             }
         }
 
-        updateConfiguredProject(project: Project) {
+        updateConfiguredProject(project: Project): Diagnostic[] {
             if (!this.host.fileExists(project.projectFilename)) {
                 this.log("Config file deleted");
                 this.removeProject(project);
@@ -1434,9 +1434,6 @@ namespace ts.server {
                                 const info = this.openFile(rootFilename, /*openedByClient*/ false);
                                 project.addRoot(info);
                             }
-                            else {
-                                return { errorMsg: "specified file " + rootFilename + " not found" };
-                            }
                         }
                         project.finishGraph();
                         return;
@@ -1460,9 +1457,6 @@ namespace ts.server {
                     for (const fileName of fileNamesToAdd) {
                         let info = this.getScriptInfo(fileName);
                         if (!info) {
-                            if (!this.host.fileExists(info.fileName)) {
-                                return { errorMsg: "specified file " + info.fileName + " not found" };
-                            }
                             info = this.openFile(fileName, /*openedByClient*/ false);
                         }
                         else {
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -444,11 +444,12 @@ namespace ts.server {
             const file = ts.normalizePath(fileName);
             const info = this.projectService.getScriptInfo(file);
             const projects = this.projectService.findReferencingProjects(info);
-            if (!projects.length) {
+            const projectsWithLanguageServiceEnabeld = ts.filter(projects, p => !p.languageServiceDiabled);
+            if (projects.length === 0 || projectsWithLanguageServiceEnabeld.length === 0) {
                 throw Errors.NoProject;
             }
 
-            const defaultProject = projects[0];
+            const defaultProject = projectsWithLanguageServiceEnabeld[0];
             // The rename info should be the same for every project
             const defaultProjectCompilerService = defaultProject.compilerService;
             const position = defaultProjectCompilerService.host.lineOffsetToPosition(file, line, offset);
@@ -465,7 +466,7 @@ namespace ts.server {
             }
 
             const fileSpans = combineProjectOutput(
-                projects,
+                projectsWithLanguageServiceEnabeld,
                 (project: Project) => {
                     const compilerService = project.compilerService;
                     const renameLocations = compilerService.languageService.findRenameLocations(file, position, findInStrings, findInComments);
@@ -526,11 +527,12 @@ namespace ts.server {
             const file = ts.normalizePath(fileName);
             const info = this.projectService.getScriptInfo(file);
             const projects = this.projectService.findReferencingProjects(info);
-            if (!projects.length) {
+            const projectsWithLanguageServiceEnabeld = ts.filter(projects, p => !p.languageServiceDiabled);
+            if (projects.length === 0 || projectsWithLanguageServiceEnabeld.length === 0) {
                 throw Errors.NoProject;
             }
 
-            const defaultProject = projects[0];
+            const defaultProject = projectsWithLanguageServiceEnabeld[0];
             const position = defaultProject.compilerService.host.lineOffsetToPosition(file, line, offset);
             const nameInfo = defaultProject.compilerService.languageService.getQuickInfoAtPosition(file, position);
             if (!nameInfo) {
@@ -542,7 +544,7 @@ namespace ts.server {
             const nameColStart = defaultProject.compilerService.host.positionToLineOffset(file, nameSpan.start).offset;
             const nameText = defaultProject.compilerService.host.getScriptSnapshot(file).getText(nameSpan.start, ts.textSpanEnd(nameSpan));
             const refs = combineProjectOutput<protocol.ReferencesResponseItem>(
-                projects,
+                projectsWithLanguageServiceEnabeld,
                 (project: Project) => {
                     const compilerService = project.compilerService;
                     const references = compilerService.languageService.getReferencesAtPosition(file, position);
@@ -902,13 +904,13 @@ namespace ts.server {
             const file = ts.normalizePath(fileName);
             const info = this.projectService.getScriptInfo(file);
             const projects = this.projectService.findReferencingProjects(info);
-            const defaultProject = projects[0];
-            if (!defaultProject) {
+            const projectsWithLanguageServiceEnabeld = ts.filter(projects, p => !p.languageServiceDiabled);
+            if (projects.length === 0 || projectsWithLanguageServiceEnabeld.length === 0) {
                 throw Errors.NoProject;
             }
 
             const allNavToItems = combineProjectOutput(
-                projects,
+                projectsWithLanguageServiceEnabeld,
                 (project: Project) => {
                     const compilerService = project.compilerService;
                     const navItems = compilerService.languageService.getNavigateToItems(searchValue, maxResultCount);

Original file line number	Diff line number	Diff line change
`@@ -1217,7 +1217,7 @@ namespace ts.server {`
`1217`	`1217`	`else {`
`1218`	`1218`	`this.log("No config files found.");`
`1219`	`1219`	`}`
`1220`		`- this.log("end openOrUpdateConfiguredProjectForFile: " + new Date().getTime());`
	`1220`	`+ this.log("end openOrUpdateConfiguredProjectForFile: " + new Date().getTime());`
`1221`	`1221`	`return configFileName ? { configFileName } : {};`
`1222`	`1222`	`}`
`1223`	`1223`
`@@ -1398,7 +1398,7 @@ namespace ts.server {`
`1398`	`1398`	`}`
`1399`	`1399`	`}`
`1400`	`1400`
`1401`		`- updateConfiguredProject(project: Project) {`
	`1401`	`+ updateConfiguredProject(project: Project): Diagnostic[] {`
`1402`	`1402`	`if (!this.host.fileExists(project.projectFilename)) {`
`1403`	`1403`	`this.log("Config file deleted");`
`1404`	`1404`	`this.removeProject(project);`
`@@ -1434,9 +1434,6 @@ namespace ts.server {`
`1434`	`1434`	`const info = this.openFile(rootFilename, /openedByClient/ false);`
`1435`	`1435`	`project.addRoot(info);`
`1436`	`1436`	`}`
`1437`		`- else {`
`1438`		`- return { errorMsg: "specified file " + rootFilename + " not found" };`
`1439`		`- }`
`1440`	`1437`	`}`
`1441`	`1438`	`project.finishGraph();`
`1442`	`1439`	`return;`
`@@ -1460,9 +1457,6 @@ namespace ts.server {`
`1460`	`1457`	`for (const fileName of fileNamesToAdd) {`
`1461`	`1458`	`let info = this.getScriptInfo(fileName);`
`1462`	`1459`	`if (!info) {`
`1463`		`- if (!this.host.fileExists(info.fileName)) {`
`1464`		`- return { errorMsg: "specified file " + info.fileName + " not found" };`
`1465`		`- }`
`1466`	`1460`	`info = this.openFile(fileName, /openedByClient/ false);`
`1467`	`1461`	`}`
`1468`	`1462`	`else {`