@theia/monaco 1.45.0 → 1.46.0-next.72

package/src/browser/monaco-context-key-service.ts

@@ -1,143 +1,144 @@
-// *****************************************************************************
-// Copyright (C) 2019 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import {
-    ContextKeyService as TheiaContextKeyService, ContextKey, ContextKeyChangeEvent,
-    ScopedValueStore, ContextMatcher, ContextKeyValue
-} from '@theia/core/lib/browser/context-key-service';
-import { Emitter } from '@theia/core';
-import { AbstractContextKeyService, ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
-import { ContextKeyExpr, ContextKeyExpression, IContext, IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
-
-@injectable()
-export class MonacoContextKeyService implements TheiaContextKeyService {
-    protected readonly onDidChangeEmitter = new Emitter<ContextKeyChangeEvent>();
-    readonly onDidChange = this.onDidChangeEmitter.event;
-
-    @inject(VSCodeContextKeyService)
-    protected readonly contextKeyService: VSCodeContextKeyService;
-
-    @postConstruct()
-    protected init(): void {
-        this.contextKeyService.onDidChangeContext(e =>
-            this.onDidChangeEmitter.fire({
-                affects: keys => e.affectsSome(keys)
-            })
-        );
-    }
-
-    createKey<T extends ContextKeyValue>(key: string, defaultValue: T | undefined): ContextKey<T> {
-        return this.contextKeyService.createKey(key, defaultValue);
-    }
-
-    activeContext?: HTMLElement | IContext;
-
-    match(expression: string, context?: HTMLElement): boolean {
-        const parsed = this.parse(expression);
-        if (parsed) {
-            const ctx = this.identifyContext(context);
-            if (!ctx) {
-                return this.contextKeyService.contextMatchesRules(parsed);
-            }
-            return parsed.evaluate(ctx);
-        }
-        return true;
-    }
-
-    protected identifyContext(callersContext?: HTMLElement | IContext, service: IContextKeyService = this.contextKeyService): IContext | undefined {
-        if (callersContext && 'getValue' in callersContext) {
-            return callersContext;
-        } else if (this.activeContext && 'getValue' in this.activeContext) {
-            return this.activeContext;
-        }
-        const browserContext = callersContext ?? this.activeContext ?? (document.activeElement instanceof HTMLElement ? document.activeElement : undefined);
-        if (browserContext) {
-            return service.getContext(browserContext);
-        }
-        return undefined;
-    }
-
-    protected readonly expressions = new Map<string, ContextKeyExpression>();
-    parse(when: string): ContextKeyExpression | undefined {
-        let expression = this.expressions.get(when);
-        if (!expression) {
-            expression = ContextKeyExpr.deserialize(when);
-            if (expression) {
-                this.expressions.set(when, expression);
-            }
-        }
-        return expression;
-    }
-
-    parseKeys(expression: string): Set<string> | undefined {
-        const expr = ContextKeyExpr.deserialize(expression);
-        return expr ? new Set<string>(expr.keys()) : expr;
-    }
-
-    with<T>(values: Record<string, unknown>, callback: () => T): T {
-        const oldActive = this.activeContext;
-        const id = this.contextKeyService.createChildContext();
-        const child = this.contextKeyService.getContextValuesContainer(id);
-        for (const [key, value] of Object.entries(values)) {
-            child.setValue(key, value);
-        }
-        this.activeContext = child;
-        try {
-            return callback();
-        } finally {
-            this.activeContext = oldActive;
-            this.contextKeyService.disposeContext(id);
-        }
-    }
-
-    createScoped(target: HTMLElement): ScopedValueStore {
-        const scoped = this.contextKeyService.createScoped(target);
-        if (scoped instanceof AbstractContextKeyService) {
-            return scoped as AbstractContextKeyService & { createScoped(): ScopedValueStore };
-        }
-        return this;
-    }
-
-    createOverlay(overlay: Iterable<[string, unknown]>): ContextMatcher {
-        const delegate = this.contextKeyService.createOverlay(overlay);
-        return {
-            match: (expression: string, context?: HTMLElement) => {
-                const parsed = this.parse(expression);
-                if (parsed) {
-                    const ctx = this.identifyContext(context, delegate);
-                    if (!ctx) {
-                        return delegate.contextMatchesRules(parsed);
-                    }
-                    return parsed.evaluate(ctx);
-                }
-                return true;
-            },
-            dispose: () => delegate.dispose(),
-        };
-    }
-
-    setContext(key: string, value: unknown): void {
-        this.contextKeyService.setContext(key, value);
-    }
-
-    dispose(): void {
-        this.activeContext = undefined;
-        this.onDidChangeEmitter.dispose();
-        this.contextKeyService.dispose();
-    }
-}
-
+// *****************************************************************************
+// Copyright (C) 2019 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, postConstruct } from '@theia/core/shared/inversify';
+import {
+    ContextKeyService as TheiaContextKeyService, ContextKey, ContextKeyChangeEvent,
+    ScopedValueStore, ContextMatcher, ContextKeyValue
+} from '@theia/core/lib/browser/context-key-service';
+import { Emitter } from '@theia/core';
+import { AbstractContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
+import { ContextKeyExpr, ContextKeyExpression, IContext, IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+
+@injectable()
+export class MonacoContextKeyService implements TheiaContextKeyService {
+    protected readonly onDidChangeEmitter = new Emitter<ContextKeyChangeEvent>();
+    readonly onDidChange = this.onDidChangeEmitter.event;
+
+    get contextKeyService(): AbstractContextKeyService {
+        return StandaloneServices.get(IContextKeyService) as AbstractContextKeyService;
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.contextKeyService.onDidChangeContext(e =>
+            this.onDidChangeEmitter.fire({
+                affects: keys => e.affectsSome(keys)
+            })
+        );
+    }
+
+    createKey<T extends ContextKeyValue>(key: string, defaultValue: T | undefined): ContextKey<T> {
+        return this.contextKeyService.createKey(key, defaultValue);
+    }
+
+    activeContext?: HTMLElement | IContext;
+
+    match(expression: string, context?: HTMLElement): boolean {
+        const parsed = this.parse(expression);
+        if (parsed) {
+            const ctx = this.identifyContext(context);
+            if (!ctx) {
+                return this.contextKeyService.contextMatchesRules(parsed);
+            }
+            return parsed.evaluate(ctx);
+        }
+        return true;
+    }
+
+    protected identifyContext(callersContext?: HTMLElement | IContext, service: IContextKeyService = this.contextKeyService): IContext | undefined {
+        if (callersContext && 'getValue' in callersContext) {
+            return callersContext;
+        } else if (this.activeContext && 'getValue' in this.activeContext) {
+            return this.activeContext;
+        }
+        const browserContext = callersContext ?? this.activeContext ?? (document.activeElement instanceof HTMLElement ? document.activeElement : undefined);
+        if (browserContext) {
+            return service.getContext(browserContext);
+        }
+        return undefined;
+    }
+
+    protected readonly expressions = new Map<string, ContextKeyExpression>();
+    parse(when: string): ContextKeyExpression | undefined {
+        let expression = this.expressions.get(when);
+        if (!expression) {
+            expression = ContextKeyExpr.deserialize(when);
+            if (expression) {
+                this.expressions.set(when, expression);
+            }
+        }
+        return expression;
+    }
+
+    parseKeys(expression: string): Set<string> | undefined {
+        const expr = ContextKeyExpr.deserialize(expression);
+        return expr ? new Set<string>(expr.keys()) : expr;
+    }
+
+    with<T>(values: Record<string, unknown>, callback: () => T): T {
+        const oldActive = this.activeContext;
+        const id = this.contextKeyService.createChildContext();
+        const child = this.contextKeyService.getContextValuesContainer(id);
+        for (const [key, value] of Object.entries(values)) {
+            child.setValue(key, value);
+        }
+        this.activeContext = child;
+        try {
+            return callback();
+        } finally {
+            this.activeContext = oldActive;
+            this.contextKeyService.disposeContext(id);
+        }
+    }
+
+    createScoped(target: HTMLElement): ScopedValueStore {
+        const scoped = this.contextKeyService.createScoped(target);
+        if (scoped instanceof AbstractContextKeyService) {
+            return scoped as AbstractContextKeyService & { createScoped(): ScopedValueStore };
+        }
+        return this;
+    }
+
+    createOverlay(overlay: Iterable<[string, unknown]>): ContextMatcher {
+        const delegate = this.contextKeyService.createOverlay(overlay);
+        return {
+            match: (expression: string, context?: HTMLElement) => {
+                const parsed = this.parse(expression);
+                if (parsed) {
+                    const ctx = this.identifyContext(context, delegate);
+                    if (!ctx) {
+                        return delegate.contextMatchesRules(parsed);
+                    }
+                    return parsed.evaluate(ctx);
+                }
+                return true;
+            }
+        };
+    }
+
+    setContext(key: string, value: unknown): void {
+        this.contextKeyService.setContext(key, value);
+    }
+
+    dispose(): void {
+        this.activeContext = undefined;
+        this.onDidChangeEmitter.dispose();
+        this.contextKeyService.dispose();
+    }
+}
+

package/src/browser/monaco-context-menu.ts

@@ -1,90 +1,100 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import { injectable, inject } from '@theia/core/shared/inversify';
-import { MenuPath } from '@theia/core/lib/common/menu';
-import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
-import { ContextMenuRenderer, toAnchor } from '@theia/core/lib/browser';
-import { Menu } from '@theia/core/shared/@phosphor/widgets';
-import { CommandRegistry } from '@theia/core/shared/@phosphor/commands';
-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 { MenuItemAction } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions';
-import { Event, Emitter } from '@theia/monaco-editor-core/esm/vs/base/common/event';
-
-@injectable()
-export class MonacoContextMenuService implements IContextMenuService {
-    declare readonly _serviceBrand: undefined;
-
-    protected readonly onDidShowContextMenuEmitter = new Emitter<void>();
-    get onDidShowContextMenu(): Event<void> {
-        return this.onDidShowContextMenuEmitter.event;
-    };
-    protected readonly onDidHideContextMenuEmitter = new Emitter<void>();
-    get onDidHideContextMenu(): Event<void> {
-        return this.onDidShowContextMenuEmitter.event;
-    };
-
-    constructor(@inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer) {
-    }
-
-    showContextMenu(delegate: IContextMenuDelegate): void {
-        const anchor = toAnchor(delegate.getAnchor());
-        const actions = delegate.getActions();
-        const onHide = () => {
-            delegate.onHide?.(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 MenuItemAction) {
-            this.contextMenuRenderer.render({
-                menuPath: this.menuPath(),
-                anchor,
-                onHide
-            });
-        } else {
-            const commands = new CommandRegistry();
-            const menu = new Menu({
-                commands
-            });
-
-            for (const action of actions) {
-                const commandId = 'quickfix_' + actions.indexOf(action);
-                commands.addCommand(commandId, {
-                    label: action.label,
-                    className: action.class,
-                    isToggled: () => Boolean(action.checked),
-                    isEnabled: () => action.enabled,
-                    execute: () => action.run()
-                });
-                menu.addItem({
-                    type: 'command',
-                    command: commandId
-                });
-            }
-            menu.aboutToClose.connect(() => onHide());
-            menu.open(anchor.x, anchor.y);
-        }
-        this.onDidShowContextMenuEmitter.fire();
-    }
-
-    protected menuPath(): MenuPath {
-        return EDITOR_CONTEXT_MENU;
-    }
-
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { MenuPath } from '@theia/core/lib/common/menu';
+import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
+import { Anchor, ContextMenuRenderer, Coordinate } from '@theia/core/lib/browser';
+import { Menu } from '@theia/core/shared/@phosphor/widgets';
+import { CommandRegistry } from '@theia/core/shared/@phosphor/commands';
+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 { MenuItemAction } from '@theia/monaco-editor-core/esm/vs/platform/actions/common/actions';
+import { Event, Emitter } from '@theia/monaco-editor-core/esm/vs/base/common/event';
+import { StandardMouseEvent } from '@theia/monaco-editor-core/esm/vs/base/browser/mouseEvent';
+
+@injectable()
+export class MonacoContextMenuService implements IContextMenuService {
+    declare readonly _serviceBrand: undefined;
+
+    protected readonly onDidShowContextMenuEmitter = new Emitter<void>();
+    get onDidShowContextMenu(): Event<void> {
+        return this.onDidShowContextMenuEmitter.event;
+    };
+    protected readonly onDidHideContextMenuEmitter = new Emitter<void>();
+    get onDidHideContextMenu(): Event<void> {
+        return this.onDidShowContextMenuEmitter.event;
+    };
+
+    @inject(ContextMenuRenderer) protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+    toAnchor(anchor: HTMLElement | Coordinate | StandardMouseEvent): Anchor {
+        if (anchor instanceof HTMLElement) {
+            return { x: anchor.offsetLeft, y: anchor.offsetTop };
+        } else if (anchor instanceof StandardMouseEvent) {
+            return { x: anchor.posx, y: anchor.posy };
+        } else {
+            return anchor;
+        }
+    }
+
+    showContextMenu(delegate: IContextMenuDelegate): void {
+        const anchor = this.toAnchor(delegate.getAnchor());
+        const actions = delegate.getActions();
+        const onHide = () => {
+            delegate.onHide?.(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 MenuItemAction) {
+            this.contextMenuRenderer.render({
+                menuPath: this.menuPath(),
+                anchor,
+                onHide
+            });
+        } else {
+            const commands = new CommandRegistry();
+            const menu = new Menu({
+                commands
+            });
+
+            for (const action of actions) {
+                const commandId = 'quickfix_' + actions.indexOf(action);
+                commands.addCommand(commandId, {
+                    label: action.label,
+                    className: action.class,
+                    isToggled: () => Boolean(action.checked),
+                    isEnabled: () => action.enabled,
+                    execute: () => action.run()
+                });
+                menu.addItem({
+                    type: 'command',
+                    command: commandId
+                });
+            }
+            menu.aboutToClose.connect(() => onHide());
+            menu.open(anchor.x, anchor.y);
+        }
+        this.onDidShowContextMenuEmitter.fire();
+    }
+
+    protected menuPath(): MenuPath {
+        return EDITOR_CONTEXT_MENU;
+    }
+
+}