@codingame/monaco-vscode-log-service-override 2.2.2 → 3.1.0

package/log.js

@@ -10,10 +10,11 @@ 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';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IDefaultLogLevelsService, DefaultLogLevelsService } from 'vscode/vscode/vs/workbench/contrib/logs/common/defaultLogLevels';
 import getServiceOverride$1 from '@codingame/monaco-vscode-environment-service-override';
 import { logsPath } from 'vscode/workbench';
-import './vscode/src/vs/workbench/contrib/logs/common/logs.contribution.js';
 import { checkServicesNotInitialized } from 'vscode/lifecycle';
+import './vscode/src/vs/workbench/contrib/logs/common/logs.contribution.js';
 
 let _FileLoggerService = class _FileLoggerService extends FileLoggerService {
     constructor(logLevel, fileService, environmentService) {
@@ -39,7 +40,8 @@ function getServiceOverride(logLevel) {
     return {
         ...getServiceOverride$1(),
         [( ILoggerService.toString())]: new SyncDescriptor(_FileLoggerService, [logLevel], true),
-        [( ILogService.toString())]: new SyncDescriptor(_LogService, [], true)
+        [( ILogService.toString())]: new SyncDescriptor(_LogService, [], true),
+        [( IDefaultLogLevelsService.toString())]: new SyncDescriptor(DefaultLogLevelsService, [], true)
     };
 }
 function registerAdditionalLogger(logger) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-log-service-override",
-  "version": "2.2.2",
+  "version": "3.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.2"
+    "@codingame/monaco-vscode-environment-service-override": "3.1.0"
   }
 }

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } 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';
@@ -14,7 +14,7 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { showWindowLogActionId, windowLogId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
 import { createCancelablePromise, timeout } from 'vscode/vscode/vs/base/common/async';
 import { isCancellationError, getErrorMessage, CancellationError } from 'vscode/vscode/vs/base/common/errors';
-import { IDefaultLogLevelsService } from './defaultLogLevels.js';
+import { IDefaultLogLevelsService } from 'vscode/vscode/vs/workbench/contrib/logs/common/defaultLogLevels';
 import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { CounterSet } from 'vscode/vscode/vs/base/common/map';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
@@ -37,11 +37,11 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.setDefaultLogLevel',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/logs/common/logs.contribution',
                 'setDefaultLogLevel',
                 "Set Default Log Level"
-            )), original: 'Set Default Log Level' },
+            )),
             category: Categories.Developer,
         });
     }
@@ -191,11 +191,11 @@ let LogOutputChannels = class LogOutputChannels extends Disposable {
             constructor() {
                 super({
                     id: showWindowLogActionId,
-                    title: { value: ( localizeWithPath(
+                    title: ( localize2WithPath(
                         'vs/workbench/contrib/logs/common/logs.contribution',
                         'show window log',
                         "Show Window Log"
-                    )), original: '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 '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Action } from 'vscode/vscode/vs/base/common/actions';
 import { isLogLevel, LogLevel, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
@@ -7,18 +7,18 @@ import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { basename, dirname, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/common/output';
 import { telemetryLogId, extensionTelemetryLogChannelId } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
-import { IDefaultLogLevelsService } from './defaultLogLevels.js';
+import { IDefaultLogLevelsService } from 'vscode/vscode/vs/workbench/contrib/logs/common/defaultLogLevels';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
 let SetLogLevelAction = class SetLogLevelAction extends Action {
     static { this.ID = 'workbench.action.setLogLevel'; }
-    static { this.TITLE = { value: ( localizeWithPath(
+    static { this.TITLE = ( localize2WithPath(
         'vs/workbench/contrib/logs/common/logsActions',
         'setLogLevel',
         "Set Log Level..."
-    )), original: 'Set Log Level...' }; }
+    )); }
     constructor(id, label, quickInputService, loggerService, outputService, defaultLogLevelsService) {
         super(id, label);
         this.quickInputService = quickInputService;
@@ -183,11 +183,11 @@ SetLogLevelAction = ( __decorate([
 ], SetLogLevelAction));
 (class OpenWindowSessionLogFileAction extends Action {
     static { this.ID = 'workbench.action.openSessionLogFile'; }
-    static { this.TITLE = { value: ( localizeWithPath(
+    static { this.TITLE = ( localize2WithPath(
         'vs/workbench/contrib/logs/common/logsActions',
         'openSessionLogFile',
         "Open Window Log File (Session)..."
-    )), original: 'Open Window Log File (Session)...' }; }
+    )); }
     constructor(id, label, environmentService, fileService, quickInputService, editorService) {
         super(id, label);
         this.environmentService = environmentService;

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

@@ -1,5 +0,0 @@
-import { createDecorator } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-
-const IDefaultLogLevelsService = ( createDecorator('IDefaultLogLevelsService'));
-
-export { IDefaultLogLevelsService };