Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 04:09:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #232864

Browse Source
This commit is contained in:
Sandeep Somavarapu
2025-12-19 18:50:25 +01:00
parent e94fb8bfc8
commit 8bb88a1697
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/vs/workbench/api/common/extHostOutput.ts
View File

@@ -105,6 +105,7 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
private readonly outputsLocation: URI; private readonly outputsLocation: URI;
private outputDirectoryPromise: Thenable<URI> | undefined; private outputDirectoryPromise: Thenable<URI> | undefined;
private readonly extensionLogDirectoryCreationPromise = new ResourceMap<Thenable<void>>(); private readonly extensionLogDirectoryCreationPromise = new ResourceMap<Thenable<void>>();
private readonly logOutputChannels = new ResourceMap<vscode.OutputChannel>();
private namePool: number = 1; private namePool: number = 1;
private readonly channels = new Map<string, ExtHostLogOutputChannel | ExtHostOutputChannel>(); private readonly channels = new Map<string, ExtHostLogOutputChannel | ExtHostOutputChannel>();
@@ -143,11 +144,16 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
const channelDisposables = new DisposableStore(); const channelDisposables = new DisposableStore();
let extHostOutputChannelPromise; let extHostOutputChannelPromise;
let logLevel = this.initData.environment.extensionLogLevel?.find(([identifier]) => ExtensionIdentifier.equals(extension.identifier, identifier))?.[1]; let logLevel = this.initData.environment.extensionLogLevel?.find(([identifier]) => ExtensionIdentifier.equals(extension.identifier, identifier))?.[1];
let logFile: URI | undefined;
if (log) { if (log) {
const extensionLogDirectory = this.extHostFileSystemInfo.extUri.joinPath(this.initData.logsLocation, extension.identifier.value); const extensionLogDirectory = this.extHostFileSystemInfo.extUri.joinPath(this.initData.logsLocation, extension.identifier.value);
const extensionLogFile = this.extHostFileSystemInfo.extUri.joinPath(extensionLogDirectory, `${name.replace(/[\\/:\*\?"<>\|]/g, '')}.log`); logFile = this.extHostFileSystemInfo.extUri.joinPath(extensionLogDirectory, `${name.replace(/[\\/:\*\?"<>\|]/g, '')}.log`);
logLevel = this.loggerService.getLogLevel(extensionLogFile) ?? logLevel; const existingOutputChannel = this.logOutputChannels.get(logFile);
extHostOutputChannelPromise = this.doCreateLogOutputChannel(name, extensionLogFile, logLevel, extension, channelDisposables); if (existingOutputChannel) {
return existingOutputChannel;
}
logLevel = this.loggerService.getLogLevel(logFile) ?? logLevel;
extHostOutputChannelPromise = this.doCreateLogOutputChannel(name, logFile, logLevel, extension, channelDisposables);
} else { } else {
extHostOutputChannelPromise = this.doCreateOutputChannel(name, languageId, extension, channelDisposables); extHostOutputChannelPromise = this.doCreateOutputChannel(name, languageId, extension, channelDisposables);
} }
@@ -155,11 +161,20 @@ export class ExtHostOutputService implements ExtHostOutputServiceShape {
extHostOutputChannelPromise.then(channel => { extHostOutputChannelPromise.then(channel => {
this.channels.set(channel.id, channel); this.channels.set(channel.id, channel);
channel.visible = channel.id === this.visibleChannelId; channel.visible = channel.id === this.visibleChannelId;
channelDisposables.add(toDisposable(() => this.channels.delete(channel.id))); channelDisposables.add(toDisposable(() => {
this.channels.delete(channel.id);
if (logFile) {
this.logOutputChannels.delete(logFile);
}
}));
}); });
return log
? this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), <Promise<ExtHostOutputChannel>>extHostOutputChannelPromise, channelDisposables) if (logFile) {
: this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannelPromise, channelDisposables); const logOutputChannel = this.createExtHostLogOutputChannel(name, logLevel ?? this.logService.getLevel(), <Promise<ExtHostOutputChannel>>extHostOutputChannelPromise, channelDisposables);
this.logOutputChannels.set(logFile, logOutputChannel);
return logOutputChannel;
}
return this.createExtHostOutputChannel(name, <Promise<ExtHostOutputChannel>>extHostOutputChannelPromise, channelDisposables);
} }
private async doCreateOutputChannel(name: string, languageId: string | undefined, extension: IExtensionDescription, channelDisposables: DisposableStore): Promise<ExtHostOutputChannel> { private async doCreateOutputChannel(name: string, languageId: string | undefined, extension: IExtensionDescription, channelDisposables: DisposableStore): Promise<ExtHostOutputChannel> {