@theia/plugin-ext 1.65.0-next.19 → 1.65.0-next.39

package/src/main/{browser/webview → common}/webview-preferences.ts

@@ -15,20 +15,16 @@
 // *****************************************************************************
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
 import {
     createPreferenceProxy,
+    PreferenceContribution,
     PreferenceProxy,
+    PreferenceSchema,
     PreferenceService,
-    PreferenceContribution,
-    PreferenceSchema
-} from '@theia/core/lib/browser/preferences';
+} from '@theia/core/lib/common/preferences';
 import { nls } from '@theia/core/lib/common/nls';
 
-const frontendConfig = FrontendApplicationConfigProvider.get();
-
 export const WebviewConfigSchema: PreferenceSchema = {
-    type: 'object',
     properties: {
         'webview.trace': {
             type: 'string',
@@ -39,15 +35,6 @@ export const WebviewConfigSchema: PreferenceSchema = {
     }
 };
 
-if (frontendConfig.securityWarnings) {
-    WebviewConfigSchema.properties['webview.warnIfUnsecure'] = {
-        scope: 'application',
-        type: 'boolean',
-        description: nls.localize('theia/plugin-ext/webviewWarnIfUnsecure', 'Warns users that webviews are currently deployed unsecurely.'),
-        default: true,
-    };
-}
-
 export interface WebviewConfiguration {
     'webview.trace': 'off' | 'on' | 'verbose'
     'webview.warnIfUnsecure'?: boolean

package/src/main/node/plugin-ext-backend-module.ts

@@ -46,6 +46,7 @@ import { PluginRemoteCliContribution } from './plugin-remote-cli-contribution';
 import { RemoteCliContribution } from '@theia/core/lib/node/remote/remote-cli-contribution';
 import { PluginRemoteCopyContribution } from './plugin-remote-copy-contribution';
 import { RemoteCopyContribution } from '@theia/core/lib/node/remote/remote-copy-contribution';
+import { bindWebviewPreferences } from '../common/webview-preferences';
 
 export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
     bind(PluginApiContribution).toSelf().inSingletonScope();
@@ -102,5 +103,6 @@ export function bindMainBackend(bind: interfaces.Bind, unbind: interfaces.Unbind
     bind(BackendApplicationContribution).toService(WebviewBackendSecurityWarnings);
 
     rebind(LocalizationServerImpl).to(PluginLocalizationServer).inSingletonScope();
+    bindWebviewPreferences(bind);
 
 }

package/src/plugin/plugin-context.ts

@@ -333,7 +333,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));

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);
     }
 
 }

package/lib/main/browser/webview/webview-preferences.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"webview-preferences.d.ts","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview-preferences.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAEH,eAAe,EACf,iBAAiB,EAEjB,gBAAgB,EACnB,MAAM,qCAAqC,CAAC;AAK7C,eAAO,MAAM,mBAAmB,EAAE,gBAUjC,CAAC;AAWF,MAAM,WAAW,oBAAoB;IACjC,eAAe,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAAA;IACzC,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACrC;AAED,eAAO,MAAM,6BAA6B,eAA0C,CAAC;AACrF,eAAO,MAAM,kBAAkB,eAA+B,CAAC;AAC/D,MAAM,MAAM,kBAAkB,GAAG,eAAe,CAAC,oBAAoB,CAAC,CAAC;AAEvE,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,iBAAiB,EAAE,MAAM,GAAE,gBAAsC,GAAG,kBAAkB,CAE3I;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAQlE"}

package/lib/main/browser/webview/webview-preferences.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"webview-preferences.js","sourceRoot":"","sources":["../../../../src/main/browser/webview/webview-preferences.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,gFAAgF;AAChF,gFAAgF;;;AAGhF,uHAAiH;AACjH,qEAM6C;AAC7C,oDAAiD;AAEjD,MAAM,cAAc,GAAG,wEAAiC,CAAC,GAAG,EAAE,CAAC;AAElD,QAAA,mBAAmB,GAAqB;IACjD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,eAAe,EAAE;YACb,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC;YAC9B,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,+BAA+B,EAAE,+CAA+C,CAAC;YAC3G,OAAO,EAAE,KAAK;SACjB;KACJ;CACJ,CAAC;AAEF,IAAI,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAClC,2BAAmB,CAAC,UAAU,CAAC,wBAAwB,CAAC,GAAG;QACvD,KAAK,EAAE,aAAa;QACpB,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,SAAG,CAAC,QAAQ,CAAC,wCAAwC,EAAE,8DAA8D,CAAC;QACnI,OAAO,EAAE,IAAI;KAChB,CAAC;AACN,CAAC;AAOY,QAAA,6BAA6B,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AACxE,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAG/D,SAAgB,wBAAwB,CAAC,WAA8B,EAAE,SAA2B,2BAAmB;IACnH,OAAO,IAAA,mCAAqB,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAFD,4DAEC;AAED,SAAgB,sBAAsB,CAAC,IAAqB;IACxD,IAAI,CAAC,0BAAkB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC1C,MAAM,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAoB,+BAAiB,CAAC,CAAC;QAC5E,MAAM,YAAY,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAyB,qCAA6B,CAAC,CAAC;QAC9F,OAAO,wBAAwB,CAAC,WAAW,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACtB,IAAI,CAAC,qCAA6B,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,2BAAmB,EAAE,CAAC,CAAC;IACrF,IAAI,CAAC,oCAAsB,CAAC,CAAC,SAAS,CAAC,qCAA6B,CAAC,CAAC;AAC1E,CAAC;AARD,wDAQC"}