Merge pull request #15308 from chuckjaz/external-files

RyanCavanaugh · web-flow · commit 6f42f9ae3fce · 2017-06-05T13:14:25.000-07:00
Allow plugins to provide a list of external files.
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -106,6 +106,7 @@ namespace ts.server {
         private rootFiles: ScriptInfo[] = [];
         private rootFilesMap: FileMap<ScriptInfo> = createFileMap<ScriptInfo>();
         private program: ts.Program;
+        private externalFiles: SortedReadonlyArray<string>;
 
         private cachedUnresolvedImportsPerFile = new UnresolvedImportsMap();
         private lastCachedUnresolvedImportsList: SortedReadonlyArray<string>;
@@ -261,8 +262,8 @@ namespace ts.server {
         abstract getProjectRootPath(): string | undefined;
         abstract getTypeAcquisition(): TypeAcquisition;
 
-        getExternalFiles(): string[] {
-            return [];
+        getExternalFiles(): SortedReadonlyArray<string> {
+            return emptyArray as SortedReadonlyArray<string>;
         }
 
         getSourceFile(path: Path) {
@@ -561,6 +562,24 @@ namespace ts.server {
                     }
                 }
             }
+
+            const oldExternalFiles = this.externalFiles || emptyArray as SortedReadonlyArray<string>;
+            this.externalFiles = this.getExternalFiles();
+            enumerateInsertsAndDeletes(this.externalFiles, oldExternalFiles,
+                // Ensure a ScriptInfo is created for new external files. This is performed indirectly
+                // by the LSHost for files in the program when the program is retrieved above but
+                // the program doesn't contain external files so this must be done explicitly.
+                inserted => {
+                    const scriptInfo = this.projectService.getOrCreateScriptInfo(inserted, /*openedByClient*/ false);
+                    scriptInfo.attachToProject(this);
+                },
+                removed => {
+                    const scriptInfoToDetach = this.projectService.getScriptInfo(removed);
+                    if (scriptInfoToDetach) {
+                        scriptInfoToDetach.detachFromProject(this);
+                    }
+                });
+
             return hasChanges;
         }
 
@@ -956,7 +975,7 @@ namespace ts.server {
             return this.typeAcquisition;
         }
 
-        getExternalFiles(): string[] {
+        getExternalFiles(): SortedReadonlyArray<string> {
             const items: string[] = [];
             for (const plugin of this.plugins) {
                 if (typeof plugin.getExternalFiles === "function") {
@@ -968,7 +987,7 @@ namespace ts.server {
                     }
                 }
             }
-            return items;
+            return toSortedReadonlyArray(items);
         }
 
         watchConfigFile(callback: (project: ConfiguredProject) => void) {
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
@@ -195,6 +195,37 @@ namespace ts.server {
         return <any>arr;
     }
 
+    export function enumerateInsertsAndDeletes<T>(a: SortedReadonlyArray<T>, b: SortedReadonlyArray<T>, inserted: (item: T) => void, deleted: (item: T) => void, compare?: (a: T, b: T) => Comparison) {
+        compare = compare || ts.compareValues;
+        let aIndex = 0;
+        let bIndex = 0;
+        const aLen = a.length;
+        const bLen = b.length;
+        while (aIndex < aLen && bIndex < bLen) {
+            const aItem = a[aIndex];
+            const bItem = b[bIndex];
+            const compareResult = compare(aItem, bItem);
+            if (compareResult === Comparison.LessThan) {
+                inserted(aItem);
+                aIndex++;
+            }
+            else if (compareResult === Comparison.GreaterThan) {
+                deleted(bItem);
+                bIndex++;
+            }
+            else {
+                aIndex++;
+                bIndex++;
+            }
+        }
+        while (aIndex < aLen) {
+            inserted(a[aIndex++]);
+        }
+        while (bIndex < bLen) {
+            deleted(b[bIndex++]);
+        }
+    }
+
     export class ThrottledOperations {
         private pendingTimeouts: Map<any> = createMap<any>();
         constructor(private readonly host: ServerHost) {

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ namespace ts.server {`
`106`	`106`	`private rootFiles: ScriptInfo[] = [];`
`107`	`107`	`private rootFilesMap: FileMap<ScriptInfo> = createFileMap<ScriptInfo>();`
`108`	`108`	`private program: ts.Program;`
	`109`	`+ private externalFiles: SortedReadonlyArray<string>;`
`109`	`110`
`110`	`111`	`private cachedUnresolvedImportsPerFile = new UnresolvedImportsMap();`
`111`	`112`	`private lastCachedUnresolvedImportsList: SortedReadonlyArray<string>;`
`@@ -261,8 +262,8 @@ namespace ts.server {`
`261`	`262`	`abstract getProjectRootPath(): string \| undefined;`
`262`	`263`	`abstract getTypeAcquisition(): TypeAcquisition;`
`263`	`264`
`264`		`- getExternalFiles(): string[] {`
`265`		`- return [];`
	`265`	`+ getExternalFiles(): SortedReadonlyArray<string> {`
	`266`	`+ return emptyArray as SortedReadonlyArray<string>;`
`266`	`267`	`}`
`267`	`268`
`268`	`269`	`getSourceFile(path: Path) {`
`@@ -561,6 +562,24 @@ namespace ts.server {`
`561`	`562`	`}`
`562`	`563`	`}`
`563`	`564`	`}`
	`565`	`+`
	`566`	`+ const oldExternalFiles = this.externalFiles \|\| emptyArray as SortedReadonlyArray<string>;`
	`567`	`+ this.externalFiles = this.getExternalFiles();`
	`568`	`+ enumerateInsertsAndDeletes(this.externalFiles, oldExternalFiles,`
	`569`	`+ // Ensure a ScriptInfo is created for new external files. This is performed indirectly`
	`570`	`+ // by the LSHost for files in the program when the program is retrieved above but`
	`571`	`+ // the program doesn't contain external files so this must be done explicitly.`
	`572`	`+ inserted => {`
	`573`	`+ const scriptInfo = this.projectService.getOrCreateScriptInfo(inserted, /openedByClient/ false);`
	`574`	`+ scriptInfo.attachToProject(this);`
	`575`	`+ },`
	`576`	`+ removed => {`
	`577`	`+ const scriptInfoToDetach = this.projectService.getScriptInfo(removed);`
	`578`	`+ if (scriptInfoToDetach) {`
	`579`	`+ scriptInfoToDetach.detachFromProject(this);`
	`580`	`+ }`
	`581`	`+ });`
	`582`	`+`
`564`	`583`	`return hasChanges;`
`565`	`584`	`}`
`566`	`585`
`@@ -956,7 +975,7 @@ namespace ts.server {`
`956`	`975`	`return this.typeAcquisition;`
`957`	`976`	`}`
`958`	`977`
`959`		`- getExternalFiles(): string[] {`
	`978`	`+ getExternalFiles(): SortedReadonlyArray<string> {`
`960`	`979`	`const items: string[] = [];`
`961`	`980`	`for (const plugin of this.plugins) {`
`962`	`981`	`if (typeof plugin.getExternalFiles === "function") {`
`@@ -968,7 +987,7 @@ namespace ts.server {`
`968`	`987`	`}`
`969`	`988`	`}`
`970`	`989`	`}`
`971`		`- return items;`
	`990`	`+ return toSortedReadonlyArray(items);`
`972`	`991`	`}`
`973`	`992`
`974`	`993`	`watchConfigFile(callback: (project: ConfiguredProject) => void) {`