Merge from vscode 718331d6f3ebd1b571530ab499edb266ddd493d5

src/vs/platform/log/browser/log.ts

@@ -0,0 +1,33 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { ILogService, DEFAULT_LOG_LEVEL, LogLevel, LogServiceAdapter } from 'vs/platform/log/common/log';
+
+interface IAutomatedWindow {
+	codeAutomationLog(type: string, args: any[]): void;
+}
+
+/**
+ * A logger that is used when VSCode is running in the web with
+ * an automation such as playwright. We expect a global codeAutomationLog
+ * to be defined that we can use to log to.
+ */
+export class ConsoleLogInAutomationService extends LogServiceAdapter implements ILogService {
+
+	declare codeAutomationLog: any;
+
+	_serviceBrand: undefined;
+
+	constructor(logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
+		super({ consoleLog: (type, args) => this.consoleLog(type, args) }, logLevel);
+	}
+
+	private consoleLog(type: string, args: any[]): void {
+		const automatedWindow = window as unknown as IAutomatedWindow;
+		if (typeof automatedWindow.codeAutomationLog === 'function') {
+			automatedWindow.codeAutomationLog(type, args);
+		}
+	}
+}

src/vs/platform/log/common/log.ts

@@ -213,48 +213,48 @@ export class ConsoleLogService extends AbstractLogService implements ILogService
 	}
 }
 
-export class ConsoleLogInMainService extends AbstractLogService implements ILogService {
+export class LogServiceAdapter extends AbstractLogService implements ILogService {
 
 	_serviceBrand: undefined;
 
-	constructor(private readonly client: LoggerChannelClient, logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
+	constructor(private readonly adapter: { consoleLog: (type: string, args: any[]) => void }, logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
 		super();
 		this.setLevel(logLevel);
 	}
 
 	trace(message: string, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Trace) {
-			this.client.consoleLog('trace', [this.extractMessage(message), ...args]);
+			this.adapter.consoleLog('trace', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	debug(message: string, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Debug) {
-			this.client.consoleLog('debug', [this.extractMessage(message), ...args]);
+			this.adapter.consoleLog('debug', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	info(message: string, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Info) {
-			this.client.consoleLog('info', [this.extractMessage(message), ...args]);
+			this.adapter.consoleLog('info', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	warn(message: string | Error, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Warning) {
-			this.client.consoleLog('warn', [this.extractMessage(message), ...args]);
+			this.adapter.consoleLog('warn', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	error(message: string | Error, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Error) {
-			this.client.consoleLog('error', [this.extractMessage(message), ...args]);
+			this.adapter.consoleLog('error', [this.extractMessage(message), ...args]);
 		}
 	}
 
 	critical(message: string | Error, ...args: any[]): void {
 		if (this.getLevel() <= LogLevel.Critical) {
-			this.client.consoleLog('critical', [this.extractMessage(message), ...args]);
+			this.adapter.consoleLog('critical', [this.extractMessage(message), ...args]);
 		}
 	}
 
@@ -275,6 +275,15 @@ export class ConsoleLogInMainService extends AbstractLogService implements ILogS
 	}
 }
 
+export class ConsoleLogInMainService extends LogServiceAdapter implements ILogService {
+
+	_serviceBrand: undefined;
+
+	constructor(client: LoggerChannelClient, logLevel: LogLevel = DEFAULT_LOG_LEVEL) {
+		super({ consoleLog: (type, args) => client.consoleLog(type, args) }, logLevel);
+	}
+}
+
 export class MultiplexLogService extends AbstractLogService implements ILogService {
 	_serviceBrand: undefined;
 

src/vs/platform/log/common/logIpc.ts

@@ -60,7 +60,11 @@ export class LoggerChannelClient {
 	}
 
 	setLevel(level: LogLevel): void {
-		this.channel.call('setLevel', level);
+		LoggerChannelClient.setLevel(this.channel, level);
+	}
+
+	public static setLevel(channel: IChannel, level: LogLevel): Promise<void> {
+		return channel.call('setLevel', level);
 	}
 
 	consoleLog(severity: string, args: string[]): void {