Use the source generator from the Razor extension if cohosting is on

Author: davidwengier

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -617,15 +617,23 @@ export class RoslynLanguageServer {
                 ? path.join(context.extension.extensionPath, '.razor')
                 : razorOptions.razorServerPath;
 
-        args.push('--razorSourceGenerator', path.join(razorPath, 'Microsoft.CodeAnalysis.Razor.Compiler.dll'));
+        let razorComponentPath = '';
+        getComponentPaths('razorExtension', languageServerOptions).forEach((extPath) => {
+            additionalExtensionPaths.push(extPath);
+            razorComponentPath = path.dirname(extPath);
+        });
+
+        // If cohosting is enabled we get the source generator from the razor component path
+        const razorSourceGeneratorPath = razorOptions.cohostingEnabled ? razorComponentPath : razorPath;
 
         args.push(
-            '--razorDesignTimePath',
-            path.join(razorPath, 'Targets', 'Microsoft.NET.Sdk.Razor.DesignTime.targets')
+            '--razorSourceGenerator',
+            path.join(razorSourceGeneratorPath, 'Microsoft.CodeAnalysis.Razor.Compiler.dll')
         );
 
-        getComponentPaths('razorExtension', languageServerOptions).forEach((path) =>
-            additionalExtensionPaths.push(path)
+        args.push(
+            '--razorDesignTimePath',
+            path.join(razorPath, 'Targets', 'Microsoft.NET.Sdk.Razor.DesignTime.targets')
         );
 
         // Get the brokered service pipe name from C# Dev Kit (if installed).

src/shared/options.ts

@@ -88,6 +88,7 @@ export interface RazorOptions {
     readonly razorDevMode: boolean;
     readonly razorPluginPath: string;
     readonly razorServerPath: string;
+    readonly cohostingEnabled: boolean;
 }
 
 class CommonOptionsImpl implements CommonOptions {
@@ -430,6 +431,9 @@ class RazorOptionsImpl implements RazorOptions {
     public get razorServerPath() {
         return readOption<string>('razor.languageServer.directory', '');
     }
+    public get cohostingEnabled() {
+        return readOption<boolean>('razor.languageServer.cohostingEnabled', false);
+    }
 }
 
 export const commonOptions: CommonOptions = new CommonOptionsImpl();