@codingame/monaco-vscode-log-service-override 3.2.2 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-log-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2",
-    "@codingame/monaco-vscode-environment-service-override": "3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "4.0.0"
   }
 }

package/vscode/src/vs/workbench/contrib/logs/common/logs.contribution.js

@@ -3,7 +3,7 @@ import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { SetLogLevelAction } from './logsActions.js';
+import { SetLogLevelAction } from 'vscode/vscode/vs/workbench/contrib/logs/common/logsActions';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { whenProviderRegistered, IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { Extensions as Extensions$1, IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output';
@@ -187,7 +187,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
         await this.whenFileExists(file, trial + 1, token);
     }
     registerShowWindowLogAction() {
-        registerAction2(class ShowWindowLogAction extends Action2 {
+        this._register(registerAction2(class ShowWindowLogAction extends Action2 {
             constructor() {
                 super({
                     id: showWindowLogActionId,
@@ -204,7 +204,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
                 const outputService = servicesAccessor.get(IOutputService);
                 outputService.showChannel(windowLogId);
             }
-        });
+        }));
     }
 };
 LogOutputChannels = ( __decorate([

package/vscode/src/vs/workbench/contrib/logs/common/logsActions.js

@@ -1,250 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
-import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { isLogLevel, LogLevel, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { basename, dirname, isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output';
-import { telemetryLogId, extensionTelemetryLogChannelId } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { IDefaultLogLevelsService } from 'vscode/vscode/vs/workbench/contrib/logs/common/defaultLogLevels';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-
-let SetLogLevelAction = class SetLogLevelAction extends Action {
-    static { this.ID = 'workbench.action.setLogLevel'; }
-    static { this.TITLE = ( localize2WithPath(
-        'vs/workbench/contrib/logs/common/logsActions',
-        'setLogLevel',
-        "Set Log Level..."
-    )); }
-    constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
-        super(id, label);
-        this.quickInputService = quickInputService;
-        this.loggerService = loggerService;
-        this.outputService = outputService;
-        this.defaultLogLevelsService = defaultLogLevelsService;
-    }
-    async run() {
-        const logLevelOrChannel = await this.selectLogLevelOrChannel();
-        if (logLevelOrChannel !== null) {
-            if (isLogLevel(logLevelOrChannel)) {
-                this.loggerService.setLogLevel(logLevelOrChannel);
-            }
-            else {
-                await this.setLogLevelForChannel(logLevelOrChannel);
-            }
-        }
-    }
-    async selectLogLevelOrChannel() {
-        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
-        const extensionLogs = [], logs = [];
-        const logLevel = this.loggerService.getLogLevel();
-        for (const channel of this.outputService.getChannelDescriptors()) {
-            if (!channel.log || !channel.file || channel.id === telemetryLogId || channel.id === extensionTelemetryLogChannelId) {
-                continue;
-            }
-            const channelLogLevel = this.loggerService.getLogLevel(channel.file) ?? logLevel;
-            const item = { id: channel.id, resource: channel.file, label: channel.label, description: channelLogLevel !== logLevel ? this.getLabel(channelLogLevel) : undefined, extensionId: channel.extensionId };
-            if (channel.extensionId) {
-                extensionLogs.push(item);
-            }
-            else {
-                logs.push(item);
-            }
-        }
-        const entries = [];
-        entries.push({ type: 'separator', label: ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'all', "All")) });
-        entries.push(...this.getLogLevelEntries(defaultLogLevels.default, this.loggerService.getLogLevel(), true));
-        if (extensionLogs.length) {
-            entries.push({ type: 'separator', label: ( localizeWithPath(
-                'vs/workbench/contrib/logs/common/logsActions',
-                'extensionLogs',
-                "Extension Logs"
-            )) });
-            entries.push(...extensionLogs.sort((a, b) => a.label.localeCompare(b.label)));
-        }
-        entries.push({ type: 'separator', label: ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'loggers', "Logs")) });
-        entries.push(...logs.sort((a, b) => a.label.localeCompare(b.label)));
-        return ( new Promise((resolve, reject) => {
-            const disposables = ( new DisposableStore());
-            const quickPick = this.quickInputService.createQuickPick();
-            quickPick.placeholder = ( localizeWithPath(
-                'vs/workbench/contrib/logs/common/logsActions',
-                'selectlog',
-                "Set Log Level"
-            ));
-            quickPick.items = entries;
-            let selectedItem;
-            disposables.add(quickPick.onDidTriggerItemButton(e => {
-                quickPick.hide();
-                this.defaultLogLevelsService.setDefaultLogLevel(e.item.level);
-            }));
-            disposables.add(quickPick.onDidAccept(e => {
-                selectedItem = quickPick.selectedItems[0];
-                quickPick.hide();
-            }));
-            disposables.add(quickPick.onDidHide(() => {
-                const result = selectedItem ? selectedItem.level ?? selectedItem : null;
-                disposables.dispose();
-                resolve(result);
-            }));
-            quickPick.show();
-        }));
-    }
-    async setLogLevelForChannel(logChannel) {
-        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
-        const defaultLogLevel = defaultLogLevels.extensions.find(e => e[0] === logChannel.extensionId?.toLowerCase())?.[1] ?? defaultLogLevels.default;
-        const currentLogLevel = this.loggerService.getLogLevel(logChannel.resource) ?? defaultLogLevel;
-        const entries = this.getLogLevelEntries(defaultLogLevel, currentLogLevel, !!logChannel.extensionId);
-        return ( new Promise((resolve, reject) => {
-            const disposables = ( new DisposableStore());
-            const quickPick = this.quickInputService.createQuickPick();
-            quickPick.placeholder = logChannel ? ( localizeWithPath(
-                'vs/workbench/contrib/logs/common/logsActions',
-                'selectLogLevelFor',
-                " {0}: Select log level",
-                logChannel?.label
-            )) : ( localizeWithPath(
-                'vs/workbench/contrib/logs/common/logsActions',
-                'selectLogLevel',
-                "Select log level"
-            ));
-            quickPick.items = entries;
-            quickPick.activeItems = entries.filter((entry) => entry.level === this.loggerService.getLogLevel());
-            let selectedItem;
-            disposables.add(quickPick.onDidTriggerItemButton(e => {
-                quickPick.hide();
-                this.defaultLogLevelsService.setDefaultLogLevel(e.item.level, logChannel.extensionId);
-            }));
-            disposables.add(quickPick.onDidAccept(e => {
-                selectedItem = quickPick.selectedItems[0];
-                quickPick.hide();
-            }));
-            disposables.add(quickPick.onDidHide(() => {
-                if (selectedItem) {
-                    this.loggerService.setLogLevel(logChannel.resource, selectedItem.level);
-                }
-                disposables.dispose();
-                resolve();
-            }));
-            quickPick.show();
-        }));
-    }
-    getLogLevelEntries(defaultLogLevel, currentLogLevel, canSetDefaultLogLevel) {
-        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localizeWithPath(
-            'vs/workbench/contrib/logs/common/logsActions',
-            'resetLogLevel',
-            "Set as Default Log Level"
-        )) } : undefined;
-        return [
-            { label: this.getLabel(LogLevel.Trace, currentLogLevel), level: LogLevel.Trace, description: this.getDescription(LogLevel.Trace, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Trace ? [button] : undefined },
-            { label: this.getLabel(LogLevel.Debug, currentLogLevel), level: LogLevel.Debug, description: this.getDescription(LogLevel.Debug, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Debug ? [button] : undefined },
-            { label: this.getLabel(LogLevel.Info, currentLogLevel), level: LogLevel.Info, description: this.getDescription(LogLevel.Info, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Info ? [button] : undefined },
-            { label: this.getLabel(LogLevel.Warning, currentLogLevel), level: LogLevel.Warning, description: this.getDescription(LogLevel.Warning, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Warning ? [button] : undefined },
-            { label: this.getLabel(LogLevel.Error, currentLogLevel), level: LogLevel.Error, description: this.getDescription(LogLevel.Error, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Error ? [button] : undefined },
-            { label: this.getLabel(LogLevel.Off, currentLogLevel), level: LogLevel.Off, description: this.getDescription(LogLevel.Off, defaultLogLevel), buttons: button && defaultLogLevel !== LogLevel.Off ? [button] : undefined },
-        ];
-    }
-    getLabel(level, current) {
-        let label;
-        switch (level) {
-            case LogLevel.Trace:
-                label = ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'trace', "Trace"));
-                break;
-            case LogLevel.Debug:
-                label = ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'debug', "Debug"));
-                break;
-            case LogLevel.Info:
-                label = ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'info', "Info"));
-                break;
-            case LogLevel.Warning:
-                label = ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'warn', "Warning"));
-                break;
-            case LogLevel.Error:
-                label = ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'err', "Error"));
-                break;
-            case LogLevel.Off:
-                label = ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'off', "Off"));
-                break;
-        }
-        return level === current ? `$(check) ${label}` : label;
-    }
-    getDescription(level, defaultLogLevel) {
-        return defaultLogLevel === level ? ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'default', "Default")) : undefined;
-    }
-};
-SetLogLevelAction = ( __decorate([
-    ( __param(2, IQuickInputService)),
-    ( __param(3, ILoggerService)),
-    ( __param(4, IOutputService)),
-    ( __param(5, IDefaultLogLevelsService))
-], SetLogLevelAction));
-(class OpenWindowSessionLogFileAction extends Action {
-    static { this.ID = 'workbench.action.openSessionLogFile'; }
-    static { this.TITLE = ( localize2WithPath(
-        'vs/workbench/contrib/logs/common/logsActions',
-        'openSessionLogFile',
-        "Open Window Log File (Session)..."
-    )); }
-    constructor(id, label, environmentService, fileService, quickInputService, editorService) {
-        super(id, label);
-        this.environmentService = environmentService;
-        this.fileService = fileService;
-        this.quickInputService = quickInputService;
-        this.editorService = editorService;
-    }
-    async run() {
-        const sessionResult = await this.quickInputService.pick(this.getSessions().then(sessions => ( sessions.map((s, index) => ({
-            id: ( s.toString()),
-            label: basename(s),
-            description: index === 0 ? ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'current', "Current")) : undefined
-        })))), {
-            canPickMany: false,
-            placeHolder: ( localizeWithPath(
-                'vs/workbench/contrib/logs/common/logsActions',
-                'sessions placeholder',
-                "Select Session"
-            ))
-        });
-        if (sessionResult) {
-            const logFileResult = await this.quickInputService.pick(this.getLogFiles(( URI.parse(sessionResult.id))).then(logFiles => ( logFiles.map(s => ({
-                id: ( s.toString()),
-                label: basename(s)
-            })))), {
-                canPickMany: false,
-                placeHolder: ( localizeWithPath(
-                    'vs/workbench/contrib/logs/common/logsActions',
-                    'log placeholder',
-                    "Select Log file"
-                ))
-            });
-            if (logFileResult) {
-                return this.editorService.openEditor({ resource: ( URI.parse(logFileResult.id)), options: { pinned: true } }).then(() => undefined);
-            }
-        }
-    }
-    async getSessions() {
-        const logsPath = this.environmentService.logsHome.with({ scheme: this.environmentService.logFile.scheme });
-        const result = [logsPath];
-        const stat = await this.fileService.resolve(dirname(logsPath));
-        if (stat.children) {
-            result.push(...( stat.children
-                .filter(stat => !isEqual(stat.resource, logsPath) && stat.isDirectory && /^\d{8}T\d{6}$/.test(stat.name))
-                .sort()
-                .reverse()
-                .map(d => d.resource)));
-        }
-        return result;
-    }
-    async getLogFiles(session) {
-        const stat = await this.fileService.resolve(session);
-        if (stat.children) {
-            return ( stat.children.filter(stat => !stat.isDirectory).map(stat => stat.resource));
-        }
-        return [];
-    }
-});
-
-export { SetLogLevelAction };