Upgrade the LSP client library for better logging support

10.0.0-next.15 brings full support for LogOutputChannels which cleans
up the logging of severities and timestamps. Otherwise we end up with
confusing duplicate severities being listed with duplicate timestamps.

Author: jasonmalinowski

package-lock.json

@@ -117,8 +117,8 @@
     "tmp": "0.0.33",
     "uuid": "^9.0.0",
     "vscode-html-languageservice": "^5.3.1",
-    "vscode-jsonrpc": "9.0.0-next.7",
-    "vscode-languageclient": "10.0.0-next.14",
+    "vscode-jsonrpc": "9.0.0-next.8",
+    "vscode-languageclient": "10.0.0-next.15",
     "vscode-languageserver-protocol": "3.17.6-next.12",
     "vscode-languageserver-textdocument": "1.0.12",
     "vscode-languageserver-types": "3.17.6-next.6",

package.json

@@ -33,7 +33,7 @@ import { RazorLogger } from '../razor/src/razorLogger';
 import { registerRazorEndpoints } from './razor/razorEndpoints';
 
 let _channel: vscode.LogOutputChannel;
-let _traceChannel: vscode.OutputChannel;
+let _traceChannel: vscode.LogOutputChannel;
 
 /**
  * Creates and activates the Roslyn language server.
@@ -51,8 +51,7 @@ export async function activateRoslynLanguageServer(
     // Create a channel for outputting general logs from the language server.
     _channel = outputChannel;
     // Create a separate channel for outputting trace logs - these are incredibly verbose and make other logs very difficult to see.
-    // The trace channel verbosity is controlled by the _channel verbosity.
-    _traceChannel = vscode.window.createOutputChannel(vscode.l10n.t('C# LSP Trace Logs'));
+    _traceChannel = vscode.window.createOutputChannel(vscode.l10n.t('C# LSP Trace Logs'), { log: true });
 
     reporter.sendTelemetryEvent(TelemetryEventNames.ClientInitialize);
 

src/lsptoolshost/activate.ts

@@ -260,7 +260,7 @@ export class RoslynLanguageServer {
         additionalExtensionPaths: string[],
         languageServerEvents: RoslynLanguageServerEvents,
         channel: vscode.LogOutputChannel,
-        traceChannel: vscode.OutputChannel
+        traceChannel: vscode.LogOutputChannel
     ): Promise<RoslynLanguageServer> {
         const devKit = getCSharpDevKit();
         if (devKit) {

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -13,7 +13,7 @@ import * as ObservableEvents from '../omnisharpLoggingEvents';
 import { EventStream } from '../../eventStream';
 import CompositeDisposable from '../../compositeDisposable';
 import Disposable from '../../disposable';
-import { ExtensionContext, CancellationTokenSource, OutputChannel, Location, CodeLens, Uri } from 'vscode';
+import { ExtensionContext, CancellationTokenSource, LogOutputChannel, Location, CodeLens, Uri } from 'vscode';
 import { LanguageMiddlewareFeature } from '../languageMiddlewareFeature';
 import { Events, OmniSharpServer } from '../server';
 import { IEngine } from './IEngine';
@@ -42,7 +42,7 @@ export class LspEngine implements IEngine {
         private eventBus: EventEmitter,
         private eventStream: EventStream,
         private context: ExtensionContext,
-        private outputChannel: OutputChannel,
+        private outputChannel: LogOutputChannel,
         private disposables: CompositeDisposable,
         private languageMiddlewareFeature: LanguageMiddlewareFeature,
         private platformInfo: PlatformInformation,

src/omnisharp/engines/lspEngine.ts

@@ -89,7 +89,13 @@ export async function activateOmniSharpLanguageServer(
     eventStream.subscribe(dotnetTestChannelObserver.post);
     eventStream.subscribe(dotnetTestLoggerObserver.post);
 
-    const omnisharpChannel = vscode.window.createOutputChannel(vscode.l10n.t('OmniSharp Log'));
+    // If we're in LSP mode, we can create a LogOutputChannel since that's what the LSP client now supports.
+    // If we're not in LSP mode, we'll create a regular OutputChannel since the log formatting expects to be able to write
+    // it's own formatted outputs which gets mixed up with LogOutputChannels.s
+    const omnisharpChannel = omnisharpOptions.enableLspDriver
+        ? vscode.window.createOutputChannel(vscode.l10n.t('OmniSharp Log'), { log: true })
+        : vscode.window.createOutputChannel(vscode.l10n.t('OmniSharp Log'));
+
     const omnisharpLogObserver = new OmnisharpLoggerObserver(omnisharpChannel, platformInfo);
     const omnisharpChannelObserver = new OmnisharpChannelObserver(omnisharpChannel);
     eventStream.subscribe(omnisharpLogObserver.post);

src/omnisharp/omnisharpLanguageServer.ts

@@ -21,7 +21,7 @@ import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import CompositeDisposable from '../compositeDisposable';
 import Disposable from '../disposable';
-import { ExtensionContext, OutputChannel } from 'vscode';
+import { ExtensionContext, LogOutputChannel, OutputChannel } from 'vscode';
 import { LanguageMiddlewareFeature } from './languageMiddlewareFeature';
 import { LspEngine } from './engines/lspEngine';
 import { IEngine } from './engines/IEngine';
@@ -314,7 +314,8 @@ export class OmniSharpServer {
                 this._eventBus,
                 this.eventStream,
                 this.context,
-                this.outputChannel,
+                // If we are in LSP mode, then we created an LogOutputChannel originally
+                this.outputChannel as LogOutputChannel,
                 disposables,
                 this.languageMiddlewareFeature,
                 this.platformInfo,

src/omnisharp/server.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 
 export interface RazorLanguageServerOptions {
     serverPath: string;
-    outputChannel?: vscode.OutputChannel;
+    outputChannel?: vscode.LogOutputChannel;
     debug?: boolean;
     usingOmniSharp: boolean;
     forceRuntimeCodeGeneration: boolean;