Conditionally load OmniSharp server plugin

Author: SteveSandersonMS

src/main.ts

@@ -135,7 +135,9 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
         coreClrDebugPromise = coreclrdebug.activate(extension, context, platformInfo, eventStream);
     }
 
-    await activateRazorExtension(context, eventStream);
+    if (!optionProvider.GetLatestOptions().razorDisabled) {
+        await activateRazorExtension(context, eventStream);
+    }
 
     return {
         initializationFinished: async () => {

src/omnisharp/options.ts

@@ -23,7 +23,8 @@ export class Options {
         public minFindSymbolsFilterLength: number,
         public maxFindSymbolsItems: number,
         public defaultLaunchSolution?: string,
-        public monoPath?: string) { }
+        public monoPath?: string,
+        public razorDisabled?: boolean) { }
 
 
     public static Read(vscode: vscode): Options {
@@ -36,6 +37,7 @@ export class Options {
 
         const omnisharpConfig = vscode.workspace.getConfiguration('omnisharp');
         const csharpConfig = vscode.workspace.getConfiguration('csharp');
+        const razorConfig = vscode.workspace.getConfiguration('razor');
 
         const path = Options.readPathOption(csharpConfig, omnisharpConfig);
         const useGlobalMono = Options.readUseGlobalMonoOption(omnisharpConfig, csharpConfig);
@@ -68,6 +70,8 @@ export class Options {
         const minFindSymbolsFilterLength = omnisharpConfig.get<number>('minFindSymbolsFilterLength', 0);
         const maxFindSymbolsItems = omnisharpConfig.get<number>('maxFindSymbolsItems', 1000);   // The limit is applied only when this setting is set to a number greater than zero
 
+        const razorDisabled = razorConfig.get<boolean>('disabled', false);
+
         return new Options(
             path, 
             useGlobalMono, 
@@ -86,6 +90,7 @@ export class Options {
             maxFindSymbolsItems,
             defaultLaunchSolution,
             monoPath,
+            razorDisabled
         );
     }
 

src/omnisharp/server.ts

@@ -304,6 +304,15 @@ export class OmniSharpServer {
             '--loglevel', options.loggingLevel
         ];
 
+        if (!options.razorDisabled) {
+            const razorPluginPath = path.join(
+                utils.getExtensionPath(),
+                '.razor',
+                'OmniSharpPlugin',
+                'Microsoft.AspNetCore.Razor.OmniSharpPlugin.dll');
+            args.push('--plugin', razorPluginPath);
+        }
+
         if (options.waitForDebugger === true) {
             args.push('--debug');
         }

src/razor/razor.ts

@@ -10,13 +10,7 @@ import * as Razor from 'microsoft.aspnetcore.razor.vscode';
 import { EventStream } from '../EventStream';
 
 export async function activateRazorExtension(context: vscode.ExtensionContext, eventStream: EventStream) {
-    // Bail out as early as possible if Razor language features are disabled
     const razorConfig = vscode.workspace.getConfiguration('razor');
-    const razorDisabled = razorConfig.get<boolean>('disabled', false);
-    if (razorDisabled) {
-        return;
-    }
-
     const configuredLanguageServerDir = razorConfig.get<string>('languageServer.directory', null);
     const languageServerDir = configuredLanguageServerDir || path.join(context.extensionPath, '.razor');