Merge pull request microsoft#18456 from RyanCavanaugh/pluginWork

RyanCavanaugh · web-flow · commit b9b112738c50 · 2017-09-20T10:51:54.000-07:00
Properly report external filenames
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
@@ -1190,7 +1190,8 @@ namespace ts.server {
                 /*languageServiceEnabled*/ !sizeLimitExceeded,
                 projectOptions.compileOnSave === undefined ? false : projectOptions.compileOnSave);
 
-            this.addFilesToProjectAndUpdateGraph(project, projectOptions.files, fileNamePropertyReader, clientFileName, projectOptions.typeAcquisition, configFileErrors);
+            const filesToAdd = projectOptions.files.concat(project.getExternalFiles());
+            this.addFilesToProjectAndUpdateGraph(project, filesToAdd, fileNamePropertyReader, clientFileName, projectOptions.typeAcquisition, configFileErrors);
 
             project.watchConfigFile(project => this.onConfigChangedForConfiguredProject(project));
             if (!sizeLimitExceeded) {
@@ -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
@@ -746,7 +746,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[] = [];
@@ -769,7 +770,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() };
             }
@@ -1084,6 +1086,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
`@@ -746,7 +746,8 @@ namespace ts.server {`
`746`	`746`	`}`
`747`	`747`	`// compute and return the difference`
`748`	`748`	`const lastReportedFileNames = this.lastReportedFileNames;`
`749`		`- const currentFiles = arrayToSet(this.getFileNames());`
	`749`	`+ const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));`
	`750`	`+ const currentFiles = arrayToSet(this.getFileNames().concat(externalFiles));`
`750`	`751`
`751`	`752`	`const added: string[] = [];`
`752`	`753`	`const removed: string[] = [];`
`@@ -769,7 +770,8 @@ namespace ts.server {`
`769`	`770`	`else {`
`770`	`771`	`// unknown version - return everything`
`771`	`772`	`const projectFileNames = this.getFileNames();`
`772`		`- this.lastReportedFileNames = arrayToSet(projectFileNames);`
	`773`	`+ const externalFiles = this.getExternalFiles().map(f => toNormalizedPath(f));`
	`774`	`+ this.lastReportedFileNames = arrayToSet(projectFileNames.concat(externalFiles));`
`773`	`775`	`this.lastReportedVersion = this.projectStructureVersion;`
`774`	`776`	`return { info, files: projectFileNames, projectErrors: this.getGlobalProjectErrors() };`
`775`	`777`	`}`
`@@ -1084,6 +1086,9 @@ namespace ts.server {`
`1084`	`1086`	`}`
`1085`	`1087`	`catch (e) {`
`1086`	`1088`	this.projectService.logger.info(`A plugin threw an exception in getExternalFiles: ${e}`);
	`1089`	`+ if (e.stack) {`
	`1090`	`+ this.projectService.logger.info(e.stack);`
	`1091`	`+ }`
`1087`	`1092`	`}`
`1088`	`1093`	`}));`
`1089`	`1094`	`}`