@codingame/monaco-vscode-log-service-override 7.0.11 → 7.1.1

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

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

package/package.json

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

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -25,7 +25,6 @@ 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({
@@ -43,7 +42,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.setDefaultLogLevel',
-            title: ( localize2WithPath(_moduleId, 0, "Set Default Log Level")),
+            title: ( localize2(3252, "Set Default Log Level")),
             category: Categories.Developer,
         });
     }
@@ -149,7 +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(_moduleId, 1, "{0} (Remote)", logger.name ?? logger.id)) : logger.name ?? logger.id;
+                const label = hasToAppendRemote ? ( localize(3253, "{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) {
@@ -188,7 +187,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             constructor() {
                 super({
                     id: showWindowLogActionId,
-                    title: ( localize2WithPath(_moduleId, 2, "Show Window Log")),
+                    title: ( localize2(3254, "Show Window Log")),
                     category: Categories.Developer,
                     f1: true
                 });

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -15,11 +15,10 @@ 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(_moduleId, 0, "Set Log Level...")); }
+    static { this.TITLE = ( localize2(6161, "Set Log Level...")); }
     constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
         super(id, label);
         this.quickInputService = quickInputService;
@@ -56,19 +55,19 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
             }
         }
         const entries = [];
-        entries.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "All")) });
+        entries.push({ type: 'separator', label: ( localize(6162, "All")) });
         entries.push(...this.getLogLevelEntries(defaultLogLevels.default, this.loggerService.getLogLevel(), true));
         if (extensionLogs.length) {
-            entries.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 2, "Extension Logs")) });
+            entries.push({ type: 'separator', label: ( localize(6163, "Extension Logs")) });
             entries.push(...extensionLogs.sort((a, b) => a.label.localeCompare(b.label)));
         }
-        entries.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 3, "Logs")) });
+        entries.push({ type: 'separator', label: ( localize(6164, "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(_moduleId, 4, "Set Log Level"));
+                quickPick.placeholder = ( localize(6165, "Set Log Level"));
                 quickPick.items = entries;
                 let selectedItem;
                 disposables.add(quickPick.onDidTriggerItemButton(e => {
@@ -100,7 +99,7 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
              (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.placeholder = logChannel ? ( localize(6166, " {0}: Select log level", logChannel?.label)) : ( localize(6167, "Select log level"));
                 quickPick.items = entries;
                 quickPick.activeItems = entries.filter((entry) => entry.level === this.loggerService.getLogLevel());
                 let selectedItem;
@@ -124,7 +123,7 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         );
     }
     getLogLevelEntries(defaultLogLevel, currentLogLevel, canSetDefaultLogLevel) {
-        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localizeWithPath(_moduleId, 7, "Set as Default Log Level")) } : undefined;
+        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localize(6168, "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 },
@@ -139,7 +138,7 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         return level === current ? `$(check) ${label}` : label;
     }
     getDescription(level, defaultLogLevel) {
-        return defaultLogLevel === level ? ( localizeWithPath(_moduleId, 8, "Default")) : undefined;
+        return defaultLogLevel === level ? ( localize(6169, "Default")) : undefined;
     }
 };
 SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
@@ -150,7 +149,7 @@ SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
 ], SetLogLevelAction)));
 (class OpenWindowSessionLogFileAction extends Action {
     static { this.ID = 'workbench.action.openSessionLogFile'; }
-    static { this.TITLE = ( localize2WithPath(_moduleId, 9, "Open Window Log File (Session)...")); }
+    static { this.TITLE = ( localize2(6170, "Open Window Log File (Session)...")); }
     constructor(id, label, environmentService, fileService, quickInputService, editorService) {
         super(id, label);
         this.environmentService = environmentService;
@@ -162,10 +161,10 @@ SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
         const sessionResult = await this.quickInputService.pick(this.getSessions().then(sessions => ( (sessions.map((s, index) => ({
             id: ( (s.toString())),
             label: basename(s),
-            description: index === 0 ? ( localizeWithPath(_moduleId, 10, "Current")) : undefined
+            description: index === 0 ? ( localize(6171, "Current")) : undefined
         }))))), {
             canPickMany: false,
-            placeHolder: ( localizeWithPath(_moduleId, 11, "Select Session"))
+            placeHolder: ( localize(6172, "Select Session"))
         });
         if (sessionResult) {
             const logFileResult = await this.quickInputService.pick(this.getLogFiles(( (URI.parse(sessionResult.id)))).then(logFiles => ( (logFiles.map((s) => ({
@@ -173,7 +172,7 @@ SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
                 label: basename(s)
             }))))), {
                 canPickMany: false,
-                placeHolder: ( localizeWithPath(_moduleId, 12, "Select Log file"))
+                placeHolder: ( localize(6173, "Select Log file"))
             });
             if (logFileResult) {
                 return this.editorService.openEditor({ resource: ( (URI.parse(logFileResult.id))), options: { pinned: true } }).then(() => undefined);