Remove old feature flag, and add new one

Author: davidwengier

package.json

@@ -1513,17 +1513,15 @@
             "description": "%configuration.razor.languageServer.forceRuntimeCodeGeneration%",
             "order": 90
           },
-          "razor.languageServer.useRoslynTokenizer": {
-            "type": "boolean",
-            "scope": "machine-overridable",
-            "default": false,
-            "markdownDescription": "%configuration.razor.languageServer.useRoslynTokenizer%",
-            "order": 90
-          },
           "razor.languageServer.suppressLspErrorToasts": {
             "type": "boolean",
             "default": true,
             "description": "%configuration.razor.languageServer.suppressLspErrorToasts%"
+          },
+          "razor.languageServer.useNewFormattingEngine": {
+            "type": "boolean",
+            "default": true,
+            "description": "%configuration.razor.languageServer.useNewFormattingEngine%"
           }
         }
       },

package.nls.json

@@ -128,13 +128,8 @@
   "configuration.razor.languageServer.debug": "Specifies whether to wait for debug attach when launching the language server.",
   "configuration.razor.server.trace": "Specifies the logging level to use for the Razor server.",
   "configuration.razor.languageServer.forceRuntimeCodeGeneration": "(EXPERIMENTAL) Enable combined design time/runtime code generation for Razor files",
-  "configuration.razor.languageServer.useRoslynTokenizer": {
-    "message": "(EXPERIMENTAL) Use the C# tokenizer for Razor files in the IDE. Enables some new C# features, like interpolated and raw strings, in Razor files opened in Visual Studio Code. This matches using `<features>use-roslyn-tokenizer</feature>` in a `.csproj` file for command line builds, and may result in inconsistencies if this option and your project files do not match.",
-    "comment": [
-      "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered."
-    ]
-  },
   "configuration.razor.languageServer.suppressLspErrorToasts": "Suppresses error toasts from showing up if the server encounters a recoverable error.",
+  "configuration.razor.languageServer.useNewFormattingEngine": "Use the new Razor formatting engine.",
   "debuggers.coreclr.configurationSnippets.label.console-local": ".NET: Launch Executable file (Console)",
   "debuggers.coreclr.configurationSnippets.label.web-local": ".NET: Launch Executable file (Web)",
   "debuggers.coreclr.configurationSnippets.label.attach-local": ".NET: Attach to a .NET process",

src/razor/src/razorLanguageServerClient.ts

@@ -267,8 +267,8 @@ export class RazorLanguageServerClient implements vscode.Disposable {
                 args.push('true');
             }
 
-            if (options.useRoslynTokenizer) {
-                args.push('--UseRoslynTokenizer');
+            if (options.useNewFormattingEngine) {
+                args.push('--UseNewFormattingEngine');
                 args.push('true');
             }
 

src/razor/src/razorLanguageServerOptions.ts

@@ -11,6 +11,6 @@ export interface RazorLanguageServerOptions {
     debug?: boolean;
     usingOmniSharp: boolean;
     forceRuntimeCodeGeneration: boolean;
-    useRoslynTokenizer: boolean;
     suppressErrorToasts: boolean;
+    useNewFormattingEngine: boolean;
 }

src/razor/src/razorLanguageServerOptionsResolver.ts

@@ -35,17 +35,17 @@ export function resolveRazorLanguageServerOptions(
         forceRuntimeCodeGeneration = hotReload;
     }
 
-    const useRoslynTokenizer = serverConfig.get<boolean>('useRoslynTokenizer');
     const suppressErrorToasts = serverConfig.get<boolean>('suppressLspErrorToasts');
+    const useNewFormattingEngine = serverConfig.get<boolean>('useNewFormattingEngine');
 
     return {
         serverPath: languageServerExecutablePath,
         debug: debugLanguageServer,
         outputChannel: logger.outputChannel,
         usingOmniSharp,
         forceRuntimeCodeGeneration,
-        useRoslynTokenizer,
         suppressErrorToasts,
+        useNewFormattingEngine,
     } as RazorLanguageServerOptions;
 }