rawLog option for OutputChannel to colourise the Ark log

extensions/jupyter-adapter/src/JupyterKernel.ts

@@ -299,7 +299,8 @@ export class JupyterKernel extends EventEmitter implements vscode.Disposable {
 			// Establish a log channel for the kernel we're connecting to, if we
 			// don't already have one (we will if we're restarting)
 			if (!this._logChannel) {
-				this._logChannel = vscode.window.createOutputChannel(`Runtime: ${this._spec.display_name}`);
+				// @ts-ignore - Hidden API entry
+				this._logChannel = vscode.window.createRawLogOutputChannel(`Runtime: ${this._spec.display_name}`);
 			}
 
 			// Bind to the Jupyter session
@@ -322,7 +323,7 @@ export class JupyterKernel extends EventEmitter implements vscode.Disposable {
 			// file.
 			const logFilePath = this._session!.state.logFile;
 			if (fs.existsSync(logFilePath)) {
-				this.streamLogFileToChannel(logFilePath, this._spec.language, this._logChannel);
+				this.streamLogFileToChannel(logFilePath, this._spec.language, this._logChannel!);
 			}
 
 			// Connect to the kernel's sockets; wait for all sockets to connect before continuing

src/vs/platform/log/node/spdlogLog.ts

@@ -101,6 +101,15 @@ export class SpdLogLogger extends AbstractMessageLogger implements ILogger {
 		}
 	}
 
+	// --- Start Positron ---
+	// Override pattern to avoid adding timestamps etc
+	public setRawLogger() {
+		this._loggerCreationPromise.then(() => {
+			this._logger!.setPattern('%v');
+		});
+	}
+	// --- End Positron ---
+
 	protected log(level: LogLevel, message: string): void {
 		if (this._logger) {
 			log(this._logger, level, message);

src/vs/workbench/api/common/extHost.api.impl.ts

@@ -762,6 +762,13 @@ export function createApiFactoryAndRegisterActors(accessor: ServicesAccessor): I
 			createOutputChannel(name: string, options: string | { log: true } | undefined): any {
 				return extHostOutputService.createOutputChannel(name, options, extension);
 			},
+			// --- Start Positron ---
+			// This is a hidden API entry, don't expect it in the public `vscode.window`
+			// @ts-ignore
+			createRawLogOutputChannel(name: string): any {
+				return extHostOutputService.createRawLogOutputChannel(name, extension);
+			},
+			// --- End Positron ---
 			createWebviewPanel(viewType: string, title: string, showOptions: vscode.ViewColumn | { viewColumn: vscode.ViewColumn; preserveFocus?: boolean }, options?: vscode.WebviewPanelOptions & vscode.WebviewOptions): vscode.WebviewPanel {
 				return extHostWebviewPanels.createWebviewPanel(extension, viewType, title, showOptions, options);
 			},

src/vs/workbench/api/common/extHostOutput.ts

@@ -41,6 +41,15 @@ class ExtHostOutputChannel extends AbstractMessageLogger implements vscode.LogOu
 		this._register(logger.onDidChangeLogLevel(level => this.setLevel(level)));
 	}
 
+	// --- Start Positron ---
+	public setRawLogger() {
+		let loggerUnchecked = this.logger as any;
+		if (loggerUnchecked.setRawLogger) {
+			loggerUnchecked.setRawLogger();
+		};
+	}
+	// --- End Positron ---
+
 	get logLevel(): LogLevel {
 		return this.getLevel();
 	}
@@ -161,6 +170,24 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 		return log ? this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), <Promise<ExtHostOutputChannel>>extHostOutputChannel) : this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannel);
 	}
 
+	// --- Start Positron ---
+	// Variant of createOutputChannel() that creates a "raw log" output channel.
+	// Compared to a normal `LogOutputChannel`, this doesn't add timestamps or info
+	// level. It's meant for extensions that create fully formed log lines but still
+	// want to benefit from the colourised rendering of log output channels.
+	createRawLogOutputChannel(name: string, extension: IExtensionDescription): vscode.OutputChannel {
+		const channel = this.createOutputChannel(name, { log: true }, extension);
+
+		// Set our custom raw log
+		const channelUnchecked = channel as any
+		if (channelUnchecked.setRawLogger) {
+			channelUnchecked.setRawLogger();
+		}
+
+		return channel;
+	}
+	// --- End Positron ---
+
 	private async doCreateOutputChannel(name: string, languageId: string | undefined, extension: IExtensionDescription): Promise<ExtHostOutputChannel> {
 		if (!this.outputDirectoryPromise) {
 			this.outputDirectoryPromise = this.extHostFileSystem.value.createDirectory(this.outputsLocation).then(() => this.outputsLocation);
@@ -216,6 +243,13 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
 				validate();
 				channelPromise.then(channel => channel.appendLine(value));
 			},
+			// --- Start Positron ---
+			// @ts-ignore
+			setRawLogger(): void {
+				validate();
+				channelPromise.then(channel => channel.setRawLogger());
+			},
+			// --- End Positron ---
 			clear(): void {
 				validate();
 				channelPromise.then(channel => channel.clear());