@codingame/monaco-vscode-log-service-override 4.5.1 → 4.5.2

package/log.js

@@ -7,7 +7,6 @@ import { ILoggerService, ILogService } from 'vscode/vscode/vs/platform/log/commo
 import { FileLoggerService } from './vscode/src/vs/platform/log/common/fileLog.js';
 import { LogService } from 'vscode/vscode/vs/platform/log/common/logService';
 import { IEnvironmentService } from 'vscode/vscode/vs/platform/environment/common/environment.service';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { windowLogId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -16,6 +15,7 @@ import { IDefaultLogLevelsService } from 'vscode/vscode/vs/workbench/contrib/log
 import getServiceOverride$1 from '@codingame/monaco-vscode-environment-service-override';
 import { logsPath } from 'vscode/workbench';
 import { checkServicesNotInitialized } from 'vscode/lifecycle';
+import { rendererLogLabel } from './override/vs/workbench/browser/web.main.js';
 import './vscode/src/vs/workbench/contrib/logs/common/logs.contribution.js';
 
 let _FileLoggerService = class _FileLoggerService extends FileLoggerService {
@@ -30,7 +30,7 @@ _FileLoggerService = __decorate([
 const otherLoggers = [];
 let _LogService = class _LogService extends LogService {
     constructor(loggerService, environmentService) {
-        const logger = loggerService.createLogger(environmentService.logFile, { id: windowLogId, name: ( localizeWithPath('vs/workbench/browser/web.main', 'rendererLog', 'Window')) });
+        const logger = loggerService.createLogger(environmentService.logFile, { id: windowLogId, name: rendererLogLabel });
         super(logger, otherLoggers);
     }
 };

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

@@ -0,0 +1,6 @@
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+
+const _moduleId = 'vs/workbench/browser/web.main';
+const rendererLogLabel = ( localizeWithPath(_moduleId, 0, 'Window'));
+
+export { rendererLogLabel };

package/package.json

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

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

@@ -24,6 +24,7 @@ import { CounterSet } from 'vscode/vscode/vs/base/common/map';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 
+const _moduleId = "vs/workbench/contrib/logs/common/logs.contribution";
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -41,11 +42,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.setDefaultLogLevel',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/logs/common/logs.contribution',
-                'setDefaultLogLevel',
-                "Set Default Log Level"
-            )),
+            title: ( localize2WithPath(_moduleId, 0, "Set Default Log Level")),
             category: Categories.Developer,
         });
     }
@@ -61,9 +58,9 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
         this.contextKeyService = contextKeyService;
         this.fileService = fileService;
         this.uriIdentityService = uriIdentityService;
-        this.contextKeys = ( new CounterSet());
-        this.outputChannelRegistry = ( Registry.as(Extensions.OutputChannels));
-        this.loggerDisposables = this._register(( new DisposableMap()));
+        this.contextKeys = ( (new CounterSet()));
+        this.outputChannelRegistry = ( (Registry.as(Extensions.OutputChannels)));
+        this.loggerDisposables = this._register(( (new DisposableMap())));
         const contextKey = CONTEXT_LOG_LEVEL.bindTo(contextKeyService);
         contextKey.set(LogLevelToString(loggerService.getLogLevel()));
         loggerService.onDidChangeLogLevel(e => {
@@ -95,7 +92,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             if (logger.when) {
                 const contextKeyExpr = ContextKeyExpr.deserialize(logger.when);
                 if (contextKeyExpr) {
-                    for (const key of ( contextKeyExpr.keys())) {
+                    for (const key of ( (contextKeyExpr.keys()))) {
                         this.contextKeys.add(key);
                     }
                     if (!this.contextKeyService.contextMatchesRules(contextKeyExpr)) {
@@ -126,7 +123,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             if (logger.when) {
                 const contextKeyExpr = ContextKeyExpr.deserialize(logger.when);
                 if (contextKeyExpr) {
-                    for (const key of ( contextKeyExpr.keys())) {
+                    for (const key of ( (contextKeyExpr.keys()))) {
                         this.contextKeys.delete(key);
                     }
                 }
@@ -139,7 +136,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
         if (channel && this.uriIdentityService.extUri.isEqual(channel.file, logger.resource)) {
             return;
         }
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         const promise = createCancelablePromise(async (token) => {
             await whenProviderRegistered(logger.resource, this.fileService);
             try {
@@ -151,12 +148,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 ? ( localizeWithPath(
-                    'vs/workbench/contrib/logs/common/logs.contribution',
-                    'remote name',
-                    "{0} (Remote)",
-                    logger.name ?? logger.id
-                )) : logger.name ?? logger.id;
+                const label = hasToAppendRemote ? ( localizeWithPath(_moduleId, 1, "{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) {
@@ -165,15 +157,15 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             }
             catch (error) {
                 if (!isCancellationError(error)) {
-                    this.logService.error('Error while registering log channel', ( logger.resource.toString()), getErrorMessage(error));
+                    this.logService.error('Error while registering log channel', ( (logger.resource.toString())), getErrorMessage(error));
                 }
             }
         });
         disposables.add(toDisposable(() => promise.cancel()));
-        this.loggerDisposables.set(( logger.resource.toString()), disposables);
+        this.loggerDisposables.set(( (logger.resource.toString())), disposables);
     }
     deregisterLogChannel(logger) {
-        this.loggerDisposables.deleteAndDispose(( logger.resource.toString()));
+        this.loggerDisposables.deleteAndDispose(( (logger.resource.toString())));
     }
     async whenFileExists(file, trial, token) {
         const exists = await this.fileService.exists(file);
@@ -181,12 +173,12 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             return;
         }
         if (token.isCancellationRequested) {
-            throw new CancellationError();
+            throw ( (new CancellationError()));
         }
         if (trial > 10) {
-            throw new Error(`Timed out while waiting for file to be created`);
+            throw ( (new Error(`Timed out while waiting for file to be created`)));
         }
-        this.logService.debug(`[Registering Log Channel] File does not exist. Waiting for 1s to retry.`, ( file.toString()));
+        this.logService.debug(`[Registering Log Channel] File does not exist. Waiting for 1s to retry.`, ( (file.toString())));
         await timeout(1000, token);
         await this.whenFileExists(file, trial + 1, token);
     }
@@ -195,11 +187,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             constructor() {
                 super({
                     id: showWindowLogActionId,
-                    title: ( localize2WithPath(
-                        'vs/workbench/contrib/logs/common/logs.contribution',
-                        'show window log',
-                        "Show Window Log"
-                    )),
+                    title: ( localize2WithPath(_moduleId, 2, "Show Window Log")),
                     category: Categories.Developer,
                     f1: true
                 });
@@ -211,20 +199,20 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
         }));
     }
 };
-LogOutputChannels = ( __decorate([
-    ( __param(0, ILogService)),
-    ( __param(1, ILoggerService)),
-    ( __param(2, IContextKeyService)),
-    ( __param(3, IFileService)),
-    ( __param(4, IUriIdentityService))
-], LogOutputChannels));
+LogOutputChannels = ( (__decorate([
+    ( (__param(0, ILogService))),
+    ( (__param(1, ILoggerService))),
+    ( (__param(2, IContextKeyService))),
+    ( (__param(3, IFileService))),
+    ( (__param(4, IUriIdentityService)))
+], LogOutputChannels)));
 let LogLevelMigration = class LogLevelMigration {
     constructor(defaultLogLevelsService) {
         defaultLogLevelsService.migrateLogLevels();
     }
 };
-LogLevelMigration = ( __decorate([
-    ( __param(0, IDefaultLogLevelsService))
-], LogLevelMigration));
-( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(LogOutputChannels, 3 );
-( Registry.as(Extensions$1.Workbench)).registerWorkbenchContribution(LogLevelMigration, 4 );
+LogLevelMigration = ( (__decorate([
+    ( (__param(0, IDefaultLogLevelsService)))
+], LogLevelMigration)));
+( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogOutputChannels, 3 );
+( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogLevelMigration, 4 );

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

@@ -15,14 +15,11 @@ import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
 var SetLogLevelAction_1;
+const _moduleId = "vs/workbench/contrib/logs/common/logsActions";
 let SetLogLevelAction = class SetLogLevelAction extends Action {
     static { SetLogLevelAction_1 = this; }
     static { this.ID = 'workbench.action.setLogLevel'; }
-    static { this.TITLE = ( localize2WithPath(
-        'vs/workbench/contrib/logs/common/logsActions',
-        'setLogLevel',
-        "Set Log Level..."
-    )); }
+    static { this.TITLE = ( localize2WithPath(_moduleId, 0, "Set Log Level...")); }
     constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
         super(id, label);
         this.quickInputService = quickInputService;
@@ -59,43 +56,37 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
             }
         }
         const entries = [];
-        entries.push({ type: 'separator', label: ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'all', "All")) });
+        entries.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "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({ type: 'separator', label: ( localizeWithPath(_moduleId, 2, "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({ type: 'separator', label: ( localizeWithPath(_moduleId, 3, "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();
-        }));
+        return (
+             (new Promise((resolve, reject) => {
+                const disposables = ( (new DisposableStore()));
+                const quickPick = this.quickInputService.createQuickPick();
+                quickPick.placeholder = ( localizeWithPath(_moduleId, 4, "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;
@@ -105,46 +96,35 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         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();
-        }));
+        return (
+             (new Promise((resolve, reject) => {
+                const disposables = ( (new DisposableStore()));
+                const quickPick = this.quickInputService.createQuickPick();
+                quickPick.placeholder = logChannel ? ( localizeWithPath(_moduleId, 5, " {0}: Select log level", logChannel?.label)) : ( localizeWithPath(_moduleId, 6, "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;
+        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localizeWithPath(_moduleId, 7, "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 },
@@ -159,22 +139,18 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         return level === current ? `$(check) ${label}` : label;
     }
     getDescription(level, defaultLogLevel) {
-        return defaultLogLevel === level ? ( localizeWithPath('vs/workbench/contrib/logs/common/logsActions', 'default', "Default")) : undefined;
+        return defaultLogLevel === level ? ( localizeWithPath(_moduleId, 8, "Default")) : undefined;
     }
 };
-SetLogLevelAction = SetLogLevelAction_1 = ( __decorate([
-    ( __param(2, IQuickInputService)),
-    ( __param(3, ILoggerService)),
-    ( __param(4, IOutputService)),
-    ( __param(5, IDefaultLogLevelsService))
-], SetLogLevelAction));
+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 = ( localize2WithPath(
-        'vs/workbench/contrib/logs/common/logsActions',
-        'openSessionLogFile',
-        "Open Window Log File (Session)..."
-    )); }
+    static { this.TITLE = ( localize2WithPath(_moduleId, 9, "Open Window Log File (Session)...")); }
     constructor(id, label, environmentService, fileService, quickInputService, editorService) {
         super(id, label);
         this.environmentService = environmentService;
@@ -183,32 +159,24 @@ SetLogLevelAction = SetLogLevelAction_1 = ( __decorate([
         this.editorService = editorService;
     }
     async run() {
-        const sessionResult = await this.quickInputService.pick(this.getSessions().then(sessions => ( sessions.map((s, index) => ({
-            id: ( s.toString()),
+        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
-        })))), {
+            description: index === 0 ? ( localizeWithPath(_moduleId, 10, "Current")) : undefined
+        }))))), {
             canPickMany: false,
-            placeHolder: ( localizeWithPath(
-                'vs/workbench/contrib/logs/common/logsActions',
-                'sessions placeholder',
-                "Select Session"
-            ))
+            placeHolder: ( localizeWithPath(_moduleId, 11, "Select Session"))
         });
         if (sessionResult) {
-            const logFileResult = await this.quickInputService.pick(this.getLogFiles(( URI.parse(sessionResult.id))).then(logFiles => ( logFiles.map(s => ({
-                id: ( s.toString()),
+            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"
-                ))
+                placeHolder: ( localizeWithPath(_moduleId, 12, "Select Log file"))
             });
             if (logFileResult) {
-                return this.editorService.openEditor({ resource: ( URI.parse(logFileResult.id)), options: { pinned: true } }).then(() => undefined);
+                return this.editorService.openEditor({ resource: ( (URI.parse(logFileResult.id))), options: { pinned: true } }).then(() => undefined);
             }
         }
     }
@@ -217,18 +185,20 @@ SetLogLevelAction = SetLogLevelAction_1 = ( __decorate([
         const result = [logsPath];
         const stat = await this.fileService.resolve(dirname(logsPath));
         if (stat.children) {
-            result.push(...( 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)));
+                .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 (
+                 (stat.children.filter(stat => !stat.isDirectory).map(stat => stat.resource))
+            );
         }
         return [];
     }