Use LogOutputWindow (#7805)

Extension side of dotnet/razor#11226

Author: Andrew Hall

CHANGELOG.md

@@ -4,6 +4,10 @@
 - Debug from .csproj and .sln [#5876](https://github.com/dotnet/vscode-csharp/issues/5876)
 
 # 2.58.x
+* Update Razor to 9.0.0-preview.24569.4 (PR: [#7805](https://github.com/dotnet/vscode-csharp/pull/7805))
+  * Allow logging level to be changed in rzls (#11228) (PR: [#11228](https://github.com/dotnet/razor/pull/11228))
+  * [Fuse] bind-Value:attribute support (#11214) (PR: [#11214](https://github.com/dotnet/razor/pull/11214))
+  * Handle skipped trivia in the C# tokenizer (#11207) (PR: [#11207](https://github.com/dotnet/razor/pull/11207))
 * Add support for refreshing opened source generated files (PR: [#7791](https://github.com/dotnet/vscode-csharp/pull/7791))
 * Update Roslyn to 4.13.0-2.24569.1 (PR: [#7791](https://github.com/dotnet/vscode-csharp/pull/7791))
   * Support unbound generic types in 'nameof' operator. (PR: [#75368](https://github.com/dotnet/roslyn/pull/75368))

l10n/bundle.l10n.json

@@ -63,7 +63,6 @@
   "Cannot load Razor language server because the directory was not found: '{0}'": "Cannot load Razor language server because the directory was not found: '{0}'",
   "Razor Log": "Razor Log",
   "Could not find '{0}' in or above '{1}'.": "Could not find '{0}' in or above '{1}'.",
-  "Invalid razor.server.trace setting. Defaulting to '{0}'": "Invalid razor.server.trace setting. Defaulting to '{0}'",
   "Could not find Razor Language Server executable '{0}' within directory": "Could not find Razor Language Server executable '{0}' within directory",
   "Server failed to start after retrying 5 times.": "Server failed to start after retrying 5 times.",
   "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to start unexpectedly, please check the 'Razor Log' and report an issue.",
@@ -72,8 +71,6 @@
   "Tried to bind on notification logic while server is not started.": "Tried to bind on notification logic while server is not started.",
   "Cannot stop Razor Language Server as it is already stopped.": "Cannot stop Razor Language Server as it is already stopped.",
   "Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.": "Razor Language Server failed to stop correctly, please check the 'Razor Log' and report an issue.",
-  "Would you like to restart the Razor Language Server to enable the Razor trace configuration change?": "Would you like to restart the Razor Language Server to enable the Razor trace configuration change?",
-  "Restart": "Restart",
   "Razor HTML Preview": "Razor HTML Preview",
   "Unexpected error when attaching to HTML preview window.": "Unexpected error when attaching to HTML preview window.",
   "Razor HTML copied to clipboard": "Razor HTML copied to clipboard",

package.json

@@ -39,7 +39,7 @@
   "defaults": {
     "roslyn": "4.13.0-2.24569.1",
     "omniSharp": "1.39.11",
-    "razor": "9.0.0-preview.24565.1",
+    "razor": "9.0.0-preview.24569.4",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "xamlTools": "17.13.35513.19"
   },
@@ -1505,22 +1505,6 @@
             "description": "%configuration.razor.languageServer.debug%",
             "order": 90
           },
-          "razor.server.trace": {
-            "scope": "window",
-            "type": "string",
-            "enum": [
-              "Trace",
-              "Debug",
-              "Information",
-              "Warning",
-              "Error",
-              "Critical",
-              "None"
-            ],
-            "order": 90,
-            "default": "Information",
-            "description": "%configuration.razor.server.trace%"
-          },
           "razor.languageServer.forceRuntimeCodeGeneration": {
             "type": "boolean",
             "scope": "machine-overridable",

src/razor/src/configurationChangeListener.ts

@@ -5,7 +5,6 @@
 
 import * as vscode from 'vscode';
 import { RazorLogger } from '../razorLogger';
-import { LogLevel } from '../logLevel';
 import { ReportIssueCreator } from './reportIssueCreator';
 import { ReportIssueDataCollector } from './reportIssueDataCollector';
 import { ReportIssueDataCollectorFactory } from './reportIssueDataCollectorFactory';
@@ -105,7 +104,7 @@ export class ReportIssuePanel {
             }
         });
 
-        this.traceLevelChange = this.logger.onTraceLevelChange(async () => this.update());
+        this.traceLevelChange = this.logger.outputChannel.onDidChangeLogLevel(async () => this.update());
 
         this.panel.onDidDispose(() => {
             if (this.traceLevelChange) {
@@ -121,7 +120,7 @@ export class ReportIssuePanel {
         }
 
         let panelBodyContent = '';
-        if (this.logger.logLevel.valueOf() <= LogLevel.Debug) {
+        if (this.logger.logLevel <= vscode.LogLevel.Debug) {
             const startButtonLabel = vscode.l10n.t('Start');
             const startButton = `<button onclick="startIssue()">${startButtonLabel}</button>`;
             const firstLine = vscode.l10n.t('Press {0}', startButton);
@@ -159,9 +158,9 @@ ${privacyAnchor}
 
 <button onclick="copyIssue()">${copyIssueContentLabel}</button>`;
         } else {
-            const verbositySettingName = `<strong><em>${RazorLogger.verbositySetting}</em></strong>`;
-            const currentVerbositySettingValue = `<strong><em>${LogLevel[this.logger.logLevel]}</em></strong>`;
-            const neededVerbositySettingValue = `<strong><em>${LogLevel[LogLevel.Debug]}</em></strong>`;
+            const verbositySettingName = `<strong><em>Razor Logging Level</em></strong>`;
+            const currentVerbositySettingValue = `<strong><em>${vscode.LogLevel[this.logger.logLevel]}</em></strong>`;
+            const neededVerbositySettingValue = `<strong><em>${vscode.LogLevel[vscode.LogLevel.Debug]}</em></strong>`;
 
             panelBodyContent =
                 '<p>' +

src/razor/src/diagnostics/reportIssuePanel.ts

@@ -6,13 +6,11 @@
 import * as vscode from 'vscode';
 import * as vscodeapi from 'vscode';
 import { ExtensionContext } from 'vscode';
-import { BlazorDebugConfigurationProvider } from './blazorDebug/blazorDebugConfigurationProvider';
 import { CodeActionsHandler } from './codeActions/codeActionsHandler';
 import { CompletionHandler } from './completion/completionHandler';
 import { RazorCodeActionRunner } from './codeActions/razorCodeActionRunner';
 import { RazorCodeLensProvider } from './codeLens/razorCodeLensProvider';
 import { ColorPresentationHandler } from './colorPresentation/colorPresentationHandler';
-import { listenToConfigurationChanges } from './configurationChangeListener';
 import { RazorCSharpFeature } from './csharp/razorCSharpFeature';
 import { RazorDefinitionProvider } from './definition/razorDefinitionProvider';
 import { ReportIssueCommand } from './diagnostics/reportIssueCommand';
@@ -33,7 +31,6 @@ import { ProposedApisFeature } from './proposedApisFeature';
 import { RazorLanguage } from './razorLanguage';
 import { RazorLanguageConfiguration } from './razorLanguageConfiguration';
 import { RazorLanguageServerClient } from './razorLanguageServerClient';
-import { resolveRazorLanguageServerLogLevel } from './razorLanguageServerTraceResolver';
 import { RazorLanguageServiceClient } from './razorLanguageServiceClient';
 import { RazorLogger } from './razorLogger';
 import { RazorReferenceProvider } from './reference/razorReferenceProvider';
@@ -71,14 +68,12 @@ export async function activate(
         create: <T>() => new vscode.EventEmitter<T>(),
     };
 
-    const languageServerLogLevel = resolveRazorLanguageServerLogLevel(vscodeType);
-    const logger = new RazorLogger(eventEmitterFactory, languageServerLogLevel);
+    const logger = new RazorLogger(eventEmitterFactory);
 
     try {
         const razorOptions: RazorLanguageServerOptions = resolveRazorLanguageServerOptions(
             vscodeType,
             languageServerDir,
-            languageServerLogLevel,
             logger
         );
 
@@ -125,6 +120,7 @@ export async function activate(
             razorTelemetryReporter,
             platformInfo
         );
+
         const documentSynchronizer = new RazorDocumentSynchronizer(documentManager, logger);
         reportTelemetryForDocuments(documentManager, razorTelemetryReporter);
         const languageConfiguration = new RazorLanguageConfiguration();
@@ -269,7 +265,6 @@ export async function activate(
                 htmlFeature.register(),
                 documentSynchronizer.register(),
                 reportIssueCommand.register(),
-                listenToConfigurationChanges(languageServerClient),
                 razorCodeActionRunner.register()
             );
 
@@ -300,9 +295,6 @@ export async function activate(
             localRegistrations.length = 0;
         });
 
-        const provider = new BlazorDebugConfigurationProvider(logger, vscodeType);
-        context.subscriptions.push(vscodeType.debug.registerDebugConfigurationProvider('blazorwasm', provider));
-
         languageServerClient.onStarted(async () => {
             await documentManager.initialize();
         });

src/razor/src/extension.ts

@@ -12,7 +12,6 @@ import { ServerOptions } from 'vscode-languageclient/node';
 import { RazorLanguage } from './razorLanguage';
 import { RazorLanguageServerOptions } from './razorLanguageServerOptions';
 import { resolveRazorLanguageServerOptions } from './razorLanguageServerOptionsResolver';
-import { resolveRazorLanguageServerLogLevel } from './razorLanguageServerTraceResolver';
 import { RazorLogger } from './razorLogger';
 import { TelemetryReporter as RazorTelemetryReporter } from './telemetryReporter';
 import TelemetryReporter from '@vscode/extension-telemetry';
@@ -56,12 +55,6 @@ export class RazorLanguageServerClient implements vscode.Disposable {
         return this.client.initializeResult;
     }
 
-    public updateTraceLevel() {
-        const languageServerLogLevel = resolveRazorLanguageServerLogLevel(this.vscodeType);
-        this.setupLanguageServer();
-        this.logger.setTraceLevel(languageServerLogLevel);
-    }
-
     public onStarted(listener: () => Promise<any>) {
         this.onStartedListeners.push(listener);
     }
@@ -115,6 +108,10 @@ export class RazorLanguageServerClient implements vscode.Disposable {
             await this.client.start();
             this.logger.logMessage('Server started, waiting for client to be ready...');
             this.isStarted = true;
+
+            // Server is ready, hook up so logging changes can be reported
+            this.logger.languageServerClient = this;
+
             for (const listener of this.onStartListeners) {
                 await listener();
             }
@@ -123,6 +120,7 @@ export class RazorLanguageServerClient implements vscode.Disposable {
             resolve();
 
             this.logger.logMessage('Server ready!');
+
             for (const listener of this.onStartedListeners) {
                 await listener();
             }
@@ -230,11 +228,9 @@ export class RazorLanguageServerClient implements vscode.Disposable {
     }
 
     private setupLanguageServer() {
-        const languageServerTrace = resolveRazorLanguageServerLogLevel(this.vscodeType);
         const options: RazorLanguageServerOptions = resolveRazorLanguageServerOptions(
             this.vscodeType,
             this.languageServerDir,
-            languageServerTrace,
             this.logger
         );
         this.clientOptions = {
@@ -247,8 +243,8 @@ export class RazorLanguageServerClient implements vscode.Disposable {
         this.logger.logMessage(`Razor language server path: ${options.serverPath}`);
 
         args.push('--logLevel');
-        args.push(options.logLevel.toString());
-        this.razorTelemetryReporter.reportTraceLevel(options.logLevel);
+        args.push(this.logger.logLevelForRZLS.toString());
+        this.razorTelemetryReporter.reportTraceLevel(this.logger.logLevel);
 
         if (options.debug) {
             this.razorTelemetryReporter.reportDebugLanguageServer();

src/razor/src/logLevel.ts

@@ -4,13 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { LogLevel } from './logLevel';
 
 export interface RazorLanguageServerOptions {
     serverPath: string;
     outputChannel?: vscode.OutputChannel;
     debug?: boolean;
-    logLevel: LogLevel;
     usingOmniSharp: boolean;
     forceRuntimeCodeGeneration: boolean;
     useRoslynTokenizer: boolean;

src/razor/src/razorLanguageServerClient.ts

@@ -10,13 +10,11 @@ import * as vscodeAdapter from './vscodeAdapter';
 import * as vscode from 'vscode';
 import { RazorLanguageServerOptions } from './razorLanguageServerOptions';
 import { RazorLogger } from './razorLogger';
-import { LogLevel } from './logLevel';
 import { getCSharpDevKit } from '../../utils/getCSharpDevKit';
 
 export function resolveRazorLanguageServerOptions(
     vscodeApi: vscodeAdapter.api,
     languageServerDir: string,
-    logLevel: LogLevel,
     logger: RazorLogger
 ) {
     const languageServerExecutablePath = findLanguageServerExecutable(languageServerDir);
@@ -31,7 +29,6 @@ export function resolveRazorLanguageServerOptions(
     return {
         serverPath: languageServerExecutablePath,
         debug: debugLanguageServer,
-        logLevel: logLevel,
         outputChannel: logger.outputChannel,
         usingOmniSharp,
         forceRuntimeCodeGeneration,