@theia/plugin-ext 1.65.0-next.28 → 1.65.0-next.47

package/src/main/browser/webview/pre/main.js

@@ -250,9 +250,11 @@ delete window.frameElement;
             }
 
             let baseElement = event.view.document.getElementsByTagName('base')[0];
-            /** @type {any} */
-            let node = event.target;
-            while (node) {
+
+            // Use composedPath to get the event path through shadow DOM
+            const path = event.composedPath ? event.composedPath() : [event.target];
+
+            for (const node of path) {
                 if (node.tagName && node.tagName.toLowerCase() === 'a' && node.href) {
                     if (node.getAttribute('href') === '#') {
                         event.view.scrollTo(0, 0);
@@ -267,7 +269,6 @@ delete window.frameElement;
                     event.preventDefault();
                     break;
                 }
-                node = node.parentNode;
             }
         };
 
@@ -282,13 +283,14 @@ delete window.frameElement;
                 }
 
                 if (event.button === 1) {
-                    let node = /** @type {any} */ (event.target);
-                    while (node) {
+                    // Use composedPath to get the event path through shadow DOM
+                    const path = event.composedPath ? event.composedPath() : [event.target];
+
+                    for (const node of path) {
                         if (node.tagName && node.tagName.toLowerCase() === 'a' && node.href) {
                             event.preventDefault();
                             break;
                         }
-                        node = node.parentNode;
                     }
                 }
             };
@@ -354,16 +356,17 @@ delete window.frameElement;
             host.postMessage('did-context-menu', {
                 clientX: e.clientX,
                 clientY: e.clientY,
-                context: findVscodeContext(e.target)
+                context: findVscodeContext(e.composedPath(), 0)
             });
         };
 
-        function findVscodeContext(node) {
+        function findVscodeContext(nodes, index) {
+            const node = nodes[index];
             if (node) {
                 if (node.dataset?.vscodeContext) {
                     return JSON.parse(node.dataset.vscodeContext);
                 }
-                return findVscodeContext(node.parentElement);
+                return findVscodeContext(nodes, ++index);
             }
             return {};
         }

package/src/plugin/plugin-context.ts

@@ -240,7 +240,8 @@ import {
     TerminalCompletionItemKind,
     TerminalCompletionList,
     McpHttpServerDefinition,
-    McpStdioServerDefinition
+    McpStdioServerDefinition,
+    InteractiveWindowInput
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -333,7 +334,7 @@ export function createAPIFactory(
     const notebookRenderers = rpc.set(MAIN_RPC_CONTEXT.NOTEBOOK_RENDERERS_EXT, new NotebookRenderersExtImpl(rpc, notebooksExt));
     const notebookKernels = rpc.set(MAIN_RPC_CONTEXT.NOTEBOOK_KERNELS_EXT, new NotebookKernelsExtImpl(rpc, notebooksExt, commandRegistry, webviewExt, workspaceExt));
     const notebookDocuments = rpc.set(MAIN_RPC_CONTEXT.NOTEBOOK_DOCUMENTS_EXT, new NotebookDocumentsExtImpl(notebooksExt));
-    const statusBarMessageRegistryExt = new StatusBarMessageRegistryExt(rpc);
+    const statusBarMessageRegistryExt = new StatusBarMessageRegistryExt(rpc, commandRegistry);
     const terminalExt = rpc.set(MAIN_RPC_CONTEXT.TERMINAL_EXT, new TerminalServiceExtImpl(rpc));
     const outputChannelRegistryExt = rpc.set(MAIN_RPC_CONTEXT.OUTPUT_CHANNEL_REGISTRY_EXT, new OutputChannelRegistryExtImpl(rpc));
     const treeViewsExt = rpc.set(MAIN_RPC_CONTEXT.TREE_VIEWS_EXT, new TreeViewsExtImpl(rpc, commandRegistry));
@@ -1614,7 +1615,8 @@ export function createAPIFactory(
             TerminalCompletionItemKind,
             TerminalCompletionList,
             McpHttpServerDefinition,
-            McpStdioServerDefinition
+            McpStdioServerDefinition,
+            TabInputInteractiveWindow: InteractiveWindowInput,
         };
     };
 }

package/src/plugin/status-bar/status-bar-item.ts

@@ -17,6 +17,9 @@ import * as theia from '@theia/plugin';
 import { ThemeColor, StatusBarAlignment } from '../types-impl';
 import { StatusBarMessageRegistryMain } from '../../common/plugin-api-rpc';
 import { UUID } from '@theia/core/shared/@lumino/coreutils';
+import { CommandRegistryImpl } from '../command-registry';
+import { MarkdownString } from '../markdown-string';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
 
 export class StatusBarItemImpl implements theia.StatusBarItem {
 
@@ -45,6 +48,7 @@ export class StatusBarItemImpl implements theia.StatusBarItem {
     _proxy: StatusBarMessageRegistryMain;
 
     constructor(_proxy: StatusBarMessageRegistryMain,
+        private readonly commandRegistry: CommandRegistryImpl,
         alignment: StatusBarAlignment = StatusBarAlignment.Left,
         priority: number = 0,
         id = StatusBarItemImpl.nextId()) {
@@ -105,6 +109,56 @@ export class StatusBarItemImpl implements theia.StatusBarItem {
     }
 
     public set tooltip(tooltip: string | theia.MarkdownString | undefined) {
+        if (tooltip && MarkdownString.isMarkdownString(tooltip)) {
+            const markdownTooltip = tooltip;
+            const content = markdownTooltip.value;
+            // Find all command links in the markdown content
+            const regex = /\[([^\]]+)\]\(command:([^?\s\)]+)(?:\?([^\s\)]+))?([^\)]*)\)/g;
+            let match;
+            let updatedContent = content;
+
+            while ((match = regex.exec(content)) !== null) {
+                const linkText = match[1];
+                const commandId = match[2];
+                const argsEncoded = match[3]; // This captures the encoded arguments
+                const tooltipPart = match[4] || ''; // This captures any tooltip or additional content after the command and args
+
+                let args: unknown[] = [];
+                if (argsEncoded) {
+                    try {
+                        const decoded = decodeURIComponent(argsEncoded);
+                        args = JSON.parse(decoded);
+                    } catch (e) {
+                        console.error('Failed to parse command arguments:', e);
+                    }
+                }
+
+                const safeCommand = this.commandRegistry.converter.toSafeCommand(
+                    {
+                        command: commandId,
+                        title: linkText,
+                        arguments: Array.isArray(args) ? args : [args]
+                    },
+                    new DisposableCollection()
+                );
+
+                if (safeCommand?.id) {
+                    let newArgsPart = '';
+                    if (safeCommand.arguments && safeCommand.arguments.length > 0) {
+                        newArgsPart = `?${encodeURIComponent(JSON.stringify(safeCommand.arguments))}`;
+                    }
+
+                    const argsPart = argsEncoded ? `?${argsEncoded}` : '';
+                    const originalLink = `[${linkText}](command:${commandId}${argsPart}${tooltipPart})`;
+                    const safeLink = `[${linkText}](command:${safeCommand.id}${newArgsPart}${tooltipPart})`;
+                    updatedContent = updatedContent.replace(originalLink, safeLink);
+                }
+            }
+
+            if (updatedContent !== content) {
+                markdownTooltip.value = updatedContent;
+            }
+        }
         this._tooltip = tooltip;
         this.update();
     }

package/src/plugin/status-bar-message-registry.ts

@@ -20,6 +20,7 @@ import {
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { StatusBarItemImpl } from './status-bar/status-bar-item';
+import { CommandRegistryImpl } from './command-registry';
 
 /*---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
@@ -32,7 +33,7 @@ export class StatusBarMessageRegistryExt {
 
     protected readonly statusMessage: StatusBarMessage;
 
-    constructor(rpc: RPCProtocol) {
+    constructor(rpc: RPCProtocol, readonly commandRegistry: CommandRegistryImpl) {
         this.proxy = rpc.getProxy(Ext.STATUS_BAR_MESSAGE_REGISTRY_MAIN);
         this.statusMessage = new StatusBarMessage(this);
     }
@@ -58,7 +59,7 @@ export class StatusBarMessageRegistryExt {
     }
 
     createStatusBarItem(alignment?: StatusBarAlignment, priority?: number, id?: string): StatusBarItem {
-        return new StatusBarItemImpl(this.proxy, alignment, priority, id);
+        return new StatusBarItemImpl(this.proxy, this.commandRegistry, alignment, priority, id);
     }
 
 }