Add new MergedOutputChannel log

Author: JustinGrote

src/logging.ts

@@ -255,6 +255,20 @@ export class LanguageClientOutputChannelAdapter implements LogOutputChannel {
     // #endregion
 }
 
+/** Appends additional  */
+export class PsesMergedOutputChannel extends LanguageClientOutputChannelAdapter {
+    public override appendLine(message: string): void {
+        this.append(message);
+    }
+
+    public override append(message: string): void {
+        const [parsedMessage, level] = this.parse(message);
+
+        // Append PSES prefix to log messages to differentiate them from Client messages
+        this.sendLogMessage("[PSES] " + parsedMessage, level);
+    }
+}
+
 /** Overrides the severity of some LSP traces to be more logical */
 export class LanguageClientTraceFormatter extends LanguageClientOutputChannelAdapter {
     public override appendLine(message: string): void {

src/session.ts

@@ -6,7 +6,7 @@ import path = require("path");
 import vscode = require("vscode");
 import TelemetryReporter, { TelemetryEventProperties, TelemetryEventMeasurements } from "@vscode/extension-telemetry";
 import { Message, Trace } from "vscode-jsonrpc";
-import { ILogger, LanguageClientOutputChannelAdapter, LanguageClientTraceFormatter } from "./logging";
+import { ILogger, LanguageClientOutputChannelAdapter, LanguageClientTraceFormatter, PsesMergedOutputChannel } from "./logging";
 import { PowerShellProcess } from "./process";
 import { Settings, changeSetting, getSettings, getEffectiveConfigurationTarget, validateCwdSetting } from "./settings";
 import utils = require("./utils");
@@ -690,7 +690,7 @@ export class SessionManager implements Middleware {
             middleware: this,
             traceOutputChannel: new LanguageClientTraceFormatter("PowerShell: Trace LSP"),
             // This is named the same as the Client log to merge the logs, but will be handled and disposed separately.
-            outputChannel: new LanguageClientOutputChannelAdapter("PowerShell"),
+            outputChannel: new PsesMergedOutputChannel("PowerShell"),
             revealOutputChannelOn: RevealOutputChannelOn.Never
         };