Allow plugins to override lshost.resolveModuleName

sandersn · sandersn · commit 51408f0a0d48 · 2017-03-02T13:10:56.000-08:00
The implementation is ugly and probably still a little bit wrong.
diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
@@ -11,7 +11,7 @@ namespace ts.server {
 
         private filesWithChangedSetOfUnresolvedImports: Path[];
 
-        private readonly resolveModuleName: typeof resolveModuleName;
+        private resolveModuleName: typeof resolveModuleName;
         readonly trace: (s: string) => void;
         readonly realpath?: (path: string) => string;
 
@@ -46,6 +46,11 @@ namespace ts.server {
             }
         }
 
+        public overrideResolveModuleName(plugin: PluginResolveModules) {
+            const prevResolveModuleName = this.resolveModuleName;
+            this.resolveModuleName = plugin(prevResolveModuleName);
+        }
+
         public startRecordingFilesWithChangedResolutions() {
             this.filesWithChangedSetOfUnresolvedImports = [];
         }
@@ -237,4 +242,4 @@ namespace ts.server {
             this.compilationSettings = opt;
         }
     }
-}
+}
diff --git a/src/server/project.ts b/src/server/project.ts
@@ -102,6 +102,7 @@ namespace ts.server {
     export interface PluginModule {
         create(createInfo: PluginCreateInfo): LanguageService;
         getExternalFiles?(proj: Project): string[];
+        resolveModules?(createInfo: PluginCreateInfo): PluginResolveModules;
         changeSourceFiles?(createInfo: PluginCreateInfo): PluginSourceFileChange;
     }
 
@@ -110,6 +111,12 @@ namespace ts.server {
         updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean, cheat?: string): SourceFile,
     };
 
+    export type ModuleResolver = (moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache) => ResolvedModuleWithFailedLookupLocations;
+
+    export type PluginResolveModules = {
+        (plugin: ModuleResolver): ModuleResolver;
+    }
+
     export interface PluginModuleFactory {
         (mod: { typescript: typeof ts }): PluginModule;
     }
@@ -915,6 +922,9 @@ namespace ts.server {
                     ts.createLanguageServiceSourceFile = chg.createLanguageServiceSourceFile;
                     ts.updateLanguageServiceSourceFile = chg.updateLanguageServiceSourceFile;
                 }
+                if (pluginModule.resolveModules) {
+                    this.lsHost.overrideResolveModuleName(pluginModule.resolveModules(info));
+                }
                 this.plugins.push(pluginModule);
             }
             catch (e) {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace ts.server {`
`11`	`11`
`12`	`12`	`private filesWithChangedSetOfUnresolvedImports: Path[];`
`13`	`13`
`14`		`- private readonly resolveModuleName: typeof resolveModuleName;`
	`14`	`+ private resolveModuleName: typeof resolveModuleName;`
`15`	`15`	`readonly trace: (s: string) => void;`
`16`	`16`	`readonly realpath?: (path: string) => string;`
`17`	`17`
`@@ -46,6 +46,11 @@ namespace ts.server {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
	`49`	`+ public overrideResolveModuleName(plugin: PluginResolveModules) {`
	`50`	`+ const prevResolveModuleName = this.resolveModuleName;`
	`51`	`+ this.resolveModuleName = plugin(prevResolveModuleName);`
	`52`	`+ }`
	`53`	`+`
`49`	`54`	`public startRecordingFilesWithChangedResolutions() {`
`50`	`55`	`this.filesWithChangedSetOfUnresolvedImports = [];`
`51`	`56`	`}`
`@@ -237,4 +242,4 @@ namespace ts.server {`
`237`	`242`	`this.compilationSettings = opt;`
`238`	`243`	`}`
`239`	`244`	`}`
`240`		`-}`
	`245`	`+}`