@codingame/monaco-vscode-log-service-override 9.0.3 → 10.0.0

package/log.js

@@ -30,7 +30,10 @@ _FileLoggerService = __decorate([
 const otherLoggers = [];
 let _LogService = class _LogService extends LogService {
     constructor(loggerService, environmentService) {
-        const logger = loggerService.createLogger(environmentService.logFile, { id: windowLogId, name: rendererLogLabel });
+        const logger = loggerService.createLogger(environmentService.logFile, {
+            id: windowLogId,
+            name: rendererLogLabel
+        });
         super(logger, otherLoggers);
     }
 };

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

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

package/package.json

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

package/vscode/src/vs/platform/log/common/fileLog.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
 import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { joinPath, dirname, basename } from 'vscode/vscode/vs/base/common/resources';
-import { ByteSize, FileOperationResult, whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
+import { ByteSize, whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { BufferLogger } from 'vscode/vscode/vs/platform/log/common/bufferLog';
 import { AbstractMessageLogger, LogLevel, AbstractLoggerService } from 'vscode/vscode/vs/platform/log/common/log';
@@ -41,7 +41,7 @@ let FileLogger = class FileLogger extends AbstractMessageLogger {
             await this.fileService.createFile(this.resource);
         }
         catch (error) {
-            if (error.fileOperationResult !== FileOperationResult.FILE_MODIFIED_SINCE) {
+            if (error.fileOperationResult !== 3 ) {
                 throw error;
             }
         }

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

@@ -2,12 +2,11 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { getLogLevel, LogLevelToString, parseLogLevel } from 'vscode/vscode/vs/platform/log/common/log';
 import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { toFileOperationResult, FileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
+import { toFileOperationResult } from 'vscode/vscode/vs/platform/files/common/files';
 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 'vscode/vscode/vs/platform/instantiation/common/extensions';
 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';
@@ -128,7 +127,7 @@ let DefaultLogLevelsService = class DefaultLogLevelsService extends Disposable {
             return isString(argv['log-level']) ? [argv['log-level']] : Array.isArray(argv['log-level']) ? argv['log-level'] : [];
         }
         catch (error) {
-            if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
+            if (toFileOperationResult(error) !== 1 ) {
                 this.logService.error(error);
             }
         }

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

@@ -12,7 +12,6 @@ import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/commo
 import { Disposable, DisposableMap, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { CONTEXT_LOG_LEVEL, LogLevelToString, isLogLevel } from 'vscode/vscode/vs/platform/log/common/log';
 import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { showWindowLogActionId, windowLogId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
@@ -42,7 +41,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.setDefaultLogLevel',
-            title: ( localize2(3249, "Set Default Log Level")),
+            title: ( localize2(3221, "Set Default Log Level")),
             category: Categories.Developer,
         });
     }
@@ -148,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(3250, "{0} (Remote)", logger.name ?? logger.id)) : logger.name ?? logger.id;
+                const label = hasToAppendRemote ? ( localize(3222, "{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) {
@@ -187,7 +186,7 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             constructor() {
                 super({
                     id: showWindowLogActionId,
-                    title: ( localize2(3251, "Show Window Log")),
+                    title: ( localize2(3223, "Show Window Log")),
                     category: Categories.Developer,
                     f1: true
                 });
@@ -214,5 +213,5 @@ let LogLevelMigration = class LogLevelMigration {
 LogLevelMigration = ( (__decorate([
     ( (__param(0, IDefaultLogLevelsService)))
 ], LogLevelMigration)));
-( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogOutputChannels, LifecyclePhase.Restored);
-( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogLevelMigration, LifecyclePhase.Eventually);
+( (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

@@ -18,7 +18,7 @@ var SetLogLevelAction_1;
 let SetLogLevelAction = class SetLogLevelAction extends Action {
     static { SetLogLevelAction_1 = this; }
     static { this.ID = 'workbench.action.setLogLevel'; }
-    static { this.TITLE = ( localize2(6139, "Set Log Level...")); }
+    static { this.TITLE = ( localize2(6192, "Set Log Level...")); }
     constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
         super(id, label);
         this.quickInputService = quickInputService;
@@ -55,19 +55,19 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
             }
         }
         const entries = [];
-        entries.push({ type: 'separator', label: ( localize(6140, "All")) });
+        entries.push({ type: 'separator', label: ( localize(6193, "All")) });
         entries.push(...this.getLogLevelEntries(defaultLogLevels.default, this.loggerService.getLogLevel(), true));
         if (extensionLogs.length) {
-            entries.push({ type: 'separator', label: ( localize(6141, "Extension Logs")) });
+            entries.push({ type: 'separator', label: ( localize(6194, "Extension Logs")) });
             entries.push(...extensionLogs.sort((a, b) => a.label.localeCompare(b.label)));
         }
-        entries.push({ type: 'separator', label: ( localize(6142, "Logs")) });
+        entries.push({ type: 'separator', label: ( localize(6195, "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(6143, "Set Log Level"));
+                quickPick.placeholder = ( localize(6196, "Set Log Level"));
                 quickPick.items = entries;
                 let selectedItem;
                 disposables.add(quickPick.onDidTriggerItemButton(e => {
@@ -99,7 +99,7 @@ let SetLogLevelAction = class SetLogLevelAction extends Action {
              (new Promise((resolve, reject) => {
                 const disposables = ( (new DisposableStore()));
                 const quickPick = disposables.add(this.quickInputService.createQuickPick());
-                quickPick.placeholder = logChannel ? ( localize(6144, " {0}: Select log level", logChannel?.label)) : ( localize(6145, "Select log level"));
+                quickPick.placeholder = logChannel ? ( localize(6197, " {0}: Select log level", logChannel?.label)) : ( localize(6198, "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(6146, "Set as Default Log Level")) } : undefined;
+        const button = canSetDefaultLogLevel ? { iconClass: ThemeIcon.asClassName(Codicon.checkAll), tooltip: ( localize(6199, "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(6147, "Default")) : undefined;
+        return defaultLogLevel === level ? ( localize(6200, "Default")) : undefined;
     }
 };
 SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
@@ -149,7 +149,7 @@ SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
 ], SetLogLevelAction)));
 (class OpenWindowSessionLogFileAction extends Action {
     static { this.ID = 'workbench.action.openSessionLogFile'; }
-    static { this.TITLE = ( localize2(6148, "Open Window Log File (Session)...")); }
+    static { this.TITLE = ( localize2(6201, "Open Window Log File (Session)...")); }
     constructor(id, label, environmentService, fileService, quickInputService, editorService) {
         super(id, label);
         this.environmentService = environmentService;
@@ -161,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 ? ( localize(6149, "Current")) : undefined
+            description: index === 0 ? ( localize(6202, "Current")) : undefined
         }))))), {
             canPickMany: false,
-            placeHolder: ( localize(6150, "Select Session"))
+            placeHolder: ( localize(6203, "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 = SetLogLevelAction_1 = ( (__decorate([
                 label: basename(s)
             }))))), {
                 canPickMany: false,
-                placeHolder: ( localize(6151, "Select Log file"))
+                placeHolder: ( localize(6204, "Select Log file"))
             });
             if (logFileResult) {
                 return this.editorService.openEditor({ resource: ( (URI.parse(logFileResult.id))), options: { pinned: true } }).then(() => undefined);