Tolerate non-existing files specified

zhengbli · zhengbli · commit 8bd8ed7d4b7f · 2016-05-06T13:02:57.000-07:00
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1122,8 +1122,13 @@ namespace ts.server {
                         return { configFileName, configFileErrors: configResult.errors };
                     }
                     else {
+                        // even if opening config file was successful, it could still
+                        // contain errors that were tolerated.
                         this.log("Opened configuration file " + configFileName, "Info");
                         this.configuredProjects.push(configResult.project);
+                        if (configResult.errors && configResult.errors.length > 0) {
+                            return { configFileName, configFileErrors: configResult.errors };
+                        }
                     }
                 }
                 else {
@@ -1261,14 +1266,14 @@ namespace ts.server {
             }
             else {
                 const project = this.createProject(configFilename, projectOptions);
+                const errors: Diagnostic[] = [];
                 for (const rootFilename of projectOptions.files) {
                     if (this.host.fileExists(rootFilename)) {
                         const info = this.openFile(rootFilename, /*openedByClient*/ clientFileName == rootFilename);
                         project.addRoot(info);
                     }
                     else {
-                        const error = createCompilerDiagnostic(Diagnostics.File_0_not_found, rootFilename);
-                        return { success: false, errors: [error] };
+                        errors.push(createCompilerDiagnostic(Diagnostics.File_0_not_found, rootFilename));
                     }
                 }
                 project.finishGraph();
@@ -1279,7 +1284,7 @@ namespace ts.server {
                     path => this.directoryWatchedForSourceFilesChanged(project, path),
                     /*recursive*/ true
                 );
-                return { success: true, project: project };
+                return { success: true, project: project, errors };
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1122,8 +1122,13 @@ namespace ts.server {`
`1122`	`1122`	`return { configFileName, configFileErrors: configResult.errors };`
`1123`	`1123`	`}`
`1124`	`1124`	`else {`
	`1125`	`+ // even if opening config file was successful, it could still`
	`1126`	`+ // contain errors that were tolerated.`
`1125`	`1127`	`this.log("Opened configuration file " + configFileName, "Info");`
`1126`	`1128`	`this.configuredProjects.push(configResult.project);`
	`1129`	`+ if (configResult.errors && configResult.errors.length > 0) {`
	`1130`	`+ return { configFileName, configFileErrors: configResult.errors };`
	`1131`	`+ }`
`1127`	`1132`	`}`
`1128`	`1133`	`}`
`1129`	`1134`	`else {`
`@@ -1261,14 +1266,14 @@ namespace ts.server {`
`1261`	`1266`	`}`
`1262`	`1267`	`else {`
`1263`	`1268`	`const project = this.createProject(configFilename, projectOptions);`
	`1269`	`+ const errors: Diagnostic[] = [];`
`1264`	`1270`	`for (const rootFilename of projectOptions.files) {`
`1265`	`1271`	`if (this.host.fileExists(rootFilename)) {`
`1266`	`1272`	`const info = this.openFile(rootFilename, /openedByClient/ clientFileName == rootFilename);`
`1267`	`1273`	`project.addRoot(info);`
`1268`	`1274`	`}`
`1269`	`1275`	`else {`
`1270`		`- const error = createCompilerDiagnostic(Diagnostics.File_0_not_found, rootFilename);`
`1271`		`- return { success: false, errors: [error] };`
	`1276`	`+ errors.push(createCompilerDiagnostic(Diagnostics.File_0_not_found, rootFilename));`
`1272`	`1277`	`}`
`1273`	`1278`	`}`
`1274`	`1279`	`project.finishGraph();`
`@@ -1279,7 +1284,7 @@ namespace ts.server {`
`1279`	`1284`	`path => this.directoryWatchedForSourceFilesChanged(project, path),`
`1280`	`1285`	`/recursive/ true`
`1281`	`1286`	`);`
`1282`		`- return { success: true, project: project };`
	`1287`	`+ return { success: true, project: project, errors };`
`1283`	`1288`	`}`
`1284`	`1289`	`}`
`1285`	`1290`