Typescript changes to add razor design time overload

Author: Andrew Hall

src/lsptoolshost/roslynLanguageServer.ts

@@ -56,7 +56,7 @@ import { registerShowToastNotification } from './showToastNotification';
 import { registerRazorCommands } from './razorCommands';
 import { registerOnAutoInsert } from './onAutoInsert';
 import { registerCodeActionFixAllCommands } from './fixAllCodeAction';
-import { commonOptions, languageServerOptions, omnisharpOptions } from '../shared/options';
+import { commonOptions, languageServerOptions, omnisharpOptions, razorOptions } from '../shared/options';
 import { NamedPipeInformation } from './roslynProtocol';
 import { IDisposable } from '../disposable';
 import { registerNestedCodeActionCommands } from './nestedCodeAction';
@@ -513,9 +513,16 @@ export class RoslynLanguageServer {
             args.push('--logLevel', logLevel);
         }
 
+        const razorPath =
+            razorOptions.razorServerPath === ''
+                ? path.join(context.extension.extensionPath, '.razor')
+                : razorOptions.razorServerPath;
+
+        args.push('--razorSourceGenerator', path.join(razorPath, 'Microsoft.CodeAnalysis.Razor.Compiler.dll'));
+
         args.push(
-            '--razorSourceGenerator',
-            path.join(context.extension.extensionPath, '.razor', 'Microsoft.CodeAnalysis.Razor.Compiler.dll')
+            '--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

@@ -85,6 +85,7 @@ export interface LanguageServerOptions {
 export interface RazorOptions {
     readonly razorDevMode: boolean;
     readonly razorPluginPath: string;
+    readonly razorServerPath: string;
 }
 
 class CommonOptionsImpl implements CommonOptions {
@@ -418,6 +419,9 @@ class RazorOptionsImpl implements RazorOptions {
     public get razorPluginPath() {
         return readOption<string>('razor.plugin.path', '');
     }
+    public get razorServerPath() {
+        return readOption<string>('razor.languageServer.directory', '');
+    }
 }
 
 export const commonOptions: CommonOptions = new CommonOptionsImpl();