@theia/monaco 1.24.0-next.7 → 1.24.0-next.73

package/lib/browser/monaco-bulk-edit-service.d.ts

@@ -1,12 +1,14 @@
-/// <reference types="@theia/monaco-editor-core/monaco" />
 import { MonacoWorkspace } from './monaco-workspace';
-export declare class MonacoBulkEditService implements monaco.editor.IBulkEditService {
+import { IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
+import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
+export declare class MonacoBulkEditService implements IBulkEditService {
+    readonly _serviceBrand: undefined;
     protected readonly workspace: MonacoWorkspace;
     private _previewHandler?;
-    apply(edits: monaco.editor.ResourceEdit[], options?: monaco.editor.IBulkEditOptions): Promise<monaco.editor.IBulkEditResult & {
+    apply(edits: ResourceEdit[], options?: IBulkEditOptions): Promise<IBulkEditResult & {
         success: boolean;
     }>;
     hasPreviewHandler(): boolean;
-    setPreviewHandler(handler: monaco.editor.IBulkEditPreviewHandler): monaco.IDisposable;
+    setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable;
 }
 //# sourceMappingURL=monaco-bulk-edit-service.d.ts.map

package/lib/browser/monaco-bulk-edit-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-bulk-edit-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-bulk-edit-service.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBACa,qBAAsB,YAAW,MAAM,CAAC,MAAM,CAAC,gBAAgB;IAGxE,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IAE9C,OAAO,CAAC,eAAe,CAAC,CAAwC;IAE1D,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,GAAG;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IASzJ,iBAAiB,IAAI,OAAO;IAI5B,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,GAAG,MAAM,CAAC,WAAW;CAexF"}
+{"version":3,"file":"monaco-bulk-edit-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-bulk-edit-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACH,gBAAgB,EAAE,uBAAuB,EAAE,eAAe,EAAE,gBAAgB,EAAE,YAAY,EAC7F,MAAM,0EAA0E,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AAErF,qBACa,qBAAsB,YAAW,gBAAgB;IAC1D,SAAiB,aAAa,EAAE,SAAS,CAAC;IAG1C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IAE9C,OAAO,CAAC,eAAe,CAAC,CAA0B;IAE5C,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,GAAG;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAS/G,iBAAiB,IAAI,OAAO;IAI5B,iBAAiB,CAAC,OAAO,EAAE,uBAAuB,GAAG,WAAW;CAenE"}

package/lib/browser/monaco-bulk-edit-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-bulk-edit-service.js","sourceRoot":"","sources":["../../src/browser/monaco-bulk-edit-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,yDAAqD;AAGrD,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAO9B,KAAK,CAAC,KAAK,CAAC,KAAmC,EAAE,OAAwC;QACrF,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,iBAAiB,CAAA,EAAA,CAAC,CAAC,EAAE;YAC1G,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACnD,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC7C;aAAM;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC9C;IACL,CAAC;IAED,iBAAiB;QACb,OAAO,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB,CAAC,OAA8C;QAC5D,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;QAE/B,MAAM,qBAAqB,GAAG,GAAG,EAAE;YAC/B,IAAI,IAAI,CAAC,eAAe,KAAK,OAAO,EAAE;gBAClC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;aACpC;QACL,CAAC,CAAC;QAEF,OAAO;YACH,OAAO;gBACH,qBAAqB,EAAE,CAAC;YAC5B,CAAC;SACJ,CAAC;IACN,CAAC;CACJ,CAAA;AAhCG;IADC,IAAA,kBAAM,EAAC,kCAAe,CAAC;8BACM,kCAAe;wDAAC;AAHrC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAmCjC;AAnCY,sDAAqB"}
+{"version":3,"file":"monaco-bulk-edit-service.js","sourceRoot":"","sources":["../../src/browser/monaco-bulk-edit-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,yDAAqD;AAOrD,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAQ9B,KAAK,CAAC,KAAK,CAAC,KAAqB,EAAE,OAA0B;QACzD,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,iBAAiB,CAAA,EAAA,CAAC,CAAC,EAAE;YAC1G,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACnD,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC7C;aAAM;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC9C;IACL,CAAC;IAED,iBAAiB;QACb,OAAO,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB,CAAC,OAAgC;QAC9C,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;QAE/B,MAAM,qBAAqB,GAAG,GAAG,EAAE;YAC/B,IAAI,IAAI,CAAC,eAAe,KAAK,OAAO,EAAE;gBAClC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;aACpC;QACL,CAAC,CAAC;QAEF,OAAO;YACH,OAAO;gBACH,qBAAqB,EAAE,CAAC;YAC5B,CAAC;SACJ,CAAC;IACN,CAAC;CACJ,CAAA;AAhCG;IADC,IAAA,kBAAM,EAAC,kCAAe,CAAC;8BACM,kCAAe;wDAAC;AAJrC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAoCjC;AApCY,sDAAqB"}

package/lib/browser/monaco-color-registry.d.ts

@@ -1,11 +1,14 @@
 import { ColorRegistry, ColorDefinition, Color } from '@theia/core/lib/browser/color-registry';
 import { Disposable } from '@theia/core/lib/common/disposable';
+import { ColorValue } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
+import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
+import * as Colors from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
 export declare class MonacoColorRegistry extends ColorRegistry {
-    protected readonly monacoThemeService: monaco.services.IStandaloneThemeService;
-    protected readonly monacoColorRegistry: monaco.color.IColorRegistry;
+    protected readonly monacoThemeService: IStandaloneThemeService;
+    protected readonly monacoColorRegistry: Colors.IColorRegistry;
     getColors(): IterableIterator<string>;
     getCurrentColor(id: string): string | undefined;
     protected doRegister(definition: ColorDefinition): Disposable;
-    protected toColor(value: Color | undefined): monaco.color.ColorValue | undefined;
+    protected toColor(value: Color | undefined): ColorValue | null;
 }
 //# sourceMappingURL=monaco-color-registry.d.ts.map

package/lib/browser/monaco-color-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-color-registry.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,qBACa,mBAAoB,SAAQ,aAAa;IAElD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,0CAA+D;IACpG,SAAS,CAAC,QAAQ,CAAC,mBAAmB,8BAAmC;IAE/D,SAAS,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAMtC,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;cAKrC,UAAU,CAAC,UAAU,EAAE,eAAe,GAAG,UAAU;IAYtE,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,SAAS;CAenF"}
+{"version":3,"file":"monaco-color-registry.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAiB,UAAU,EAAoB,MAAM,sEAAsE,CAAC;AAEnI,OAAO,EAAE,uBAAuB,EAAE,MAAM,2EAA2E,CAAC;AAEpH,OAAO,KAAK,MAAM,MAAM,sEAAsE,CAAC;AAE/F,qBACa,mBAAoB,SAAQ,aAAa;IAElD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,0BAAmD;IACxF,SAAS,CAAC,QAAQ,CAAC,mBAAmB,wBAAsB;IAElD,SAAS,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAMtC,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;cAKrC,UAAU,CAAC,UAAU,EAAE,eAAe,GAAG,UAAU;IAUtE,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI;CAejE"}

package/lib/browser/monaco-color-registry.js

@@ -25,11 +25,16 @@ exports.MonacoColorRegistry = void 0;
 const inversify_1 = require("@theia/core/shared/inversify");
 const color_registry_1 = require("@theia/core/lib/browser/color-registry");
 const disposable_1 = require("@theia/core/lib/common/disposable");
+const colorRegistry_1 = require("@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry");
+const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
+const standaloneTheme_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme");
+const color_1 = require("@theia/monaco-editor-core/esm/vs/base/common/color");
+const Colors = require("@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry");
 let MonacoColorRegistry = class MonacoColorRegistry extends color_registry_1.ColorRegistry {
     constructor() {
         super(...arguments);
-        this.monacoThemeService = monaco.services.StaticServices.standaloneThemeService.get();
-        this.monacoColorRegistry = monaco.color.getColorRegistry();
+        this.monacoThemeService = standaloneServices_1.StandaloneServices.get(standaloneTheme_1.IStandaloneThemeService);
+        this.monacoColorRegistry = (0, colorRegistry_1.getColorRegistry)();
     }
     *getColors() {
         for (const { id } of this.monacoColorRegistry.getColors()) {
@@ -41,30 +46,29 @@ let MonacoColorRegistry = class MonacoColorRegistry extends color_registry_1.Col
         return color && color.toString();
     }
     doRegister(definition) {
-        let defaults;
-        if (definition.defaults) {
-            defaults = {};
-            defaults.dark = this.toColor(definition.defaults.dark);
-            defaults.light = this.toColor(definition.defaults.light);
-            defaults.hc = this.toColor(definition.defaults.hc);
-        }
+        var _a, _b, _c;
+        const defaults = {
+            dark: this.toColor((_a = definition.defaults) === null || _a === void 0 ? void 0 : _a.dark),
+            light: this.toColor((_b = definition.defaults) === null || _b === void 0 ? void 0 : _b.light),
+            hc: this.toColor((_c = definition.defaults) === null || _c === void 0 ? void 0 : _c.hc),
+        };
         const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
         return disposable_1.Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));
     }
     toColor(value) {
         if (!value || typeof value === 'string') {
-            return value;
+            return value !== null && value !== void 0 ? value : null; // eslint-disable-line no-null/no-null
         }
         if ('kind' in value) {
-            return monaco.color[value.kind](value.v, value.f);
+            return Colors[value.kind](value.v, value.f);
         }
         else if ('r' in value) {
             const { r, g, b, a } = value;
-            return new monaco.color.Color(new monaco.color.RGBA(r, g, b, a));
+            return new color_1.Color(new color_1.RGBA(r, g, b, a));
         }
         else {
             const { h, s, l, a } = value;
-            return new monaco.color.Color(new monaco.color.HSLA(h, s, l, a));
+            return new color_1.Color(new color_1.HSLA(h, s, l, a));
         }
     }
 };

package/lib/browser/monaco-color-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-color-registry.js","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-color-registry.js","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,4DAA0D;AAC1D,2EAA+F;AAC/F,kEAA+D;AAC/D,wGAAmI;AACnI,sHAAmH;AACnH,+GAAoH;AACpH,8EAAsG;AACtG,+FAA+F;AAG/F,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,8BAAa;IAAtD;;QAEuB,uBAAkB,GAAG,uCAAkB,CAAC,GAAG,CAAC,yCAAuB,CAAC,CAAC;QACrE,wBAAmB,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAsChE,CAAC;IApCY,CAAC,SAAS;QACf,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,EAAE;YACvD,MAAM,EAAE,CAAC;SACZ;IACL,CAAC;IAEQ,eAAe,CAAC,EAAU;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACnE,OAAO,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC;IAEkB,UAAU,CAAC,UAA2B;;QACrD,MAAM,QAAQ,GAAkB;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,CAAC;YAC7C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,KAAK,CAAC;YAC/C,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,EAAE,CAAC;SAC5C,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;QAC3G,OAAO,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACzF,CAAC;IAES,OAAO,CAAC,KAAwB;QACtC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACrC,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,CAAC,sCAAsC;SAC/D;QACD,IAAI,MAAM,IAAI,KAAK,EAAE;YACjB,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;SAC/C;aAAM,IAAI,GAAG,IAAI,KAAK,EAAE;YACrB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAC7B,OAAO,IAAI,aAAW,CAAC,IAAI,YAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;aAAM;YACH,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAC7B,OAAO,IAAI,aAAW,CAAC,IAAI,YAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;IACL,CAAC;CAEJ,CAAA;AAzCY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAyC/B;AAzCY,kDAAmB"}

package/lib/browser/monaco-command-service.d.ts

@@ -1,25 +1,26 @@
-/// <reference types="@theia/monaco-editor-core/monaco" />
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { Emitter } from '@theia/core/lib/common/event';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import ICommandEvent = monaco.commands.ICommandEvent;
-import ICommandService = monaco.commands.ICommandService;
+import { ICommandEvent, ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
+import { StandaloneCommandService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import * as monaco from '@theia/monaco-editor-core';
 export declare const MonacoCommandServiceFactory: unique symbol;
 export interface MonacoCommandServiceFactory {
     (): MonacoCommandService;
 }
 export declare class MonacoCommandService implements ICommandService, Disposable {
     protected readonly commandRegistry: CommandRegistry;
+    readonly _serviceBrand: undefined;
     protected readonly onWillExecuteCommandEmitter: Emitter<ICommandEvent>;
     protected readonly onDidExecuteCommandEmitter: Emitter<ICommandEvent>;
     protected readonly toDispose: DisposableCollection;
-    protected delegate: monaco.services.StandaloneCommandService | undefined;
+    protected delegate: StandaloneCommandService | undefined;
     protected readonly delegateListeners: DisposableCollection;
     constructor(commandRegistry: CommandRegistry);
     dispose(): void;
     get onWillExecuteCommand(): monaco.IEvent<ICommandEvent>;
     get onDidExecuteCommand(): monaco.IEvent<ICommandEvent>;
-    setDelegate(delegate: monaco.services.StandaloneCommandService | undefined): void;
+    setDelegate(delegate: StandaloneCommandService | undefined): void;
     executeCommand(commandId: any, ...args: any[]): Promise<any>;
     executeMonacoCommand(commandId: any, ...args: any[]): Promise<any>;
 }

package/lib/browser/monaco-command-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-command-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command-service.ts"],"names":[],"mappings":";AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;AACrD,OAAO,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;AAEzD,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AACjF,MAAM,WAAW,2BAA2B;IACxC,IAAI,oBAAoB,CAAC;CAC5B;AAED,qBACa,oBAAqB,YAAW,eAAe,EAAE,UAAU;IAavC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAXhF,SAAS,CAAC,QAAQ,CAAC,2BAA2B,yBAAgC;IAC9E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,yBAAgC;IAC7E,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAG1B;IAEF,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,wBAAwB,GAAG,SAAS,CAAC;IACzE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,uBAA8B;gBAGlB,eAAe,EAAE,eAAe;IAMhF,OAAO,IAAI,IAAI;IAIf,IAAI,oBAAoB,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAEvD;IAED,IAAI,mBAAmB,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAEtD;IAED,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,wBAAwB,GAAG,SAAS,GAAG,IAAI;IAkB3E,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAY5D,oBAAoB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;CAO3E"}
+{"version":3,"file":"monaco-command-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,oEAAoE,CAAC;AACpH,OAAO,EAAE,wBAAwB,EAAE,MAAM,+EAA+E,CAAC;AACzH,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,eAAO,MAAM,2BAA2B,eAAwC,CAAC;AACjF,MAAM,WAAW,2BAA2B;IACxC,IAAI,oBAAoB,CAAC;CAC5B;AAED,qBACa,oBAAqB,YAAW,eAAe,EAAE,UAAU;IAavC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAZhF,SAAiB,aAAa,EAAE,SAAS,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,2BAA2B,yBAAgC;IAC9E,SAAS,CAAC,QAAQ,CAAC,0BAA0B,yBAAgC;IAC7E,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAG1B;IAEF,SAAS,CAAC,QAAQ,EAAE,wBAAwB,GAAG,SAAS,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,uBAA8B;gBAGlB,eAAe,EAAE,eAAe;IAMhF,OAAO,IAAI,IAAI;IAIf,IAAI,oBAAoB,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAEvD;IAED,IAAI,mBAAmB,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAEtD;IAED,WAAW,CAAC,QAAQ,EAAE,wBAAwB,GAAG,SAAS,GAAG,IAAI;IAkB3D,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAY5D,oBAAoB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;CAO3E"}

package/lib/browser/monaco-command-service.js

@@ -60,8 +60,8 @@ let MonacoCommandService = class MonacoCommandService {
         this.toDispose.push(this.delegateListeners);
         this.delegate = delegate;
         if (this.delegate) {
-            this.delegateListeners.push(this.delegate['_onWillExecuteCommand'].event(event => this.onWillExecuteCommandEmitter.fire(event)));
-            this.delegateListeners.push(this.delegate['_onDidExecuteCommand'].event(event => this.onDidExecuteCommandEmitter.fire(event)));
+            this.delegateListeners.push(this.delegate.onWillExecuteCommand(event => this.onWillExecuteCommandEmitter.fire(event)));
+            this.delegateListeners.push(this.delegate.onDidExecuteCommand(event => this.onDidExecuteCommandEmitter.fire(event)));
         }
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/lib/browser/monaco-command-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-command-service.js","sourceRoot":"","sources":["../../src/browser/monaco-command-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-command-service.js","sourceRoot":"","sources":["../../src/browser/monaco-command-service.ts"],"names":[],"mappings":"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"}

package/lib/browser/monaco-command.d.ts

@@ -6,6 +6,7 @@ import { MonacoCommandRegistry, MonacoEditorCommandHandler } from './monaco-comm
 import { MonacoEditorService } from './monaco-editor-service';
 import { MonacoTextModelService } from './monaco-text-model-service';
 import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
+import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
 export declare namespace MonacoCommands {
     const COMMON_ACTIONS: Map<string, string>;
     const GO_TO_DEFINITION = "editor.action.revealDefinition";
@@ -18,7 +19,7 @@ export declare class MonacoEditorCommandHandlers implements CommandContribution
     protected readonly quickInputService: QuickInputService;
     protected readonly codeEditorService: MonacoEditorService;
     protected readonly textModelService: MonacoTextModelService;
-    protected readonly contextKeyService: monaco.contextKeyService.ContextKeyService;
+    protected readonly contextKeyService: VSCodeContextKeyService;
     protected readonly shell: ApplicationShell;
     protected editorManager: EditorManager;
     registerCommands(): void;

package/lib/browser/monaco-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-command.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAkB,MAAM,gCAAgC,CAAC;AACtG,OAAO,EAAkB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAG3E,yBAAiB,cAAc,CAAC;IAErB,MAAM,cAAc,qBAMzB,CAAC;IAEI,MAAM,gBAAgB,mCAAmC,CAAC;IAE1D,MAAM,eAAe,aAK1B,CAAC;CACN;AAED,qBACa,2BAA4B,YAAW,mBAAmB;IAGnE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;IAGjF,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,gBAAgB,IAAI,IAAI;IAKxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;IA0DxC,SAAS,CAAC,6BAA6B,IAAI,IAAI;IAU/C,SAAS,CAAC,uBAAuB,IAAI,0BAA0B;IAa/D,SAAS,CAAC,2BAA2B,IAAI,0BAA0B;IAKnE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAQ1D,SAAS,CAAC,mBAAmB,IAAI,0BAA0B;IAM3D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAUlD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAWhE,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,OAAO,GAAG,0BAA0B;IAKjF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;IAmB1E,SAAS,CAAC,4BAA4B,IAAI,0BAA0B;IAMpE,SAAS,CAAC,oCAAoC,IAAI,0BAA0B;IAM5E,SAAS,CAAC,eAAe,IAAI;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE;cAK7D,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;cAMlD,0BAA0B,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAUvH"}
+{"version":3,"file":"monaco-command.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAkB,MAAM,gCAAgC,CAAC;AACtG,OAAO,EAAkB,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9F,OAAO,EAAkB,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACxF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAE3E,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,gFAAgF,CAAC;AAO9I,yBAAiB,cAAc,CAAC;IAErB,MAAM,cAAc,qBAMzB,CAAC;IAEI,MAAM,gBAAgB,mCAAmC,CAAC;IAE1D,MAAM,eAAe,aAK1B,CAAC;CACN;AAED,qBACa,2BAA4B,YAAW,mBAAmB;IAGnE,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,CAAC;IAG3C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvC,gBAAgB,IAAI,IAAI;IAKxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACH,SAAS,CAAC,sBAAsB,IAAI,IAAI;IAsDxC,SAAS,CAAC,6BAA6B,IAAI,IAAI;IAU/C,SAAS,CAAC,uBAAuB,IAAI,0BAA0B;IAa/D,SAAS,CAAC,2BAA2B,IAAI,0BAA0B;IAKnE,SAAS,CAAC,oBAAoB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAQ1D,SAAS,CAAC,mBAAmB,IAAI,0BAA0B;IAM3D,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAUlD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;IAWhE,SAAS,CAAC,uBAAuB,CAAC,SAAS,EAAE,OAAO,GAAG,0BAA0B;IAKjF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,GAAG,IAAI;IAmB1E,SAAS,CAAC,4BAA4B,IAAI,0BAA0B;IAMpE,SAAS,CAAC,oCAAoC,IAAI,0BAA0B;IAM5E,SAAS,CAAC,eAAe,IAAI;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE;cAK7D,YAAY,CAAC,MAAM,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;cAMlD,0BAA0B,CAAC,OAAO,EAAE;QAAE,MAAM,CAAC,EAAE,YAAY,CAAC;QAAC,MAAM,CAAC,EAAE,YAAY,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAUvH"}

package/lib/browser/monaco-command.js

@@ -35,6 +35,11 @@ const monaco_editor_service_1 = require("./monaco-editor-service");
 const monaco_text_model_service_1 = require("./monaco-text-model-service");
 const protocol_to_monaco_converter_1 = require("./protocol-to-monaco-converter");
 const nls_1 = require("@theia/core/lib/common/nls");
+const contextKeyService_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService");
+const editorExtensions_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/editorExtensions");
+const commands_1 = require("@theia/monaco-editor-core/esm/vs/platform/commands/common/commands");
+const monaco = require("@theia/monaco-editor-core");
+const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
 var MonacoCommands;
 (function (MonacoCommands) {
     MonacoCommands.COMMON_ACTIONS = new Map([
@@ -105,11 +110,10 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
      * and execute them using the instantiation service of the current editor.
      */
     registerMonacoCommands() {
-        const editorRegistry = monaco.editorExtensions.EditorExtensionsRegistry;
-        const editorActions = new Map(editorRegistry.getEditorActions().map(({ id, label }) => [id, label]));
-        const { codeEditorService, textModelService, contextKeyService } = this;
-        const [, globalInstantiationService] = monaco.services.StaticServices.init({ codeEditorService, textModelService, contextKeyService });
-        const monacoCommands = monaco.commands.CommandsRegistry.getCommands();
+        const editorActions = new Map(editorExtensions_1.EditorExtensionsRegistry.getEditorActions().map(({ id, label }) => [id, label]));
+        const { codeEditorService } = this;
+        const globalInstantiationService = standaloneServices_1.StandaloneServices.initialize({});
+        const monacoCommands = commands_1.CommandsRegistry.getCommands();
         for (const id of monacoCommands.keys()) {
             if (MonacoCommands.EXCLUDE_ACTIONS.has(id)) {
                 continue;
@@ -128,13 +132,10 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
                         }
                         return action.run();
                     }
-                    const editorCommand = !!editorRegistry.getEditorCommand(id) ||
-                        !(id.startsWith('_execute') || id === 'setContext' || MonacoCommands.COMMON_ACTIONS.has(id));
-                    const instantiationService = editorCommand ? editor && editor['_instantiationService'] : globalInstantiationService;
-                    if (!instantiationService) {
+                    if (!globalInstantiationService) {
                         return;
                     }
-                    return instantiationService.invokeFunction(monacoCommands.get(id).handler, ...args);
+                    return globalInstantiationService.invokeFunction(monacoCommands.get(id).handler, ...args);
                 },
                 isEnabled: () => {
                     const editor = codeEditorService.getFocusedCodeEditor() || codeEditorService.getActiveCodeEditor();
@@ -142,7 +143,7 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
                         const action = editor && editor.getAction(id);
                         return !!action && action.isSupported();
                     }
-                    if (!!editorRegistry.getEditorCommand(id)) {
+                    if (!!editorExtensions_1.EditorExtensionsRegistry.getEditorCommand(id)) {
                         return !!editor;
                     }
                     return true;
@@ -168,7 +169,7 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
     newShowReferenceHandler() {
         return {
             execute: (editor, uri, position, locations) => {
-                editor.commandService.executeCommand('editor.action.showReferences', monaco.Uri.parse(uri), this.p2m.asPosition(position), locations.map(l => this.p2m.asLocation(l)));
+                standaloneServices_1.StandaloneServices.get(commands_1.ICommandService).executeCommand('editor.action.showReferences', monaco.Uri.parse(uri), this.p2m.asPosition(position), locations.map(l => this.p2m.asLocation(l)));
             }
         };
     }
@@ -202,10 +203,10 @@ let MonacoEditorCommandHandlers = class MonacoEditorCommandHandlers {
         const model = editor.document && editor.document.textEditorModel;
         if (model) {
             if (lineEnding === 'CRLF' || lineEnding === '\r\n') {
-                model.pushEOL(monaco.editor.EndOfLineSequence.CRLF);
+                model.pushEOL(1 /* CRLF */);
             }
             else {
-                model.pushEOL(monaco.editor.EndOfLineSequence.LF);
+                model.pushEOL(0 /* LF */);
             }
         }
     }
@@ -288,8 +289,8 @@ __decorate([
     __metadata("design:type", monaco_text_model_service_1.MonacoTextModelService)
 ], MonacoEditorCommandHandlers.prototype, "textModelService", void 0);
 __decorate([
-    (0, inversify_1.inject)(monaco.contextKeyService.ContextKeyService),
-    __metadata("design:type", monaco.contextKeyService.ContextKeyService)
+    (0, inversify_1.inject)(contextKeyService_1.ContextKeyService),
+    __metadata("design:type", contextKeyService_1.ContextKeyService)
 ], MonacoEditorCommandHandlers.prototype, "contextKeyService", void 0);
 __decorate([
     (0, inversify_1.inject)(browser_1.ApplicationShell),

package/lib/browser/monaco-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-command.js","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-command.js","sourceRoot":"","sources":["../../src/browser/monaco-command.ts"],"names":[],"mappings":"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"}

package/lib/browser/monaco-context-key-service.d.ts

@@ -1,19 +1,21 @@
-import { ContextKeyService, ContextKey, ContextKeyChangeEvent, ScopedValueStore } from '@theia/core/lib/browser/context-key-service';
+import { ContextKeyService as TheiaContextKeyService, ContextKey, ContextKeyChangeEvent, ScopedValueStore } from '@theia/core/lib/browser/context-key-service';
 import { Emitter } from '@theia/core';
-export declare class MonacoContextKeyService implements ContextKeyService {
+import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
+import { ContextKeyExpression, IContext } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
+export declare class MonacoContextKeyService implements TheiaContextKeyService {
     protected readonly onDidChangeEmitter: Emitter<ContextKeyChangeEvent>;
     readonly onDidChange: import("@theia/core").Event<ContextKeyChangeEvent>;
-    protected readonly contextKeyService: monaco.contextKeyService.ContextKeyService;
+    protected readonly contextKeyService: VSCodeContextKeyService;
     protected init(): void;
     createKey<T>(key: string, defaultValue: T | undefined): ContextKey<T>;
-    activeContext?: HTMLElement | monaco.contextKeyService.IContext;
+    activeContext?: HTMLElement | IContext;
     match(expression: string, context?: HTMLElement): boolean;
-    protected identifyContext(callersContext?: HTMLElement | monaco.contextKeyService.IContext): monaco.contextKeyService.IContext | undefined;
-    protected readonly expressions: Map<string, monaco.contextkey.ContextKeyExpression>;
-    protected parse(when: string): monaco.contextkey.ContextKeyExpression | undefined;
+    protected identifyContext(callersContext?: HTMLElement | IContext): IContext | undefined;
+    protected readonly expressions: Map<string, ContextKeyExpression>;
+    protected parse(when: string): ContextKeyExpression | undefined;
     parseKeys(expression: string): Set<string> | undefined;
     with<T>(values: Record<string, unknown>, callback: () => T): T;
-    createScoped(target?: HTMLElement): ScopedValueStore;
+    createScoped(target: HTMLElement): ScopedValueStore;
     setContext(key: string, value: unknown): void;
     dispose(): void;
 }

package/lib/browser/monaco-context-key-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-context-key-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-context-key-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AACrI,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,uBAAwB,YAAW,iBAAiB;IAC7D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,iCAAwC;IAC7E,QAAQ,CAAC,WAAW,qDAAiC;IAGrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;IAGjF,SAAS,CAAC,IAAI,IAAI,IAAI;IAQtB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC;IAIrE,aAAa,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC;IAEhE,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO;IASzD,SAAS,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAC,QAAQ,GAAG,MAAM,CAAC,iBAAiB,CAAC,QAAQ,GAAG,SAAS;IAa1I,SAAS,CAAC,QAAQ,CAAC,WAAW,sDAA6D;IAC3F,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,oBAAoB,GAAG,SAAS;IAWjF,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS;IAKtD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAgB9D,YAAY,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,gBAAgB;IAIpD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAI7C,OAAO,IAAI,IAAI;CAKlB"}
+{"version":3,"file":"monaco-context-key-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-context-key-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,IAAI,sBAAsB,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/J,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAA6B,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,gFAAgF,CAAC;AACzK,OAAO,EAAkB,oBAAoB,EAAE,QAAQ,EAAE,MAAM,wEAAwE,CAAC;AAExI,qBACa,uBAAwB,YAAW,sBAAsB;IAClE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,iCAAwC;IAC7E,QAAQ,CAAC,WAAW,qDAAiC;IAGrD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG9D,SAAS,CAAC,IAAI,IAAI,IAAI;IAQtB,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC;IAIrE,aAAa,CAAC,EAAE,WAAW,GAAG,QAAQ,CAAC;IAEvC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO;IAYzD,SAAS,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS;IAaxF,SAAS,CAAC,QAAQ,CAAC,WAAW,oCAA2C;IACzE,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;IAW/D,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS;IAKtD,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC;IAgB9D,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,gBAAgB;IAQnD,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI;IAI7C,OAAO,IAAI,IAAI;CAKlB"}

package/lib/browser/monaco-context-key-service.js

@@ -27,6 +27,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MonacoContextKeyService = void 0;
 const inversify_1 = require("@theia/core/shared/inversify");
 const core_1 = require("@theia/core");
+const contextKeyService_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService");
+const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
 let MonacoContextKeyService = class MonacoContextKeyService {
     constructor() {
         this.onDidChangeEmitter = new core_1.Emitter();
@@ -43,11 +45,14 @@ let MonacoContextKeyService = class MonacoContextKeyService {
     }
     match(expression, context) {
         const parsed = this.parse(expression);
-        const ctx = this.identifyContext(context);
-        if (!ctx) {
-            return this.contextKeyService.contextMatchesRules(parsed);
+        if (parsed) {
+            const ctx = this.identifyContext(context);
+            if (!ctx) {
+                return this.contextKeyService.contextMatchesRules(parsed);
+            }
+            return parsed.evaluate(ctx);
         }
-        return monaco.keybindings.KeybindingResolver.contextMatchesRules(ctx, parsed);
+        return true;
     }
     identifyContext(callersContext) {
         var _a;
@@ -66,7 +71,7 @@ let MonacoContextKeyService = class MonacoContextKeyService {
     parse(when) {
         let expression = this.expressions.get(when);
         if (!expression) {
-            expression = monaco.contextkey.ContextKeyExpr.deserialize(when);
+            expression = contextkey_1.ContextKeyExpr.deserialize(when);
             if (expression) {
                 this.expressions.set(when, expression);
             }
@@ -74,7 +79,7 @@ let MonacoContextKeyService = class MonacoContextKeyService {
         return expression;
     }
     parseKeys(expression) {
-        const expr = monaco.contextkey.ContextKeyExpr.deserialize(expression);
+        const expr = contextkey_1.ContextKeyExpr.deserialize(expression);
         return expr ? new Set(expr.keys()) : expr;
     }
     with(values, callback) {
@@ -94,7 +99,11 @@ let MonacoContextKeyService = class MonacoContextKeyService {
         }
     }
     createScoped(target) {
-        return this.contextKeyService.createScoped(target);
+        const scoped = this.contextKeyService.createScoped(target);
+        if (scoped instanceof contextKeyService_1.AbstractContextKeyService) {
+            return scoped;
+        }
+        return this;
     }
     setContext(key, value) {
         this.contextKeyService.setContext(key, value);
@@ -106,8 +115,8 @@ let MonacoContextKeyService = class MonacoContextKeyService {
     }
 };
 __decorate([
-    (0, inversify_1.inject)(monaco.contextKeyService.ContextKeyService),
-    __metadata("design:type", monaco.contextKeyService.ContextKeyService)
+    (0, inversify_1.inject)(contextKeyService_1.ContextKeyService),
+    __metadata("design:type", contextKeyService_1.ContextKeyService)
 ], MonacoContextKeyService.prototype, "contextKeyService", void 0);
 __decorate([
     (0, inversify_1.postConstruct)(),

package/lib/browser/monaco-context-key-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-context-key-service.js","sourceRoot":"","sources":["../../src/browser/monaco-context-key-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-context-key-service.js","sourceRoot":"","sources":["../../src/browser/monaco-context-key-service.ts"],"names":[],"mappings":"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"}

package/lib/browser/monaco-context-menu.d.ts

@@ -1,9 +1,15 @@
 import { MenuPath } from '@theia/core/lib/common/menu';
 import { ContextMenuRenderer } from '@theia/core/lib/browser';
-import IContextMenuService = monaco.editor.IContextMenuService;
-import IContextMenuDelegate = monaco.editor.IContextMenuDelegate;
+import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView';
+import { IContextMenuDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/contextmenu';
+import { Event, Emitter } from '@theia/monaco-editor-core/esm/vs/base/common/event';
 export declare class MonacoContextMenuService implements IContextMenuService {
     protected readonly contextMenuRenderer: ContextMenuRenderer;
+    readonly _serviceBrand: undefined;
+    protected readonly onDidShowContextMenuEmitter: Emitter<void>;
+    get onDidShowContextMenu(): Event<void>;
+    protected readonly onDidHideContextMenuEmitter: Emitter<void>;
+    get onDidHideContextMenu(): Event<void>;
     constructor(contextMenuRenderer: ContextMenuRenderer);
     showContextMenu(delegate: IContextMenuDelegate): void;
     protected menuPath(): MenuPath;

package/lib/browser/monaco-context-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-context-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAY,MAAM,yBAAyB,CAAC;AACxE,OAAO,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC;AAC/D,OAAO,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC;AAIjE,qBACa,wBAAyB,YAAW,mBAAmB;IAEvB,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;gBAAxC,mBAAmB,EAAE,mBAAmB;IAGpG,eAAe,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IAqCrD,SAAS,CAAC,QAAQ,IAAI,QAAQ;CAIjC"}
+{"version":3,"file":"monaco-context-menu.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,OAAO,EAAE,mBAAmB,EAAY,MAAM,yBAAyB,CAAC;AAGxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2EAA2E,CAAC;AAChH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AAEjG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,oDAAoD,CAAC;AAEpF,qBACa,wBAAyB,YAAW,mBAAmB;IAYvB,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB;IAXpG,SAAiB,aAAa,EAAE,SAAS,CAAC;IAE1C,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IACrE,IAAI,oBAAoB,IAAI,KAAK,CAAC,IAAI,CAAC,CAEtC;IACD,SAAS,CAAC,QAAQ,CAAC,2BAA2B,gBAAuB;IACrE,IAAI,oBAAoB,IAAI,KAAK,CAAC,IAAI,CAAC,CAEtC;gBAE2D,mBAAmB,EAAE,mBAAmB;IAGpG,eAAe,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IA0CrD,SAAS,CAAC,QAAQ,IAAI,QAAQ;CAIjC"}

package/lib/browser/monaco-context-menu.js

@@ -33,20 +33,37 @@ const browser_1 = require("@theia/editor/lib/browser");
 const browser_2 = require("@theia/core/lib/browser");
 const widgets_1 = require("@theia/core/shared/@phosphor/widgets");
 const commands_1 = require("@theia/core/shared/@phosphor/commands");
+const actions_1 = require("@theia/monaco-editor-core/esm/vs/platform/actions/common/actions");
+const event_1 = require("@theia/monaco-editor-core/esm/vs/base/common/event");
 let MonacoContextMenuService = class MonacoContextMenuService {
     constructor(contextMenuRenderer) {
         this.contextMenuRenderer = contextMenuRenderer;
+        this.onDidShowContextMenuEmitter = new event_1.Emitter();
+        this.onDidHideContextMenuEmitter = new event_1.Emitter();
     }
+    get onDidShowContextMenu() {
+        return this.onDidShowContextMenuEmitter.event;
+    }
+    ;
+    get onDidHideContextMenu() {
+        return this.onDidShowContextMenuEmitter.event;
+    }
+    ;
     showContextMenu(delegate) {
         const anchor = (0, browser_2.toAnchor)(delegate.getAnchor());
         const actions = delegate.getActions();
+        const onHide = () => {
+            var _a;
+            (_a = delegate.onHide) === null || _a === void 0 ? void 0 : _a.call(delegate, false);
+            this.onDidHideContextMenuEmitter.fire();
+        };
         // Actions for editor context menu come as 'MenuItemAction' items
         // In case of 'Quick Fix' actions come as 'CodeActionAction' items
-        if (actions.length > 0 && actions[0] instanceof monaco.actions.MenuItemAction) {
+        if (actions.length > 0 && actions[0] instanceof actions_1.MenuItemAction) {
             this.contextMenuRenderer.render({
                 menuPath: this.menuPath(),
                 anchor,
-                onHide: () => delegate.onHide(false)
+                onHide
             });
         }
         else {
@@ -59,7 +76,7 @@ let MonacoContextMenuService = class MonacoContextMenuService {
                 commands.addCommand(commandId, {
                     label: action.label,
                     className: action.class,
-                    isToggled: () => action.checked,
+                    isToggled: () => Boolean(action.checked),
                     isEnabled: () => action.enabled,
                     execute: () => action.run()
                 });
@@ -68,9 +85,10 @@ let MonacoContextMenuService = class MonacoContextMenuService {
                     command: commandId
                 });
             }
-            menu.aboutToClose.connect(() => delegate.onHide(false));
+            menu.aboutToClose.connect(() => onHide);
             menu.open(anchor.x, anchor.y);
         }
+        this.onDidShowContextMenuEmitter.fire();
     }
     menuPath() {
         return browser_1.EDITOR_CONTEXT_MENU;

package/lib/browser/monaco-context-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-context-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;;;AAEhF,4DAAkE;AAElE,uDAAgE;AAChE,qDAAwE;AAGxE,kEAA4D;AAC5D,oEAAwE;AAGxE,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAEjC,YAA4D,mBAAwC;QAAxC,wBAAmB,GAAnB,mBAAmB,CAAqB;IACpG,CAAC;IAED,eAAe,CAAC,QAA8B;QAC1C,MAAM,MAAM,GAAG,IAAA,kBAAQ,EAAC,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;QAEtC,iEAAiE;QACjE,kEAAkE;QAClE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE;YAC3E,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;gBAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE;gBACzB,MAAM;gBACN,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;aACvC,CAAC,CAAC;SACN;aAAM;YACH,MAAM,QAAQ,GAAG,IAAI,0BAAe,EAAE,CAAC;YACvC,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC;gBAClB,QAAQ;aACX,CAAC,CAAC;YAEH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;gBAC1B,MAAM,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxD,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE;oBAC3B,KAAK,EAAE,MAAM,CAAC,KAAK;oBACnB,SAAS,EAAE,MAAM,CAAC,KAAK;oBACvB,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO;oBAC/B,SAAS,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO;oBAC/B,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE;iBAC9B,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC;oBACT,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,SAAS;iBACrB,CAAC,CAAC;aACN;YACD,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACxD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;SACjC;IACL,CAAC;IAES,QAAQ;QACd,OAAO,6BAAmB,CAAC;IAC/B,CAAC;CAEJ,CAAA;AA9CY,wBAAwB;IADpC,IAAA,sBAAU,GAAE;IAGI,WAAA,IAAA,kBAAM,EAAC,6BAAmB,CAAC,CAAA;qCAAyC,6BAAmB;GAF3F,wBAAwB,CA8CpC;AA9CY,4DAAwB"}
+{"version":3,"file":"monaco-context-menu.js","sourceRoot":"","sources":["../../src/browser/monaco-context-menu.ts"],"names":[],"mappings":"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"}