Add server path as an option to allow Razor to re-use the runtime resolver

Author: dibarbet

src/lsptoolshost/dotnetRuntimeExtensionResolver.ts

@@ -7,7 +7,6 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import { HostExecutableInformation } from "../shared/constants/HostExecutableInformation";
 import { IHostExecutableResolver } from "../shared/constants/IHostExecutableResolver";
-import { getServerPath } from "../lsptoolshost/roslynLanguageServer";
 import { PlatformInformation } from "../shared/platform";
 import { Options } from "../shared/options";
 import { existsSync } from 'fs';
@@ -20,16 +19,21 @@ interface IDotnetAcquireResult {
 }
 
 /**
- * Resolves the dotnet runtime from given options and the dotnet runtime VSCode extension.
+ * Resolves the dotnet runtime for a server executable from given options and the dotnet runtime VSCode extension.
  */
 export class DotnetRuntimeExtensionResolver implements IHostExecutableResolver {
-    constructor(private platformInfo: PlatformInformation) { }
+    constructor(
+        private platformInfo: PlatformInformation,
+        /**
+         * This is a function instead of a string because the server path can change while the extension is active (when the option changes).
+         */
+        private getServerPath: (options: Options, platform: PlatformInformation) => string) { }
 
     private hostInfo: HostExecutableInformation | undefined;
 
     async getHostExecutableInfo(options: Options): Promise<HostExecutableInformation> {
         let dotnetRuntimePath = options.commonOptions.dotnetPath;
-        const serverPath = getServerPath(options, this.platformInfo);
+        const serverPath = this.getServerPath(options, this.platformInfo);
         if (!dotnetRuntimePath)
         {
             let dotnetInfo = await this.acquireDotNetProcessDependencies(serverPath);

src/lsptoolshost/roslynLanguageServer.ts

@@ -538,7 +538,7 @@ export async function activateRoslynLanguageServer(context: vscode.ExtensionCont
     // Create a separate channel for outputting trace logs - these are incredibly verbose and make other logs very difficult to see.
     _traceChannel = vscode.window.createOutputChannel("C# LSP Trace Logs");
 
-    const hostExecutableResolver = new DotnetRuntimeExtensionResolver(platformInfo);
+    const hostExecutableResolver = new DotnetRuntimeExtensionResolver(platformInfo, getServerPath);
     _languageServer = new RoslynLanguageServer(platformInfo, hostExecutableResolver, optionProvider, context, reporter);
 
     // Register any commands that need to be handled by the extension.
@@ -584,7 +584,7 @@ export async function activateRoslynLanguageServer(context: vscode.ExtensionCont
     _languageServer.start();
 }
 
-export function getServerPath(options: Options, platformInfo: PlatformInformation) {
+function getServerPath(options: Options, platformInfo: PlatformInformation) {
     let clientRoot = __dirname;
 
     let serverPath = options.commonOptions.serverPath;