@codingame/monaco-vscode-log-service-override 5.2.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-log-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0",
-    "@codingame/monaco-vscode-environment-service-override": "5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "6.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, whenProviderRegistered } from 'vscode/vscode/vs/platform/files/common/files';
+import { ByteSize, FileOperationResult, 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 !== 3 ) {
+            if (error.fileOperationResult !== FileOperationResult.FILE_MODIFIED_SINCE) {
                 throw error;
             }
         }

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

@@ -2,11 +2,12 @@ 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 } from 'vscode/vscode/vs/platform/files/common/files';
+import { toFileOperationResult, FileOperationResult } 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';
@@ -127,7 +128,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) !== 1 ) {
+            if (toFileOperationResult(error) !== FileOperationResult.FILE_NOT_FOUND) {
                 this.logService.error(error);
             }
         }

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

@@ -12,6 +12,7 @@ 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';
@@ -214,5 +215,5 @@ let LogLevelMigration = class LogLevelMigration {
 LogLevelMigration = ( (__decorate([
     ( (__param(0, IDefaultLogLevelsService)))
 ], LogLevelMigration)));
-( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogOutputChannels, 3 );
-( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogLevelMigration, 4 );
+( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogOutputChannels, LifecyclePhase.Restored);
+( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(LogLevelMigration, LifecyclePhase.Eventually);

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

@@ -168,7 +168,7 @@ SetLogLevelAction = SetLogLevelAction_1 = ( (__decorate([
             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 => ({
+            const logFileResult = await this.quickInputService.pick(this.getLogFiles(( (URI.parse(sessionResult.id)))).then(logFiles => ( (logFiles.map((s) => ({
                 id: ( (s.toString())),
                 label: basename(s)
             }))))), {