@codingame/monaco-vscode-log-service-override 10.1.4 → 11.0.0

package/override/vs/workbench/browser/web.main.js

@@ -1,5 +1,5 @@
 import { localize } from 'vscode/vscode/vs/nls';
 
-const rendererLogLabel = ( localize(3220, 'Window'));
+const rendererLogLabel = ( localize(2737, 'Window'));
 
 export { rendererLogLabel };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-log-service-override",
-  "version": "10.1.4",
+  "version": "11.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4",
-    "@codingame/monaco-vscode-environment-service-override": "10.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "11.0.0"
   }
 }

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

@@ -6,7 +6,7 @@ import { toFileOperationResult } from 'vscode/vscode/vs/platform/files/common/fi
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IJSONEditingService } from 'vscode/vscode/vs/workbench/services/configuration/common/jsonEditing.service';
 import { isUndefined, isString } from 'vscode/vscode/vs/base/common/types';
-import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from '@codingame/monaco-vscode-environment-service-override/vscode/vs/platform/environment/common/environmentService';
+import { EXTENSION_IDENTIFIER_WITH_LOG_REGEX } from 'vscode/vscode/vs/platform/environment/common/environmentService';
 import { parse } from 'vscode/vscode/vs/base/common/json';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';

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

@@ -3,7 +3,7 @@ import { localize2, localize } 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 as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
@@ -41,7 +41,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.setDefaultLogLevel',
-            title: ( localize2(3221, "Set Default Log Level")),
+            title: ( localize2(2738, "Set Default Log Level")),
             category: Categories.Developer,
         });
     }
@@ -147,7 +147,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
                 }
                 const hasToAppendRemote = existingChannel && logger.resource.scheme === Schemas.vscodeRemote;
                 const id = hasToAppendRemote ? `${logger.id}.remote` : logger.id;
-                const label = hasToAppendRemote ? ( localize(3222, "{0} (Remote)", logger.name ?? logger.id)) : logger.name ?? logger.id;
+                const label = hasToAppendRemote ? ( localize(2739, "{0} (Remote)", logger.name ?? logger.id)) : logger.name ?? logger.id;
                 this.outputChannelRegistry.registerChannel({ id, label, file: logger.resource, log: true, extensionId: logger.extensionId });
                 disposables.add(toDisposable(() => this.outputChannelRegistry.removeChannel(id)));
                 if (remoteLogger) {
@@ -186,7 +186,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             constructor() {
                 super({
                     id: showWindowLogActionId,
-                    title: ( localize2(3223, "Show Window Log")),
+                    title: ( localize2(2740, "Show Window Log")),
                     category: Categories.Developer,
                     f1: true
                 });

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

@@ -1,206 +0,0 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2, localize } from 'vscode/vscode/vs/nls';
-import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { isLogLevel, LogLevel, LogLevelToLocalizedString } from 'vscode/vscode/vs/platform/log/common/log';
-import { ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { basename, dirname, isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output.service';
-import { telemetryLogId, extensionTelemetryLogChannelId } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { IDefaultLogLevelsService } from 'vscode/vscode/vs/workbench/contrib/logs/common/defaultLogLevels.service';
-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';
-
-var SetLogLevelAction_1;
-let SetLogLevelAction = class SetLogLevelAction extends Action {
-    static { SetLogLevelAction_1 = this; }
-    static { this.ID = 'workbench.action.setLogLevel'; }
-    static { this.TITLE = ( localize2(6168, "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 (!SetLogLevelAction_1.isLevelSettable(channel) || !channel.file) {
-                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: ( localize(6169, "All")) });
-        entries.push(...this.getLogLevelEntries(defaultLogLevels.default, this.loggerService.getLogLevel(), true));
-        if (extensionLogs.length) {
-            entries.push({ type: 'separator', label: ( localize(6170, "Extension Logs")) });
-            entries.push(...extensionLogs.sort((a, b) => a.label.localeCompare(b.label)));
-        }
-        entries.push({ type: 'separator', label: ( localize(6171, "Logs")) });
-        entries.push(...logs.sort((a, b) => a.label.localeCompare(b.label)));
-        return (
-             (new Promise((resolve, reject) => {
-                const disposables = ( (new DisposableStore()));
-                const quickPick = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
-                quickPick.placeholder = ( localize(6172, "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();
-            }))
-        );
-    }
-    static isLevelSettable(channel) {
-        return channel.log && channel.file !== undefined && channel.id !== telemetryLogId && channel.id !== extensionTelemetryLogChannelId;
-    }
-    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 = disposables.add(this.quickInputService.createQuickPick());
-                quickPick.placeholder = logChannel ? ( localize(6173, " {0}: Select log level", logChannel?.label)) : ( localize(6174, "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: ( localize(6175, "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) {
-        const label = LogLevelToLocalizedString(level).value;
-        return level === current ? `$(check) ${label}` : label;
-    }
-    getDescription(level, defaultLogLevel) {
-        return defaultLogLevel === level ? ( localize(6176, "Default")) : undefined;
-    }
-};
-SetLogLevelAction = SetLogLevelAction_1 = ( (__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 = ( localize2(6177, "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 ? ( localize(6178, "Current")) : undefined
-        }))))), {
-            canPickMany: false,
-            placeHolder: ( localize(6179, "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: ( localize(6180, "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 };