Properly report external filenames

RyanCavanaugh · RyanCavanaugh · commit 3bd4c4f847c2 · 2017-09-13T15:19:07.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1659,7 +1659,7 @@ namespace ts {
     }
 
     export function isRootedDiskPath(path: string) {
-        return getRootLength(path) !== 0;
+        return path && getRootLength(path) !== 0;
     }
 
     export function convertToRelativePath(absoluteOrRelativePath: string, basePath: string, getCanonicalFileName: (path: string) => string): string {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -1191,7 +1191,8 @@ namespace ts.server {
                 projectOptions.compileOnSave === undefined ? false : projectOptions.compileOnSave);
 
             this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typeAcquisition, configFileErrors);
-
+            this.addFilesToProjectAndUpdateGraph(project, project.getExternalFiles(), fileNamePropertyReader, clientFileName, projectOptions.typeAcquisition, configFileErrors);
+            
             project.watchConfigFile(project => this.onConfigChangedForConfiguredProject(project));
             if (!sizeLimitExceeded) {
                 this.watchConfigDirectoryForProject(project, projectOptions);
@@ -1210,7 +1211,7 @@ namespace ts.server {
             }
         }
 
-        private addFilesToProjectAndUpdateGraph<T>(project: ConfiguredProject | ExternalProject, files: T[], propertyReader: FilePropertyReader<T>, clientFileName: string, typeAcquisition: TypeAcquisition, configFileErrors: ReadonlyArray<Diagnostic>): void {
+        private addFilesToProjectAndUpdateGraph<T>(project: ConfiguredProject | ExternalProject, files: ReadonlyArray<T>, propertyReader: FilePropertyReader<T>, clientFileName: string, typeAcquisition: TypeAcquisition, configFileErrors: ReadonlyArray<Diagnostic>): void {
             let errors: Diagnostic[];
             for (const f of files) {
                 const rootFileName = propertyReader.getFileName(f);
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -747,7 +747,8 @@ namespace ts.server {
                 }
                 // compute and return the difference
                 const lastReportedFileNames = this.lastReportedFileNames;
-                const currentFiles = arrayToSet(this.getFileNames());
+                const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));
+                const currentFiles = arrayToSet(this.getFileNames().concat(externalFiles));
 
                 const added: string[] = [];
                 const removed: string[] = [];
@@ -770,7 +771,8 @@ namespace ts.server {
             else {
                 // unknown version - return everything
                 const projectFileNames = this.getFileNames();
-                this.lastReportedFileNames = arrayToSet(projectFileNames);
+                const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));
+                this.lastReportedFileNames = arrayToSet(projectFileNames.concat(externalFiles));
                 this.lastReportedVersion = this.projectStructureVersion;
                 return { info, files: projectFileNames, projectErrors: this.getGlobalProjectErrors() };
             }
@@ -1085,6 +1087,9 @@ namespace ts.server {
                 }
                 catch (e) {
                     this.projectService.logger.info(`A plugin threw an exception in getExternalFiles: ${e}`);
+                    if (e.stack) {
+                        this.projectService.logger.info(e.stack);
+                    }
                 }
             }));
         }

Original file line number	Diff line number	Diff line change
`@@ -1659,7 +1659,7 @@ namespace ts {`
`1659`	`1659`	`}`
`1660`	`1660`
`1661`	`1661`	`export function isRootedDiskPath(path: string) {`
`1662`		`- return getRootLength(path) !== 0;`
	`1662`	`+ return path && getRootLength(path) !== 0;`
`1663`	`1663`	`}`
`1664`	`1664`
`1665`	`1665`	`export function convertToRelativePath(absoluteOrRelativePath: string, basePath: string, getCanonicalFileName: (path: string) => string): string {`
Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,8 @@ namespace ts.server {`
`747`	`747`	`}`
`748`	`748`	`// compute and return the difference`
`749`	`749`	`const lastReportedFileNames = this.lastReportedFileNames;`
`750`		`- const currentFiles = arrayToSet(this.getFileNames());`
	`750`	`+ const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));`
	`751`	`+ const currentFiles = arrayToSet(this.getFileNames().concat(externalFiles));`
`751`	`752`
`752`	`753`	`const added: string[] = [];`
`753`	`754`	`const removed: string[] = [];`
`@@ -770,7 +771,8 @@ namespace ts.server {`
`770`	`771`	`else {`
`771`	`772`	`// unknown version - return everything`
`772`	`773`	`const projectFileNames = this.getFileNames();`
`773`		`- this.lastReportedFileNames = arrayToSet(projectFileNames);`
	`774`	`+ const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));`
	`775`	`+ this.lastReportedFileNames = arrayToSet(projectFileNames.concat(externalFiles));`
`774`	`776`	`this.lastReportedVersion = this.projectStructureVersion;`
`775`	`777`	`return { info, files: projectFileNames, projectErrors: this.getGlobalProjectErrors() };`
`776`	`778`	`}`
`@@ -1085,6 +1087,9 @@ namespace ts.server {`
`1085`	`1087`	`}`
`1086`	`1088`	`catch (e) {`
`1087`	`1089`	this.projectService.logger.info(`A plugin threw an exception in getExternalFiles: ${e}`);
	`1090`	`+ if (e.stack) {`
	`1091`	`+ this.projectService.logger.info(e.stack);`
	`1092`	`+ }`
`1088`	`1093`	`}`
`1089`	`1094`	`}));`
`1090`	`1095`	`}`