@theia/monaco 1.24.0-next.46 → 1.24.0-next.49

package/lib/browser/monaco-quick-input-service.d.ts

@@ -1,34 +1,55 @@
-/// <reference types="@theia/monaco-editor-core/monaco" />
-import { InputBox, InputOptions, KeybindingRegistry, PickOptions, QuickInputButton, QuickInputService, QuickPick, QuickPickItem, QuickPickItemHighlights, QuickPickOptions } from '@theia/core/lib/browser';
-import { CancellationToken, Event } from '@theia/core/lib/common';
-export declare class MonacoQuickInputImplementation implements monaco.quickInput.IQuickInputService {
-    controller: monaco.quickInput.QuickInputController;
-    quickAccess: monaco.quickInput.IQuickAccessController;
-    protected readonly contextKeyService: monaco.contextKeyService.ContextKeyService;
+import { InputBox, InputOptions, KeybindingRegistry, PickOptions, QuickInputButton, QuickInputService, QuickPick, QuickPickItem, QuickPickItemHighlights, QuickPickOptions, QuickPickSeparator } from '@theia/core/lib/browser';
+import { IInputBox, IInputOptions, IKeyMods, IPickOptions, IQuickInputButton, IQuickInputService, IQuickNavigateConfiguration, IQuickPick, IQuickPickItem, IQuickPickItemButtonEvent, IQuickPickSeparator, QuickPickInput } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickInput';
+import { IQuickInputStyles, QuickInputController } from '@theia/monaco-editor-core/esm/vs/base/parts/quickinput/browser/quickInput';
+import { IQuickAccessController } from '@theia/monaco-editor-core/esm/vs/platform/quickinput/common/quickAccess';
+import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
+import * as monaco from '@theia/monaco-editor-core';
+import { ResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings';
+import { IMatch } from '@theia/monaco-editor-core/esm/vs/base/common/filters';
+import { Event } from '@theia/core';
+export interface IListElement {
+    readonly index: number;
+    readonly item: IQuickPickItem;
+    readonly saneLabel: string;
+    readonly saneAriaLabel: string;
+    readonly saneDescription?: string;
+    readonly saneDetail?: string;
+    readonly labelHighlights?: IMatch[];
+    readonly descriptionHighlights?: IMatch[];
+    readonly detailHighlights?: IMatch[];
+    readonly checked: boolean;
+    readonly separator?: IQuickPickSeparator;
+    readonly fireButtonTriggered: (event: IQuickPickItemButtonEvent<IQuickPickItem>) => void;
+}
+export declare class MonacoQuickInputImplementation implements IQuickInputService {
+    readonly _serviceBrand: undefined;
+    controller: QuickInputController;
+    quickAccess: IQuickAccessController;
+    protected readonly contextKeyService: VSCodeContextKeyService;
     protected container: HTMLElement;
     private quickInputList;
-    get backButton(): monaco.quickInput.IQuickInputButton;
-    get onShow(): Event<void>;
-    get onHide(): Event<void>;
+    get backButton(): IQuickInputButton;
+    get onShow(): monaco.IEvent<void>;
+    get onHide(): monaco.IEvent<void>;
     constructor();
     setContextKey(key: string | undefined): void;
-    createQuickPick<T extends monaco.quickInput.IQuickPickItem>(): monaco.quickInput.IQuickPick<T>;
-    createInputBox(): monaco.quickInput.IInputBox;
+    createQuickPick<T extends IQuickPickItem>(): IQuickPick<T>;
+    createInputBox(): IInputBox;
     open(filter: string): void;
-    input(options?: monaco.quickInput.IInputOptions, token?: CancellationToken): Promise<string | undefined>;
-    pick<T extends monaco.quickInput.IQuickPickItem, O extends monaco.quickInput.IPickOptions<T>>(picks: Promise<T[]> | T[], options?: O, token?: CancellationToken): Promise<(O extends {
+    input(options?: IInputOptions, token?: monaco.CancellationToken): Promise<string | undefined>;
+    pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: O, token?: monaco.CancellationToken): Promise<(O extends {
         canPickMany: true;
     } ? T[] : T) | undefined>;
     hide(): void;
     focus(): void;
     toggle(): void;
-    applyStyles(styles: monaco.quickInput.IQuickInputStyles): void;
+    applyStyles(styles: IQuickInputStyles): void;
     layout(dimension: monaco.editor.IDimension, titleBarOffset: number): void;
-    navigate?(next: boolean, quickNavigate?: monaco.quickInput.IQuickNavigateConfiguration): void;
+    navigate(next: boolean, quickNavigate?: IQuickNavigateConfiguration): void;
     dispose(): void;
     cancel(): Promise<void>;
     back(): Promise<void>;
-    accept?(keyMods?: monaco.quickInput.IKeyMods): Promise<void>;
+    accept(keyMods?: IKeyMods): Promise<void>;
     private initContainer;
     private initController;
     private getOptions;
@@ -41,28 +62,28 @@ export declare class MonacoQuickInputService implements QuickInputService {
     get onHide(): Event<void>;
     open(filter: string): void;
     createInputBox(): InputBox;
-    input(options?: InputOptions, token?: CancellationToken): Promise<string | undefined>;
-    pick<T extends QuickPickItem, O extends PickOptions<T>>(picks: T[] | Promise<T[]>, options?: O, token?: CancellationToken): Promise<(O extends {
+    input(options?: InputOptions, token?: monaco.CancellationToken): Promise<string | undefined>;
+    pick<T extends QuickPickItem, O extends PickOptions<T> = PickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: O, token?: monaco.CancellationToken): Promise<(O extends {
         canPickMany: true;
     } ? T[] : T) | undefined>;
-    showQuickPick<T extends QuickPickItem>(items: T[], options?: QuickPickOptions<T>): Promise<T>;
+    showQuickPick<T extends QuickPickItem>(items: Array<T | QuickPickSeparator>, options?: QuickPickOptions<T>): Promise<T>;
     createQuickPick<T extends QuickPickItem>(): QuickPick<T>;
-    wrapQuickPick<T extends QuickPickItem>(wrapped: monaco.quickInput.IQuickPick<MonacoQuickPickItem<T>>): QuickPick<T>;
+    wrapQuickPick<T extends QuickPickItem>(wrapped: IQuickPick<MonacoQuickPickItem<T>>): QuickPick<T>;
     protected convertItems<T extends QuickPickItem>(item: T): MonacoQuickPickItem<T>;
     hide(): void;
 }
-export declare class MonacoQuickPickItem<T extends QuickPickItem> implements monaco.quickInput.IQuickPickItem {
+export declare class MonacoQuickPickItem<T extends QuickPickItem> implements IQuickPickItem {
     readonly item: T;
-    readonly type?: 'item' | 'separator';
+    readonly type?: 'item';
     readonly id?: string;
     readonly label: string;
     readonly meta?: string;
     readonly ariaLabel?: string;
     readonly description?: string;
     readonly detail?: string;
-    readonly keybinding?: monaco.keybindings.ResolvedKeybinding;
+    readonly keybinding?: ResolvedKeybinding;
     readonly iconClasses?: string[];
-    buttons?: monaco.quickInput.IQuickInputButton[];
+    buttons?: IQuickInputButton[];
     readonly alwaysShow?: boolean;
     readonly highlights?: QuickPickItemHighlights;
     constructor(item: T, kbRegistry: KeybindingRegistry);

package/lib/browser/monaco-quick-input-service.d.ts.map

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

package/lib/browser/monaco-quick-input-service.js

@@ -14,7 +14,6 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
-/* eslint-disable @typescript-eslint/no-explicit-any */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -38,14 +37,20 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MonacoQuickPickItem = exports.MonacoQuickInputService = exports.MonacoQuickInputImplementation = void 0;
 const browser_1 = require("@theia/core/lib/browser");
-const common_1 = require("@theia/core/lib/common");
 const inversify_1 = require("@theia/core/shared/inversify");
+const quickInput_1 = require("@theia/monaco-editor-core/esm/vs/base/parts/quickinput/browser/quickInput");
 const monaco_resolved_keybinding_1 = require("./monaco-resolved-keybinding");
+const quickAccess_1 = require("@theia/monaco-editor-core/esm/vs/platform/quickinput/browser/quickAccess");
+const contextKeyService_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService");
+const listWidget_1 = require("@theia/monaco-editor-core/esm/vs/base/browser/ui/list/listWidget");
+const instantiation_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation");
+const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
+const core_1 = require("@theia/core");
 let MonacoQuickInputImplementation = class MonacoQuickInputImplementation {
     constructor() {
         this.initContainer();
         this.initController();
-        this.quickAccess = new monaco.quickInput.QuickAccessController(this, monaco.services.StaticServices.instantiationService.get());
+        this.quickAccess = new quickAccess_1.QuickAccessController(this, standaloneServices_1.StandaloneServices.get(instantiation_1.IInstantiationService));
     }
     get backButton() { return this.controller.backButton; }
     get onShow() { return this.controller.onShow; }
@@ -70,7 +75,7 @@ let MonacoQuickInputImplementation = class MonacoQuickInputImplementation {
     input(options, token) {
         return this.controller.input(options, token);
     }
-    pick(picks, options = {}, token) {
+    pick(picks, options, token) {
         return this.controller.pick(picks, options, token);
     }
     hide() {
@@ -115,11 +120,20 @@ let MonacoQuickInputImplementation = class MonacoQuickInputImplementation {
         overlayWidgets.appendChild(container);
     }
     initController() {
-        this.controller = new monaco.quickInput.QuickInputController(this.getOptions());
+        this.controller = new quickInput_1.QuickInputController(this.getOptions());
         this.controller.layout({ width: 600, height: 1200 }, 0);
     }
     getOptions() {
-        return {
+        const styles = {
+            widget: {},
+            list: {},
+            inputBox: {},
+            countBadge: {},
+            button: {},
+            progressBar: {},
+            keybindingLabel: {},
+        };
+        const options = {
             idPrefix: 'quickInput_',
             container: this.container,
             ignoreFocusOut: () => false,
@@ -127,25 +141,15 @@ let MonacoQuickInputImplementation = class MonacoQuickInputImplementation {
             backKeybindingLabel: () => undefined,
             setContextKey: (id) => this.setContextKey(id),
             returnFocus: () => this.container.focus(),
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            createList: (user, container, delegate, renderers, options) => {
-                this.quickInputList = new monaco.list.List(user, container, delegate, renderers, options);
-                return this.quickInputList;
-            },
-            styles: {
-                widget: {},
-                list: {},
-                inputBox: {},
-                countBadge: {},
-                button: {},
-                progressBar: {}
-            }
+            createList: (user, container, delegate, renderers, listOptions) => this.quickInputList = new listWidget_1.List(user, container, delegate, renderers, listOptions),
+            styles,
         };
+        return options;
     }
 };
 __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)
 ], MonacoQuickInputImplementation.prototype, "contextKeyService", void 0);
 MonacoQuickInputImplementation = __decorate([
     (0, inversify_1.injectable)(),
@@ -175,8 +179,14 @@ let MonacoQuickInputService = class MonacoQuickInputService {
         }
         return this.monacoService.input(inputOptions, token);
     }
-    pick(picks, options, token) {
-        return this.monacoService.pick(picks, options, token);
+    async pick(picks, options = {}, token) {
+        const monacoPicks = (await picks).map(pick => {
+            if (pick.type === 'separator') {
+                return pick;
+            }
+            return this.convertItems(pick);
+        });
+        return this.monacoService.pick(monacoPicks, options, token); /* eslint-disable-line @typescript-eslint/no-explicit-any */
     }
     showQuickPick(items, options) {
         return new Promise((resolve, reject) => {
@@ -280,9 +290,9 @@ exports.MonacoQuickInputService = MonacoQuickInputService;
 class MonacoQuickInput {
     constructor(wrapped) {
         this.wrapped = wrapped;
-        this.onDidHide = this.wrapped.onDidHide;
-        this.onDispose = this.wrapped.onDispose;
     }
+    get onDidHide() { return this.wrapped.onDidHide; }
+    get onDispose() { return this.wrapped.onDispose; }
     get title() {
         return this.wrapped.title;
     }
@@ -349,12 +359,12 @@ class MonacoQuickPick extends MonacoQuickInput {
         this.onDidAccept = this.wrapped.onDidAccept;
         this.onDidChangeValue = this.wrapped.onDidChangeValue;
         this.onDidTriggerButton = this.wrapped.onDidTriggerButton;
-        this.onDidTriggerItemButton = common_1.Event.map(this.wrapped.onDidTriggerItemButton, (evt) => ({
+        this.onDidTriggerItemButton = core_1.Event.map(this.wrapped.onDidTriggerItemButton, (evt) => ({
             item: evt.item.item,
             button: evt.button
         }));
-        this.onDidChangeActive = common_1.Event.map(this.wrapped.onDidChangeActive, (items) => items.map(item => item.item));
-        this.onDidChangeSelection = common_1.Event.map(this.wrapped.onDidChangeSelection, (items) => items.map(item => item.item));
+        this.onDidChangeActive = core_1.Event.map(this.wrapped.onDidChangeActive, (items) => items.map(item => item.item));
+        this.onDidChangeSelection = core_1.Event.map(this.wrapped.onDidChangeSelection, (items) => items.map(item => item.item));
     }
     get value() {
         return this.wrapped.value;
@@ -408,6 +418,7 @@ class MonacoQuickPick extends MonacoQuickInput {
 }
 class MonacoQuickPickItem {
     constructor(item, kbRegistry) {
+        var _a;
         this.item = item;
         this.type = item.type;
         this.id = item.id;
@@ -418,7 +429,7 @@ class MonacoQuickPickItem {
         this.detail = item.detail;
         this.keybinding = item.keySequence ? new monaco_resolved_keybinding_1.MonacoResolvedKeybinding(item.keySequence, kbRegistry) : undefined;
         this.iconClasses = item.iconClasses;
-        this.buttons = item.buttons;
+        this.buttons = (_a = item.buttons) === null || _a === void 0 ? void 0 : _a.map(browser_1.QuickInputButton.normalize);
         this.alwaysShow = item.alwaysShow;
         this.highlights = item.highlights;
     }

package/lib/browser/monaco-quick-input-service.js.map

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

package/lib/browser/monaco-resolved-keybinding.d.ts

@@ -1,8 +1,9 @@
+import { ChordKeybinding, KeybindingModifier, ResolvedKeybinding, ResolvedKeybindingPart, ScanCodeBinding, SimpleKeybinding } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings';
 import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
 import { KeyCode, KeySequence } from '@theia/core/lib/browser/keys';
-export declare class MonacoResolvedKeybinding extends monaco.keybindings.ResolvedKeybinding {
+export declare class MonacoResolvedKeybinding extends ResolvedKeybinding {
     protected readonly keySequence: KeySequence;
-    protected readonly parts: monaco.keybindings.ResolvedKeybindingPart[];
+    protected readonly parts: ResolvedKeybindingPart[];
     constructor(keySequence: KeySequence, keybindingService: KeybindingRegistry);
     getLabel(): string | null;
     getAriaLabel(): string | null;
@@ -11,12 +12,13 @@ export declare class MonacoResolvedKeybinding extends monaco.keybindings.Resolve
     isWYSIWYG(): boolean;
     isChord(): boolean;
     getDispatchParts(): (string | null)[];
-    getSingleModifierDispatchParts(): (string | null)[];
+    getSingleModifierDispatchParts(): (KeybindingModifier | null)[];
+    protected getSingleModifierDispatchPart(code: KeyCode): KeybindingModifier | null;
     private toKeybinding;
-    getParts(): monaco.keybindings.ResolvedKeybindingPart[];
-    static toKeybinding(keybinding: monaco.keybindings.Keybinding): string;
-    static keyCode(keybinding: monaco.keybindings.SimpleKeybinding): KeyCode;
-    static keySequence(keybinding: monaco.keybindings.ChordKeybinding): KeySequence;
+    getParts(): ResolvedKeybindingPart[];
+    static toKeybinding(keybindings: Array<SimpleKeybinding | ScanCodeBinding>): string;
+    static keyCode(keybinding: SimpleKeybinding | ScanCodeBinding): KeyCode;
+    static keySequence(keybinding: ChordKeybinding): KeySequence;
     private static monaco2BrowserKeyCode;
 }
 //# sourceMappingURL=monaco-resolved-keybinding.d.ts.map

package/lib/browser/monaco-resolved-keybinding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-resolved-keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-resolved-keybinding.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,WAAW,EAA+B,MAAM,8BAA8B,CAAC;AAIjG,qBAAa,wBAAyB,SAAQ,MAAM,CAAC,WAAW,CAAC,kBAAkB;IAInE,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAFvD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,sBAAsB,EAAE,CAAC;gBAEvC,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,kBAAkB;IAiBvF,QAAQ,IAAI,MAAM,GAAG,IAAI;IAIzB,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,sBAAsB,IAAI,MAAM,GAAG,IAAI;IASvC,oBAAoB,IAAI,MAAM,GAAG,IAAI;IAIrC,SAAS,IAAI,OAAO;IAIpB,OAAO,IAAI,OAAO;IAIlB,gBAAgB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IAIrC,8BAA8B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IAI1D,OAAO,CAAC,YAAY;IAUb,QAAQ,IAAI,MAAM,CAAC,WAAW,CAAC,sBAAsB,EAAE;IAI9D,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU,GAAG,MAAM;IAMtE,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,gBAAgB,GAAG,OAAO;IAyBxE,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,eAAe,GAAG,WAAW;IAI/E,OAAO,CAAC,MAAM,CAAC,qBAAqB;CASvC"}
+{"version":3,"file":"monaco-resolved-keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-resolved-keybinding.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,eAAe,EAAE,gBAAgB,EACrH,MAAM,0DAA0D,CAAC;AAIlE,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,WAAW,EAA+B,MAAM,8BAA8B,CAAC;AAIjG,qBAAa,wBAAyB,SAAQ,kBAAkB;IAIhD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW;IAFvD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,EAAE,CAAC;gBAEpB,WAAW,EAAE,WAAW,EAAE,iBAAiB,EAAE,kBAAkB;IAiB9F,QAAQ,IAAI,MAAM,GAAG,IAAI;IAIzB,YAAY,IAAI,MAAM,GAAG,IAAI;IAI7B,sBAAsB,IAAI,MAAM,GAAG,IAAI;IASvC,oBAAoB,IAAI,MAAM,GAAG,IAAI;IAIrC,SAAS,IAAI,OAAO;IAIpB,OAAO,IAAI,OAAO;IAIlB,gBAAgB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE;IAIrC,8BAA8B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,EAAE;IAI/D,SAAS,CAAC,6BAA6B,CAAC,IAAI,EAAE,OAAO,GAAG,kBAAkB,GAAG,IAAI;IAmBjF,OAAO,CAAC,YAAY;IAUb,QAAQ,IAAI,sBAAsB,EAAE;IAI3C,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,CAAC,gBAAgB,GAAG,eAAe,CAAC,GAAG,MAAM;IAInF,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,gBAAgB,GAAG,eAAe,GAAG,OAAO;IAyBvE,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,eAAe,GAAG,WAAW;IAI5D,OAAO,CAAC,MAAM,CAAC,qBAAqB;CASvC"}

package/lib/browser/monaco-resolved-keybinding.js

@@ -16,10 +16,14 @@
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MonacoResolvedKeybinding = void 0;
+const keybindings_1 = require("@theia/monaco-editor-core/esm/vs/base/common/keybindings");
+const keybindingLabels_1 = require("@theia/monaco-editor-core/esm/vs/base/common/keybindingLabels");
+const usLayoutResolvedKeybinding_1 = require("@theia/monaco-editor-core/esm/vs/platform/keybinding/common/usLayoutResolvedKeybinding");
+const MonacoPlatform = require("@theia/monaco-editor-core/esm/vs/base/common/platform");
 const keys_1 = require("@theia/core/lib/browser/keys");
 const os_1 = require("@theia/core/lib/common/os");
 const monaco_keycode_map_1 = require("./monaco-keycode-map");
-class MonacoResolvedKeybinding extends monaco.keybindings.ResolvedKeybinding {
+class MonacoResolvedKeybinding extends keybindings_1.ResolvedKeybinding {
     constructor(keySequence, keybindingService) {
         super();
         this.keySequence = keySequence;
@@ -27,14 +31,14 @@ class MonacoResolvedKeybinding extends monaco.keybindings.ResolvedKeybinding {
             // eslint-disable-next-line no-null/no-null
             const keyLabel = keyCode.key ? keybindingService.acceleratorForKey(keyCode.key) : null;
             const keyAriaLabel = keyLabel;
-            return new monaco.keybindings.ResolvedKeybindingPart(keyCode.ctrl, keyCode.shift, keyCode.alt, keyCode.meta, keyLabel, keyAriaLabel);
+            return new keybindings_1.ResolvedKeybindingPart(keyCode.ctrl, keyCode.shift, keyCode.alt, keyCode.meta, keyLabel, keyAriaLabel);
         });
     }
     getLabel() {
-        return monaco.keybindings.UILabelProvider.toLabel(monaco.platform.OS, this.parts, p => p.keyLabel);
+        return keybindingLabels_1.UILabelProvider.toLabel(MonacoPlatform.OS, this.parts, p => p.keyLabel);
     }
     getAriaLabel() {
-        return monaco.keybindings.UILabelProvider.toLabel(monaco.platform.OS, this.parts, p => p.keyAriaLabel);
+        return keybindingLabels_1.UILabelProvider.toLabel(MonacoPlatform.OS, this.parts, p => p.keyAriaLabel);
     }
     getElectronAccelerator() {
         if (this.isChord()) {
@@ -42,10 +46,10 @@ class MonacoResolvedKeybinding extends monaco.keybindings.ResolvedKeybinding {
             // eslint-disable-next-line no-null/no-null
             return null;
         }
-        return monaco.keybindings.ElectronAcceleratorLabelProvider.toLabel(monaco.platform.OS, this.parts, p => p.keyLabel);
+        return keybindingLabels_1.ElectronAcceleratorLabelProvider.toLabel(MonacoPlatform.OS, this.parts, p => p.keyLabel);
     }
     getUserSettingsLabel() {
-        return monaco.keybindings.UserSettingsLabelProvider.toLabel(monaco.platform.OS, this.parts, p => p.keyLabel);
+        return keybindingLabels_1.UserSettingsLabelProvider.toLabel(MonacoPlatform.OS, this.parts, p => p.keyLabel);
     }
     isWYSIWYG() {
         return true;
@@ -54,24 +58,41 @@ class MonacoResolvedKeybinding extends monaco.keybindings.ResolvedKeybinding {
         return this.parts.length > 1;
     }
     getDispatchParts() {
-        return this.keySequence.map(keyCode => monaco.keybindings.USLayoutResolvedKeybinding.getDispatchStr(this.toKeybinding(keyCode)));
+        return this.keySequence.map(keyCode => usLayoutResolvedKeybinding_1.USLayoutResolvedKeybinding.getDispatchStr(this.toKeybinding(keyCode)));
     }
     getSingleModifierDispatchParts() {
-        return []; /* NOOP */
+        return this.keySequence.map(keybinding => this.getSingleModifierDispatchPart(keybinding));
+    }
+    getSingleModifierDispatchPart(code) {
+        var _a, _b, _c, _d, _e;
+        if (((_a = code.key) === null || _a === void 0 ? void 0 : _a.keyCode) === undefined) {
+            return null; // eslint-disable-line no-null/no-null
+        }
+        if (monaco_keycode_map_1.KEY_CODE_MAP[(_b = code.key) === null || _b === void 0 ? void 0 : _b.keyCode] === 5 /* Ctrl */ && !code.shift && !code.alt && !code.meta) {
+            return 'ctrl';
+        }
+        if (monaco_keycode_map_1.KEY_CODE_MAP[(_c = code.key) === null || _c === void 0 ? void 0 : _c.keyCode] === 4 /* Shift */ && !code.ctrl && !code.alt && !code.meta) {
+            return 'shift';
+        }
+        if (monaco_keycode_map_1.KEY_CODE_MAP[(_d = code.key) === null || _d === void 0 ? void 0 : _d.keyCode] === 6 /* Alt */ && !code.shift && !code.ctrl && !code.meta) {
+            return 'alt';
+        }
+        if (monaco_keycode_map_1.KEY_CODE_MAP[(_e = code.key) === null || _e === void 0 ? void 0 : _e.keyCode] === 57 /* Meta */ && !code.shift && !code.alt && !code.ctrl) {
+            return 'meta';
+        }
+        return null; // eslint-disable-line no-null/no-null
     }
     toKeybinding(keyCode) {
-        return new monaco.keybindings.SimpleKeybinding(keyCode.ctrl, keyCode.shift, keyCode.alt, keyCode.meta, monaco_keycode_map_1.KEY_CODE_MAP[keyCode.key.keyCode]);
+        return new keybindings_1.SimpleKeybinding(keyCode.ctrl, keyCode.shift, keyCode.alt, keyCode.meta, monaco_keycode_map_1.KEY_CODE_MAP[keyCode.key.keyCode]);
     }
     getParts() {
         return this.parts;
     }
-    static toKeybinding(keybinding) {
-        return keybinding instanceof monaco.keybindings.SimpleKeybinding
-            ? this.keyCode(keybinding).toString()
-            : this.keySequence(keybinding).join(' ');
+    static toKeybinding(keybindings) {
+        return keybindings.map(binding => this.keyCode(binding)).join(' ');
     }
     static keyCode(keybinding) {
-        const keyCode = keybinding.keyCode;
+        const keyCode = keybinding instanceof keybindings_1.SimpleKeybinding ? keybinding.keyCode : usLayoutResolvedKeybinding_1.USLayoutResolvedKeybinding['_scanCodeToKeyCode'](keybinding.scanCode);
         const sequence = {
             first: keys_1.Key.getKey(this.monaco2BrowserKeyCode(keyCode & 0xff)),
             modifiers: []

package/lib/browser/monaco-resolved-keybinding.js.map

@@ -1 +1 @@
-{"version":3,"file":"monaco-resolved-keybinding.js","sourceRoot":"","sources":["../../src/browser/monaco-resolved-keybinding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"monaco-resolved-keybinding.js","sourceRoot":"","sources":["../../src/browser/monaco-resolved-keybinding.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;;;AAGhF,0FAEkE;AAClE,oGAA6J;AAC7J,uIAAoI;AACpI,wFAAwF;AAExF,uDAAiG;AACjG,kDAAkD;AAClD,6DAAoD;AAEpD,MAAa,wBAAyB,SAAQ,gCAAkB;IAI5D,YAA+B,WAAwB,EAAE,iBAAqC;QAC1F,KAAK,EAAE,CAAC;QADmB,gBAAW,GAAX,WAAW,CAAa;QAEnD,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACnC,2CAA2C;YAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACvF,MAAM,YAAY,GAAG,QAAQ,CAAC;YAC9B,OAAO,IAAI,oCAAsB,CAC7B,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,IAAI,EACZ,QAAQ,EACR,YAAY,CACf,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,QAAQ;QACJ,OAAO,kCAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACnF,CAAC;IAED,YAAY;QACR,OAAO,kCAAe,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACvF,CAAC;IAED,sBAAsB;QAClB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;YAChB,gCAAgC;YAChC,2CAA2C;YAC3C,OAAO,IAAI,CAAC;SACf;QACD,OAAO,mDAAgC,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IACpG,CAAC;IAED,oBAAoB;QAChB,OAAO,4CAAyB,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7F,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,uDAA0B,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;IAED,8BAA8B;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,6BAA6B,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9F,CAAC;IAES,6BAA6B,CAAC,IAAa;;QACjD,IAAI,CAAA,MAAA,IAAI,CAAC,GAAG,0CAAE,OAAO,MAAK,SAAS,EAAE;YACjC,OAAO,IAAI,CAAC,CAAC,sCAAsC;SACtD;QACD,IAAI,iCAAY,CAAC,MAAA,IAAI,CAAC,GAAG,0CAAE,OAAO,CAAC,iBAAuB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAClG,OAAO,MAAM,CAAC;SACjB;QACD,IAAI,iCAAY,CAAC,MAAA,IAAI,CAAC,GAAG,0CAAE,OAAO,CAAC,kBAAwB,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAClG,OAAO,OAAO,CAAC;SAClB;QACD,IAAI,iCAAY,CAAC,MAAA,IAAI,CAAC,GAAG,0CAAE,OAAO,CAAC,gBAAsB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAClG,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,iCAAY,CAAC,MAAA,IAAI,CAAC,GAAG,0CAAE,OAAO,CAAC,kBAAuB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YAClG,OAAO,MAAM,CAAC;SACjB;QACD,OAAO,IAAI,CAAC,CAAC,sCAAsC;IACvD,CAAC;IAEO,YAAY,CAAC,OAAgB;QACjC,OAAO,IAAI,8BAAgB,CACvB,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,KAAK,EACb,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,IAAI,EACZ,iCAAY,CAAC,OAAO,CAAC,GAAI,CAAC,OAAO,CAAC,CACrC,CAAC;IACN,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,WAAsD;QACtE,OAAO,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,UAA8C;QACzD,MAAM,OAAO,GAAG,UAAU,YAAY,8BAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,uDAA0B,CAAC,oBAAoB,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QACpJ,MAAM,QAAQ,GAAc;YACxB,KAAK,EAAE,UAAG,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;YAC7D,SAAS,EAAE,EAAE;SAChB,CAAC;QACF,IAAI,UAAU,CAAC,OAAO,EAAE;YACpB,IAAI,UAAK,EAAE;gBACP,QAAQ,CAAC,SAAU,CAAC,IAAI,CAAC,kBAAW,CAAC,OAAO,CAAC,CAAC;aACjD;iBAAM;gBACH,QAAQ,CAAC,SAAU,CAAC,IAAI,CAAC,kBAAW,CAAC,OAAO,CAAC,CAAC;aACjD;SACJ;QACD,IAAI,UAAU,CAAC,QAAQ,EAAE;YACrB,QAAQ,CAAC,SAAU,CAAC,IAAI,CAAC,kBAAW,CAAC,KAAK,CAAC,CAAC;SAC/C;QACD,IAAI,UAAU,CAAC,MAAM,EAAE;YACnB,QAAQ,CAAC,SAAU,CAAC,IAAI,CAAC,kBAAW,CAAC,GAAG,CAAC,CAAC;SAC7C;QACD,IAAI,UAAU,CAAC,OAAO,IAAI,QAAQ,CAAC,SAAU,CAAC,OAAO,CAAC,kBAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;YAC/E,QAAQ,CAAC,SAAU,CAAC,IAAI,CAAC,kBAAW,CAAC,OAAO,CAAC,CAAC;SACjD;QACD,OAAO,cAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,UAA2B;QAC1C,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;IAEO,MAAM,CAAC,qBAAqB,CAAC,OAAsB;QACvD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iCAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC1C,IAAI,iCAAY,CAAC,CAAC,CAAC,KAAK,OAAO,EAAE;gBAC7B,OAAO,CAAC,CAAC;aACZ;SACJ;QACD,OAAO,CAAC,CAAC,CAAC;IACd,CAAC;CAEJ;AArID,4DAqIC"}

package/lib/browser/monaco-snippet-suggest-provider.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="@theia/monaco-editor-core/monaco" />
 import URI from '@theia/core/lib/common/uri';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import * as monaco from '@theia/monaco-editor-core';
 export declare class MonacoSnippetSuggestProvider implements monaco.languages.CompletionItemProvider {
     private static readonly _maxPrefix;
     protected readonly fileService: FileService;

package/lib/browser/monaco-snippet-suggest-provider.d.ts.map

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

package/lib/browser/monaco-snippet-suggest-provider.js

@@ -36,6 +36,8 @@ const uri_1 = require("@theia/core/lib/common/uri");
 const disposable_1 = require("@theia/core/lib/common/disposable");
 const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
 const files_1 = require("@theia/filesystem/lib/common/files");
+const monaco = require("@theia/monaco-editor-core");
+const snippetParser_1 = require("@theia/monaco-editor-core/esm/vs/editor/contrib/snippet/browser/snippetParser");
 let MonacoSnippetSuggestProvider = MonacoSnippetSuggestProvider_1 = class MonacoSnippetSuggestProvider {
     constructor() {
         this.snippets = new Map();
@@ -50,12 +52,12 @@ let MonacoSnippetSuggestProvider = MonacoSnippetSuggestProvider_1 = class Monaco
             // no snippets when suggestions have been triggered by space
             return undefined;
         }
-        const languageId = model.getModeId(); // TODO: look up a language id at the position
+        const languageId = model.getLanguageId(); // TODO: look up a language id at the position
         await this.loadSnippets(languageId);
         const snippetsForLanguage = this.snippets.get(languageId) || [];
         const pos = { lineNumber: position.lineNumber, column: 1 };
         const lineOffsets = [];
-        const linePrefixLow = model.getLineContent(position.lineNumber).substr(0, position.column - 1).toLowerCase();
+        const linePrefixLow = model.getLineContent(position.lineNumber).substring(0, position.column - 1).toLowerCase();
         const endsInWhitespace = linePrefixLow.match(/\s$/);
         while (pos.column < position.column) {
             const word = model.getWordAtPosition(pos);
@@ -257,7 +259,7 @@ class MonacoSnippetSuggestion {
     }
     resolve() {
         if (!this.resolved) {
-            const codeSnippet = new monaco.snippetParser.SnippetParser().parse(this.snippet.body).toString();
+            const codeSnippet = new snippetParser_1.SnippetParser().parse(this.snippet.body).toString();
             this.documentation = { value: '```\n' + codeSnippet + '```' };
             this.resolved = true;
         }