fixed terminal contribution menu and execution of vsx contributed com…

…mands

Signed-off-by: Jonah Iden <[email protected]>

packages/core/src/browser/shell/tab-bars.ts

@@ -616,7 +616,7 @@ export class TabBarRenderer extends TabBar.Renderer {
                 this.selectionService.selection = NavigatableWidget.is(widget) ? { uri: widget.getResourceUri() } : widget;
             }
 
-            const contextKeyServiceOverly = this.contextKeyService?.createOverlay([['tabContextWidgetId', widget?.id]]);
+            const contextKeyServiceOverly = this.contextKeyService?.createOverlay([['isTerminalTab', widget && '_terminalId' in widget]]);
             this.contextMenuRenderer.render({
                 menuPath: this.contextMenuPath!,
                 anchor: event,

packages/plugin-ext/src/main/browser/command-registry-main.ts

@@ -23,6 +23,9 @@ import { RPCProtocol } from '../../common/rpc-protocol';
 import { KeybindingRegistry } from '@theia/core/lib/browser';
 import { PluginContributionHandler } from './plugin-contribution-handler';
 import { ArgumentProcessor } from '../../common/commands';
+import { ContributionProvider } from '@theia/core';
+
+export const ArgumentProcessorContribution = Symbol('ArgumentProcessorContribution');
 
 export class CommandRegistryMainImpl implements CommandRegistryMain, Disposable {
     private readonly proxy: CommandRegistryExt;
@@ -41,6 +44,10 @@ export class CommandRegistryMainImpl implements CommandRegistryMain, Disposable
         this.delegate = container.get(CommandRegistry);
         this.keyBinding = container.get(KeybindingRegistry);
         this.contributions = container.get(PluginContributionHandler);
+
+        container.getNamed<ContributionProvider<ArgumentProcessor>>(ContributionProvider, ArgumentProcessorContribution).getContributions().forEach(processor => {
+            this.registerArgumentProcessor(processor);
+        });
     }
 
     dispose(): void {

packages/plugin-ext/src/main/browser/plugin-ext-frontend-module.ts

@@ -88,6 +88,7 @@ import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar
 import { CellOutputWebviewFactory } from '@theia/notebook/lib/browser';
 import { CellOutputWebviewImpl, createCellOutputWebviewContainer } from './notebooks/renderers/cell-output-webview';
 import { NotebookCellModel } from '@theia/notebook/lib/browser/view-model/notebook-cell-model';
+import { ArgumentProcessorContribution } from './command-registry-main';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
@@ -265,4 +266,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(CellOutputWebviewFactory).toFactory(ctx => async (cell: NotebookCellModel) =>
         createCellOutputWebviewContainer(ctx.container, cell).getAsync(CellOutputWebviewImpl)
     );
+
+    bindContributionProvider(bind, ArgumentProcessorContribution);
 });

packages/terminal/src/browser/terminal-frontend-contribution.ts

@@ -742,7 +742,7 @@ export class TerminalFrontendContribution implements FrontendApplicationContribu
 
         menus.registerSubmenu(TerminalMenus.TERMINAL_TITLE_CONTRIBUTIONS, '', {
             role: CompoundMenuNodeRole.Group,
-            when: 'tabContextWidgetId =~ /^terminal-[0-9]+$/'
+            when: 'isTerminalTab'
         });
     }
 

packages/vsx-registry/src/browser/vsx-extension-argument-processor.ts

@@ -0,0 +1,32 @@
+// *****************************************************************************
+// Copyright (C) 2024 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 } from '@theia/core/shared/inversify';
+import { ArgumentProcessor } from '@theia/plugin-ext/lib/common/commands';
+import { VSXExtension } from './vsx-extension';
+
+@injectable()
+export class VsxExtensionArgumentProcessor implements ArgumentProcessor {
+
+    processArgument(arg: unknown): unknown {
+        if (arg instanceof VSXExtension) {
+            return arg.id;
+        }
+
+        return arg;
+    }
+
+}

packages/vsx-registry/src/browser/vsx-registry-frontend-module.ts

@@ -36,6 +36,8 @@ import { bindPreferenceProviderOverrides } from './recommended-extensions/prefer
 import { VSXEnvironment, VSX_ENVIRONMENT_PATH } from '../common/vsx-environment';
 import { LanguageQuickPickService } from '@theia/core/lib/browser/i18n/language-quick-pick-service';
 import { VSXLanguageQuickPickService } from './vsx-language-quick-pick-service';
+import { VsxExtensionArgumentProcessor } from './vsx-extension-argument-processor';
+import { ArgumentProcessorContribution } from '@theia/plugin-ext/lib/main/browser/command-registry-main';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(VSXEnvironment)
@@ -103,4 +105,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
     bindExtensionPreferences(bind);
     bindPreferenceProviderOverrides(bind, unbind);
+
+    bind(VsxExtensionArgumentProcessor).toSelf().inSingletonScope();
+    bind(ArgumentProcessorContribution).toService(VsxExtensionArgumentProcessor);
 });