Change to object

microsoft · Nov 22, 2016 · d0f3dc7 · d0f3dc7
1 parent 2145545
commit d0f3dc7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -248,9 +248,10 @@ namespace FourSlash {
         static mockResolveModule(moduleName: string, _initialDir: string, _host: ts.server.ServerHost, log: (message: string) => void): ts.server.PluginModule {
             log(`Mock resolving ${moduleName}`);
             return {
-                create(_proj: any, langSvc: any, _config: any) {
+                create(info: ts.server.PluginCreateInfo) {
                     // tslint:disable-next-line:no-null-keyword
                     const proxy = Object.create(null);
+                    const langSvc: any = info.languageService;
                     for (const k of Object.keys(langSvc)) {
                         proxy[k] = function () {
                             return langSvc[k].apply(langSvc, arguments);

diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -2028,5 +2028,5 @@ namespace Harness {
         return { unitName: libFile, content: io.readFile(libFile) };
     }
 
-    if (Error) (<any>Error).stackTraceLimit = 20;
+    if (Error) (<any>Error).stackTraceLimit = 1;
 }
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -171,8 +171,16 @@ namespace ts.server {
         };
     }
 
+    export interface PluginCreateInfo {
+        project: Project;
+        languageService: LanguageService;
+        serverHost: ServerHost;
+        config: any;
+    }
+
     export interface PluginModule {
-        create(proj: Project, languageService: LanguageService, config: any): LanguageService;
+        create(createInfo: PluginCreateInfo): LanguageService;
+        getExternalFiles?(proj: Project): string[];
     }
 
     export abstract class Project {
@@ -855,6 +863,8 @@ namespace ts.server {
         private directoriesWatchedForWildcards: Map<FileWatcher>;
         private typeRootsWatchers: FileWatcher[];
 
+        private plugins: PluginModule[] = [];
+
         /** Used for configured projects which may have multiple open roots */
         openRefCount = 0;
 
@@ -902,7 +912,14 @@ namespace ts.server {
 
         private enableProxy(pluginModule: PluginModule, configEntry: PluginImport) {
             try {
-                this.languageService = pluginModule.create(this, this.languageService, configEntry);
+                const info: PluginCreateInfo = {
+                    config: configEntry,
+                    project: this,
+                    languageService: this.languageService,
+                    serverHost: this.projectService.host
+                };
+                this.languageService = pluginModule.create(info);
+                this.plugins.push(pluginModule);
             }
             catch (e) {
                 this.projectService.logger.info(`Plugin activation failed: ${e}`);
@@ -930,8 +947,13 @@ namespace ts.server {
         }
 
         getExternalFiles(): string[] {
-            // TODO: Ask plugins for this information as well
-            return [];
+            const items: string[] = [];
+            for (const plugin of this.plugins) {
+                if (plugin.getExternalFiles) {
+                    items.push(...plugin.getExternalFiles(this));
+                }
+            }
+            return items;
         }
 
         watchConfigFile(callback: (project: ConfiguredProject) => void) {