CR: Enable Razor features by default; define 'razor.disabled' config option to turn them off

Author: SteveSandersonMS

package.json

@@ -655,10 +655,10 @@
           "default": false,
           "description": "Specifies whether notifications should be shown if OmniSharp encounters warnings or errors loading a project. Note that these warnings/errors are always emitted to the OmniSharp log"
         },
-        "omnisharp.preview": {
+        "razor.disabled": {
           "type": "boolean",
           "default": false,
-          "description": "Specifies whether to enable OmniSharp preview features."
+          "description": "Specifies whether to disable Razor language features."
         },
         "razor.languageServer.directory": {
           "type": [

src/main.ts

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

src/omnisharp/options.ts

@@ -23,8 +23,7 @@ export class Options {
         public minFindSymbolsFilterLength: number,
         public maxFindSymbolsItems: number,
         public defaultLaunchSolution?: string,
-        public monoPath?: string,
-        public preview?: boolean) { }
+        public monoPath?: string) { }
 
 
     public static Read(vscode: vscode): Options {
@@ -69,8 +68,6 @@ 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 preview = omnisharpConfig.get<boolean>('preview', false);
-
         return new Options(
             path, 
             useGlobalMono, 
@@ -89,7 +86,6 @@ export class Options {
             maxFindSymbolsItems,
             defaultLaunchSolution,
             monoPath,
-            preview,
         );
     }
 

src/razor/razor.ts

@@ -10,7 +10,13 @@ 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');