@theia/monaco 1.45.0 → 1.46.0-next.72

package/src/browser/monaco-command-registry.ts

@@ -1,82 +1,85 @@
-// *****************************************************************************
-// 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 { Command, CommandHandler, CommandRegistry, SelectionService } from '@theia/core';
-import { TextEditorSelection } from '@theia/editor/lib/browser';
-import { MonacoEditor } from './monaco-editor';
-import { MonacoEditorProvider } from './monaco-editor-provider';
-
-export interface MonacoEditorCommandHandler {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    execute(editor: MonacoEditor, ...args: any[]): any;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    isEnabled?(editor: MonacoEditor, ...args: any[]): boolean;
-}
-@injectable()
-export class MonacoCommandRegistry {
-
-    @inject(MonacoEditorProvider)
-    protected readonly monacoEditors: MonacoEditorProvider;
-
-    @inject(CommandRegistry) protected readonly commands: CommandRegistry;
-
-    @inject(SelectionService) protected readonly selectionService: SelectionService;
-
-    validate(command: string): string | undefined {
-        return this.commands.commandIds.indexOf(command) !== -1 ? command : undefined;
-    }
-
-    registerCommand(command: Command, handler: MonacoEditorCommandHandler): void {
-        this.commands.registerCommand({
-            ...command,
-            id: command.id
-        }, this.newHandler(handler));
-    }
-
-    registerHandler(command: string, handler: MonacoEditorCommandHandler): void {
-        this.commands.registerHandler(command, this.newHandler(handler));
-    }
-
-    protected newHandler(monacoHandler: MonacoEditorCommandHandler): CommandHandler {
-        return {
-            execute: (...args) => this.execute(monacoHandler, ...args),
-            isEnabled: (...args) => this.isEnabled(monacoHandler, ...args),
-            isVisible: (...args) => this.isVisible(monacoHandler, ...args)
-        };
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected execute(monacoHandler: MonacoEditorCommandHandler, ...args: any[]): any {
-        const editor = this.monacoEditors.current;
-        if (editor) {
-            return Promise.resolve(monacoHandler.execute(editor, ...args));
-        }
-        return Promise.resolve();
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected isEnabled(monacoHandler: MonacoEditorCommandHandler, ...args: any[]): boolean {
-        const editor = this.monacoEditors.current;
-        return !!editor && (!monacoHandler.isEnabled || monacoHandler.isEnabled(editor, ...args));
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected isVisible(monacoHandler: MonacoEditorCommandHandler, ...args: any[]): boolean {
-        return TextEditorSelection.is(this.selectionService.selection);
-    }
-
-}
+// *****************************************************************************
+// 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 { Command, CommandHandler, CommandRegistry, SelectionService } from '@theia/core';
+import { TextEditorSelection } from '@theia/editor/lib/browser';
+import { MonacoEditor } from './monaco-editor';
+import { MonacoEditorProvider } from './monaco-editor-provider';
+
+export interface MonacoEditorCommandHandler {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    execute(editor: MonacoEditor, ...args: any[]): any;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    isEnabled?(editor: MonacoEditor, ...args: any[]): boolean;
+}
+@injectable()
+export class MonacoCommandRegistry {
+
+    @inject(MonacoEditorProvider)
+    protected readonly monacoEditors: MonacoEditorProvider;
+
+    @inject(CommandRegistry) protected readonly commands: CommandRegistry;
+
+    @inject(SelectionService) protected readonly selectionService: SelectionService;
+
+    validate(command: string | undefined): string | undefined {
+        if (!command) {
+            return undefined;
+        }
+        return this.commands.commandIds.indexOf(command) !== -1 ? command : undefined;
+    }
+
+    registerCommand(command: Command, handler: MonacoEditorCommandHandler): void {
+        this.commands.registerCommand({
+            ...command,
+            id: command.id
+        }, this.newHandler(handler));
+    }
+
+    registerHandler(command: string, handler: MonacoEditorCommandHandler): void {
+        this.commands.registerHandler(command, this.newHandler(handler));
+    }
+
+    protected newHandler(monacoHandler: MonacoEditorCommandHandler): CommandHandler {
+        return {
+            execute: (...args) => this.execute(monacoHandler, ...args),
+            isEnabled: (...args) => this.isEnabled(monacoHandler, ...args),
+            isVisible: (...args) => this.isVisible(monacoHandler, ...args)
+        };
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    protected execute(monacoHandler: MonacoEditorCommandHandler, ...args: any[]): any {
+        const editor = this.monacoEditors.current;
+        if (editor) {
+            return Promise.resolve(monacoHandler.execute(editor, ...args));
+        }
+        return Promise.resolve();
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    protected isEnabled(monacoHandler: MonacoEditorCommandHandler, ...args: any[]): boolean {
+        const editor = this.monacoEditors.current;
+        return !!editor && (!monacoHandler.isEnabled || monacoHandler.isEnabled(editor, ...args));
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    protected isVisible(monacoHandler: MonacoEditorCommandHandler, ...args: any[]): boolean {
+        return TextEditorSelection.is(this.selectionService.selection);
+    }
+
+}

package/src/browser/monaco-command-service.ts

@@ -1,99 +1,90 @@
-// *****************************************************************************
-// 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 { inject, injectable } from '@theia/core/shared/inversify';
-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, 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 const MonacoCommandServiceFactory = Symbol('MonacoCommandServiceFactory');
-export interface MonacoCommandServiceFactory {
-    (): MonacoCommandService;
-}
-
-@injectable()
-export class MonacoCommandService implements ICommandService, Disposable {
-    declare readonly _serviceBrand: undefined; // Required for type compliance.
-    protected readonly onWillExecuteCommandEmitter = new Emitter<ICommandEvent>();
-    protected readonly onDidExecuteCommandEmitter = new Emitter<ICommandEvent>();
-    protected readonly toDispose = new DisposableCollection(
-        this.onWillExecuteCommandEmitter,
-        this.onDidExecuteCommandEmitter
-    );
-
-    protected delegate: StandaloneCommandService | undefined;
-    protected readonly delegateListeners = new DisposableCollection();
-
-    constructor(
-        @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry
-    ) {
-        this.toDispose.push(this.commandRegistry.onWillExecuteCommand(e => this.onWillExecuteCommandEmitter.fire(e)));
-        this.toDispose.push(this.commandRegistry.onDidExecuteCommand(e => this.onDidExecuteCommandEmitter.fire(e)));
-    }
-
-    dispose(): void {
-        this.toDispose.dispose();
-    }
-
-    get onWillExecuteCommand(): monaco.IEvent<ICommandEvent> {
-        return this.onWillExecuteCommandEmitter.event;
-    }
-
-    get onDidExecuteCommand(): monaco.IEvent<ICommandEvent> {
-        return this.onDidExecuteCommandEmitter.event;
-    }
-
-    setDelegate(delegate: StandaloneCommandService | undefined): void {
-        if (this.toDispose.disposed) {
-            return;
-        }
-        this.delegateListeners.dispose();
-        this.toDispose.push(this.delegateListeners);
-        this.delegate = delegate;
-        if (this.delegate) {
-            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
-    async executeCommand(commandId: any, ...args: any[]): Promise<any> {
-        try {
-            await this.commandRegistry.executeCommand(commandId, ...args);
-        } catch (e) {
-            if (e.code === 'NO_ACTIVE_HANDLER') {
-                return this.executeMonacoCommand(commandId, ...args);
-            }
-            throw e;
-        }
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async executeMonacoCommand(commandId: any, ...args: any[]): Promise<any> {
-        if (this.delegate) {
-            return this.delegate.executeCommand(commandId, ...args);
-        }
-        throw new Error(`command '${commandId}' not found`);
-    }
-
-}
+// *****************************************************************************
+// 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 { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+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, ICommandService } from '@theia/monaco-editor-core/esm/vs/platform/commands/common/commands';
+import { StandaloneCommandService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import * as monaco from '@theia/monaco-editor-core';
+import { IInstantiationService } from '@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
+
+@injectable()
+export class MonacoCommandService implements ICommandService, Disposable {
+    declare readonly _serviceBrand: undefined; // Required for type compliance.
+    protected readonly onWillExecuteCommandEmitter = new Emitter<ICommandEvent>();
+    protected readonly onDidExecuteCommandEmitter = new Emitter<ICommandEvent>();
+    protected readonly toDispose = new DisposableCollection(
+        this.onWillExecuteCommandEmitter,
+        this.onDidExecuteCommandEmitter
+    );
+
+    protected delegate: StandaloneCommandService | undefined;
+
+    constructor(
+        @inject(CommandRegistry) protected readonly commandRegistry: CommandRegistry
+    ) {
+        this.toDispose.push(this.commandRegistry.onWillExecuteCommand(e => this.onWillExecuteCommandEmitter.fire(e)));
+        this.toDispose.push(this.commandRegistry.onDidExecuteCommand(e => this.onDidExecuteCommandEmitter.fire(e)));
+    }
+
+    @postConstruct()
+    init(): void {
+        this.delegate = new StandaloneCommandService(StandaloneServices.get(IInstantiationService));
+        if (this.delegate) {
+            this.toDispose.push(this.delegate.onWillExecuteCommand(event =>
+                this.onWillExecuteCommandEmitter.fire(event)
+            ));
+            this.toDispose.push(this.delegate.onDidExecuteCommand(event =>
+                this.onDidExecuteCommandEmitter.fire(event)
+            ));
+        }
+    }
+
+    dispose(): void {
+        this.toDispose.dispose();
+    }
+
+    get onWillExecuteCommand(): monaco.IEvent<ICommandEvent> {
+        return this.onWillExecuteCommandEmitter.event;
+    }
+
+    get onDidExecuteCommand(): monaco.IEvent<ICommandEvent> {
+        return this.onDidExecuteCommandEmitter.event;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async executeCommand(commandId: any, ...args: any[]): Promise<any> {
+        try {
+            await this.commandRegistry.executeCommand(commandId, ...args);
+        } catch (e) {
+            if (e.code === 'NO_ACTIVE_HANDLER') {
+                return this.executeMonacoCommand(commandId, ...args);
+            }
+            throw e;
+        }
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    async executeMonacoCommand(commandId: any, ...args: any[]): Promise<any> {
+        if (this.delegate) {
+            return this.delegate.executeCommand(commandId, ...args);
+        }
+        throw new Error(`command '${commandId}' not found`);
+    }
+
+}