@codingame/monaco-vscode-log-service-override 24.2.0 → 25.0.0

package/index.js

@@ -11,8 +11,8 @@ import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { windowLogId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/logConstants';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { DefaultLogLevelsService } from './vscode/src/vs/workbench/contrib/logs/common/defaultLogLevels.js';
-import { IDefaultLogLevelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/logs/common/defaultLogLevels.service';
+import { DefaultLogLevelsService } from './vscode/src/vs/workbench/services/log/common/defaultLogLevels.js';
+import { IDefaultLogLevelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/defaultLogLevels.service';
 import getServiceOverride$1 from '@codingame/monaco-vscode-environment-service-override';
 import { logsPath } from '@codingame/monaco-vscode-api/workbench';
 import { checkServicesNotInitialized } from '@codingame/monaco-vscode-api/lifecycle';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-log-service-override",
-  "version": "24.2.0",
+  "version": "25.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - log service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "24.2.0",
-    "@codingame/monaco-vscode-environment-service-override": "24.2.0"
+    "@codingame/monaco-vscode-api": "25.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "25.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -15,12 +15,12 @@ import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { showWindowLogActionId, windowLogId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/logConstants';
-import { IDefaultLogLevelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/logs/common/defaultLogLevels.service';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { CounterSet } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
+import { IDefaultLogLevelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/defaultLogLevels.service';
 
 registerAction2(class extends Action2 {
     constructor() {
@@ -40,7 +40,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.setDefaultLogLevel',
-            title: ( localize2(8561, "Set Default Log Level")),
+            title: ( localize2(8586, "Set Default Log Level")),
             category: Categories.Developer,
         });
     }
@@ -142,7 +142,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(8562, "{0} (Remote)", logger.name ?? logger.id)) : logger.name ?? logger.id;
+        const label = hasToAppendRemote ? ( localize(8587, "{0} (Remote)", logger.name ?? logger.id)) : logger.name ?? logger.id;
         this.outputChannelRegistry.registerChannel({ id, label, source: { resource: logger.resource }, log: true, extensionId: logger.extensionId });
     }
     registerCompoundLogChannel(id, name, logger) {
@@ -175,7 +175,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             constructor() {
                 super({
                     id: showWindowLogActionId,
-                    title: ( localize2(8563, "Show Window Log")),
+                    title: ( localize2(8588, "Show Window Log")),
                     category: Categories.Developer,
                     f1: true
                 });

package/vscode/src/vs/workbench/contrib/logs/common/logsActions.d.ts

@@ -6,7 +6,7 @@ import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IOutputService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service";
-import { IDefaultLogLevelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/logs/common/defaultLogLevels.service";
+import { IDefaultLogLevelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/defaultLogLevels.service";
 export declare class SetLogLevelAction extends Action {
     private readonly quickInputService;
     private readonly loggerService;

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

@@ -10,14 +10,14 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { basename, dirname, isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { isSingleSourceOutputChannelDescriptor, isMultiSourceOutputChannelDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output';
 import { IOutputService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service';
-import { IDefaultLogLevelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/logs/common/defaultLogLevels.service';
 import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IDefaultLogLevelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/defaultLogLevels.service';
 
 let SetLogLevelAction = class SetLogLevelAction extends Action {
     static { this.ID = 'workbench.action.setLogLevel'; }
-    static { this.TITLE = ( localize2(8564, "Set Log Level...")); }
+    static { this.TITLE = ( localize2(8589, "Set Log Level...")); }
     constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
         super(id, label);
         this.quickInputService = quickInputService;
@@ -37,7 +37,7 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         }
     }
     async selectLogLevelOrChannel() {
-        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+        const defaultLogLevels = this.defaultLogLevelsService.defaultLogLevels;
         const extensionLogs = [], logs = [];
         const logLevel = this.loggerService.getLogLevel();
         for (const channel of this.outputService.getChannelDescriptors()) {
@@ -63,18 +63,18 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
             }
         }
         const entries = [];
-        entries.push({ type: 'separator', label: ( localize(8565, "All")) });
+        entries.push({ type: 'separator', label: ( localize(8590, "All")) });
         entries.push(...this.getLogLevelEntries(defaultLogLevels.default, this.loggerService.getLogLevel(), true));
         if (extensionLogs.length) {
-            entries.push({ type: 'separator', label: ( localize(8566, "Extension Logs")) });
+            entries.push({ type: 'separator', label: ( localize(8591, "Extension Logs")) });
             entries.push(...extensionLogs.sort((a, b) => a.label.localeCompare(b.label)));
         }
-        entries.push({ type: 'separator', label: ( localize(8567, "Logs")) });
+        entries.push({ type: 'separator', label: ( localize(8592, "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(8568, "Set Log Level"));
+            quickPick.placeholder = ( localize(8593, "Set Log Level"));
             quickPick.items = entries;
             let selectedItem;
             disposables.add(quickPick.onDidTriggerItemButton(e => {
@@ -94,13 +94,13 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         }));
     }
     async setLogLevelForChannel(logChannel) {
-        const defaultLogLevels = await this.defaultLogLevelsService.getDefaultLogLevels();
+        const defaultLogLevels = this.defaultLogLevelsService.defaultLogLevels;
         const defaultLogLevel = defaultLogLevels.extensions.find(e => e[0] === logChannel.channel.extensionId?.toLowerCase())?.[1] ?? defaultLogLevels.default;
         const entries = this.getLogLevelEntries(defaultLogLevel, this.outputService.getLogLevel(logChannel.channel) ?? defaultLogLevel, !!logChannel.channel.extensionId);
         return (new Promise((resolve, reject) => {
             const disposables = ( new DisposableStore());
             const quickPick = disposables.add(this.quickInputService.createQuickPick());
-            quickPick.placeholder = logChannel ? ( localize(8569, " {0}: Select log level", logChannel?.label)) : ( localize(8570, "Select log level"));
+            quickPick.placeholder = logChannel ? ( localize(8594, " {0}: Select log level", logChannel?.label)) : ( localize(8595, "Select log level"));
             quickPick.items = entries;
             quickPick.activeItems = entries.filter((entry) => entry.level === this.loggerService.getLogLevel());
             let selectedItem;
@@ -123,7 +123,7 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         }));
     }
     getLogLevelEntries(defaultLogLevel, currentLogLevel, canSetDefaultLogLevel) {
-        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localize(8571, "Set as Default Log Level")) } : undefined;
+        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localize(8596, "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 },
@@ -138,7 +138,7 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
         return level === current ? `$(check) ${label}` : label;
     }
     getDescription(level, defaultLogLevel) {
-        return defaultLogLevel === level ? ( localize(8572, "Default")) : undefined;
+        return defaultLogLevel === level ? ( localize(8597, "Default")) : undefined;
     }
 };
 SetLogLevelAction = ( __decorate([
@@ -149,7 +149,7 @@ SetLogLevelAction = ( __decorate([
 ], SetLogLevelAction));
 (class OpenWindowSessionLogFileAction extends Action {
     static { this.ID = 'workbench.action.openSessionLogFile'; }
-    static { this.TITLE = ( localize2(8573, "Open Window Log File (Session)...")); }
+    static { this.TITLE = ( localize2(8598, "Open Window Log File (Session)...")); }
     constructor(id, label, environmentService, fileService, quickInputService, editorService) {
         super(id, label);
         this.environmentService = environmentService;
@@ -161,10 +161,10 @@ SetLogLevelAction = ( __decorate([
         const sessionResult = await this.quickInputService.pick(this.getSessions().then(sessions => ( sessions.map((s, index) => ({
             id: ( s.toString()),
             label: basename(s),
-            description: index === 0 ? ( localize(8574, "Current")) : undefined
+            description: index === 0 ? ( localize(8599, "Current")) : undefined
         })))), {
             canPickMany: false,
-            placeHolder: ( localize(8575, "Select Session"))
+            placeHolder: ( localize(8600, "Select Session"))
         });
         if (sessionResult) {
             const logFileResult = await this.quickInputService.pick(this.getLogFiles(( URI.parse(sessionResult.id))).then(logFiles => ( logFiles.map((s) => ({
@@ -172,7 +172,7 @@ SetLogLevelAction = ( __decorate([
                 label: basename(s)
             })))), {
                 canPickMany: false,
-                placeHolder: ( localize(8576, "Select Log file"))
+                placeHolder: ( localize(8601, "Select Log file"))
             });
             if (logFileResult) {
                 return this.editorService.openEditor({ resource: ( URI.parse(logFileResult.id)), options: { pinned: true } }).then(() => undefined);

package/vscode/src/vs/workbench/{contrib/logs → services/log}/common/defaultLogLevels.d.ts

@@ -5,7 +5,7 @@ import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscod
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IJSONEditingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing.service";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IDefaultLogLevelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/logs/common/defaultLogLevels.service";
+import { IDefaultLogLevelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/defaultLogLevels.service";
 interface ParsedArgvLogLevels {
     default?: LogLevel;
     extensions?: [
@@ -22,10 +22,13 @@ export declare class DefaultLogLevelsService extends Disposable implements IDefa
     private readonly loggerService;
     _serviceBrand: undefined;
     private _onDidChangeDefaultLogLevels;
-    readonly onDidChangeDefaultLogLevels: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
+    readonly onDidChangeDefaultLogLevels: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<Required<Readonly<ParsedArgvLogLevels>>>;
+    private _defaultLogLevels;
     constructor(environmentService: IWorkbenchEnvironmentService, fileService: IFileService, jsonEditingService: IJSONEditingService, logService: ILogService, loggerService: ILoggerService);
-    getDefaultLogLevels(): Promise<DefaultLogLevels>;
-    getDefaultLogLevel(extensionId?: string): Promise<LogLevel>;
+    private onDidChangeArgv;
+    get defaultLogLevels(): DefaultLogLevels;
+    private updateDefaultLogLevels;
+    getDefaultLogLevel(extensionId?: string): LogLevel;
     setDefaultLogLevel(defaultLogLevel: LogLevel, extensionId?: string): Promise<void>;
     private _getDefaultLogLevel;
     private _writeLogLevelsToArgv;

package/vscode/src/vs/workbench/{contrib/logs → services/log}/common/defaultLogLevels.js

@@ -12,6 +12,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ext
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 let DefaultLogLevelsService = class DefaultLogLevelsService extends Disposable {
@@ -24,38 +25,56 @@ let DefaultLogLevelsService = class DefaultLogLevelsService extends Disposable {
         this.loggerService = loggerService;
         this._onDidChangeDefaultLogLevels = this._register(( new Emitter()));
         this.onDidChangeDefaultLogLevels = this._onDidChangeDefaultLogLevels.event;
+        this._defaultLogLevels = {
+            default: this._getDefaultLogLevelFromEnv(),
+            extensions: this._getExtensionsDefaultLogLevelsFromEnv()
+        };
+        this._register(this.fileService.onDidFilesChange(e => {
+            if (e.contains(this.environmentService.argvResource)) {
+                this.onDidChangeArgv();
+            }
+        }));
+    }
+    async onDidChangeArgv() {
+        const defaultLogLevelsFromArgv = await this._parseLogLevelsFromArgv();
+        this.updateDefaultLogLevels(defaultLogLevelsFromArgv);
     }
-    async getDefaultLogLevels() {
-        const argvLogLevel = await this._parseLogLevelsFromArgv();
-        return {
-            default: argvLogLevel?.default ?? this._getDefaultLogLevelFromEnv(),
-            extensions: argvLogLevel?.extensions ?? this._getExtensionsDefaultLogLevelsFromEnv()
+    get defaultLogLevels() {
+        return this._defaultLogLevels;
+    }
+    updateDefaultLogLevels(defaultLogLevelsFromArgv) {
+        const defaultLogLevels = {
+            default: defaultLogLevelsFromArgv?.default ?? this._getDefaultLogLevelFromEnv(),
+            extensions: defaultLogLevelsFromArgv?.extensions ?? this._getExtensionsDefaultLogLevelsFromEnv()
         };
+        if (!equals(this._defaultLogLevels, defaultLogLevels)) {
+            this._defaultLogLevels = defaultLogLevels;
+            this._onDidChangeDefaultLogLevels.fire(this._defaultLogLevels);
+        }
     }
-    async getDefaultLogLevel(extensionId) {
-        const argvLogLevel = (await this._parseLogLevelsFromArgv()) ?? {};
+    getDefaultLogLevel(extensionId) {
         if (extensionId) {
             extensionId = extensionId.toLowerCase();
-            return this._getDefaultLogLevel(argvLogLevel, extensionId);
+            return this._getDefaultLogLevel(this._defaultLogLevels, extensionId);
         }
         else {
-            return this._getDefaultLogLevel(argvLogLevel);
+            return this._getDefaultLogLevel(this._defaultLogLevels);
         }
     }
     async setDefaultLogLevel(defaultLogLevel, extensionId) {
-        const argvLogLevel = (await this._parseLogLevelsFromArgv()) ?? {};
+        const defaultLogLevelsFromArgv = (await this._parseLogLevelsFromArgv()) ?? {};
         if (extensionId) {
             extensionId = extensionId.toLowerCase();
-            const currentDefaultLogLevel = this._getDefaultLogLevel(argvLogLevel, extensionId);
-            argvLogLevel.extensions = argvLogLevel.extensions ?? [];
-            const extension = argvLogLevel.extensions.find(([extension]) => extension === extensionId);
+            const currentDefaultLogLevel = this._getDefaultLogLevel(defaultLogLevelsFromArgv, extensionId);
+            defaultLogLevelsFromArgv.extensions = defaultLogLevelsFromArgv.extensions ?? [];
+            const extension = defaultLogLevelsFromArgv.extensions.find(([extension]) => extension === extensionId);
             if (extension) {
                 extension[1] = defaultLogLevel;
             }
             else {
-                argvLogLevel.extensions.push([extensionId, defaultLogLevel]);
+                defaultLogLevelsFromArgv.extensions.push([extensionId, defaultLogLevel]);
             }
-            await this._writeLogLevelsToArgv(argvLogLevel);
+            await this._writeLogLevelsToArgv(defaultLogLevelsFromArgv);
             const extensionLoggers = [...this.loggerService.getRegisteredLoggers()].filter(logger => logger.extensionId && logger.extensionId.toLowerCase() === extensionId);
             for (const { resource } of extensionLoggers) {
                 if (this.loggerService.getLogLevel(resource) === currentDefaultLogLevel) {
@@ -64,14 +83,14 @@ let DefaultLogLevelsService = class DefaultLogLevelsService extends Disposable {
             }
         }
         else {
-            const currentLogLevel = this._getDefaultLogLevel(argvLogLevel);
-            argvLogLevel.default = defaultLogLevel;
-            await this._writeLogLevelsToArgv(argvLogLevel);
+            const currentLogLevel = this._getDefaultLogLevel(defaultLogLevelsFromArgv);
+            defaultLogLevelsFromArgv.default = defaultLogLevel;
+            await this._writeLogLevelsToArgv(defaultLogLevelsFromArgv);
             if (this.loggerService.getLogLevel() === currentLogLevel) {
                 this.loggerService.setLogLevel(defaultLogLevel);
             }
         }
-        this._onDidChangeDefaultLogLevels.fire();
+        this.updateDefaultLogLevels(defaultLogLevelsFromArgv);
     }
     _getDefaultLogLevel(argvLogLevels, extension) {
         if (extension) {