@theia/plugin-ext 1.18.0-next.d3501165 → 1.19.0

package/src/main/browser/quick-open-main.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { InputBoxOptions, QuickPickItem as QuickPickItemExt } from '@theia/plugin';
+import { InputBoxOptions } from '@theia/plugin';
 import { interfaces } from '@theia/core/shared/inversify';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import {
@@ -23,15 +23,17 @@ import {
     QuickOpenMain,
     MAIN_RPC_CONTEXT,
     TransferInputBox,
-    TransferQuickPick,
     TransferQuickPickItems,
     TransferQuickInput,
     TransferQuickInputButton
 } from '../../common/plugin-api-rpc';
 import {
-    InputOptions, PickOptions, QuickInputButton, QuickInputService, QuickPickItem, QuickPickValue
+    InputOptions,
+    PickOptions,
+    QuickInputButton,
+    QuickInputButtonHandle,
+    QuickInputService
 } from '@theia/core/lib/browser';
-import { QuickPickService } from '@theia/core/lib/common/quick-pick-service';
 import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { MonacoQuickInputService } from '@theia/monaco/lib/browser/monaco-quick-input-service';
@@ -47,7 +49,6 @@ export interface QuickInputSession {
 export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
 
     private quickInputService: QuickInputService;
-    private quickPickService: QuickPickService;
     private proxy: QuickOpenExt;
     private delegate: MonacoQuickInputService;
     private readonly items: Record<number, {
@@ -61,7 +62,6 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.QUICK_OPEN_EXT);
         this.delegate = container.get(MonacoQuickInputService);
         this.quickInputService = container.get(QuickInputService);
-        this.quickPickService = container.get(QuickPickService);
     }
 
     dispose(): void {
@@ -194,54 +194,55 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
 
     private sessions = new Map<number, QuickInputSession>();
 
-    $createOrUpdate<T extends theia.QuickPickItem>(params: TransferQuickInput<T>): Promise<void> {
+    $createOrUpdate<T extends theia.QuickPickItem>(params: TransferQuickInput): Promise<void> {
         const sessionId = params.id;
-        const session = this.sessions.get(sessionId);
-        // if (!session) {
-        //     if (params.type === 'quickPick') {
-        //         const quickPick = this.quickInputService.createQuickPick();
-        //         quickPick.onDidAccept(() => {
-        //             this.proxy.$acceptOnDidAccept(sessionId);
-        //         });
-        //         quickPick.onDidChangeActive((items: Array<monaco.quickInput.IQuickPickItem>) => {
-        //             this.proxy.$onDidChangeActive(sessionId, items.map(item => (item as TransferQuickPickItems).handle));
-        //         });
-        //         quickPick.onDidChangeSelection((items: Array<monaco.quickInput.IQuickPickItem>) => {
-        //             this.proxy.$onDidChangeSelection(sessionId, items.map(item => (item as TransferQuickPickItems).handle));
-        //         });
-        //         quickPick.onDidTriggerButton((button: QuickInputButtonHandle) => {
-        //             this.proxy.$acceptOnDidTriggerButton(sessionId, button);
-        //         });
-        //         quickPick.onDidChangeValue((value: string) => {
-        //             this.proxy.$acceptDidChangeValue(sessionId, value);
-        //         });
-        //         quickPick.onDidHide(() => {
-        //             this.proxy.$acceptOnDidHide(sessionId);
-        //         });
-        //         session = {
-        //             input: quickPick,
-        //             handlesToItems: new Map()
-        //         };
-        //     } else {
-        //         const inputBox = this.quickInputService.createInputBox();
-        //         inputBox.onDidAccept(() => {
-        //             this.proxy.$acceptOnDidAccept(sessionId);
-        //         });
-        //         inputBox.onDidTriggerButton((button: QuickInputButtonHandle) => {
-        //             this.proxy.$acceptOnDidTriggerButton(sessionId, button);
-        //         });
-        //         inputBox.onDidChangeValue((value: string) => {
-        //             this.proxy.$acceptDidChangeValue(sessionId, value);
-        //         });
-        //         inputBox.onDidHide(() => {
-        //             this.proxy.$acceptOnDidHide(sessionId);
-        //         });
-        //         session = {
-        //             input: inputBox,
-        //             handlesToItems: new Map()
-        //         };
-        //     }
-        // }
+        let session = this.sessions.get(sessionId);
+        if (!session) {
+            if (params.type === 'quickPick') {
+                const quickPick = this.quickInputService.createQuickPick();
+                quickPick.onDidAccept(() => {
+                    this.proxy.$acceptOnDidAccept(sessionId);
+                });
+                quickPick.onDidChangeActive((items: Array<monaco.quickInput.IQuickPickItem>) => {
+                    this.proxy.$onDidChangeActive(sessionId, items.map(item => (item as TransferQuickPickItems).handle));
+                });
+                quickPick.onDidChangeSelection((items: Array<monaco.quickInput.IQuickPickItem>) => {
+                    this.proxy.$onDidChangeSelection(sessionId, items.map(item => (item as TransferQuickPickItems).handle));
+                });
+                quickPick.onDidTriggerButton((button: QuickInputButtonHandle) => {
+                    this.proxy.$acceptOnDidTriggerButton(sessionId, button);
+                });
+                quickPick.onDidChangeValue((value: string) => {
+                    this.proxy.$acceptDidChangeValue(sessionId, value);
+                });
+                quickPick.onDidHide(() => {
+                    this.proxy.$acceptOnDidHide(sessionId);
+                });
+                session = {
+                    input: quickPick,
+                    handlesToItems: new Map()
+                };
+            } else {
+                const inputBox = this.quickInputService.createInputBox();
+                inputBox.onDidAccept(() => {
+                    this.proxy.$acceptOnDidAccept(sessionId);
+                });
+                inputBox.onDidTriggerButton((button: QuickInputButtonHandle) => {
+                    this.proxy.$acceptOnDidTriggerButton(sessionId, button);
+                });
+                inputBox.onDidChangeValue((value: string) => {
+                    this.proxy.$acceptDidChangeValue(sessionId, value);
+                });
+                inputBox.onDidHide(() => {
+                    this.proxy.$acceptOnDidHide(sessionId);
+                });
+                session = {
+                    input: inputBox,
+                    handlesToItems: new Map()
+                };
+            }
+            this.sessions.set(sessionId, session);
+        }
         if (session) {
             const { input, handlesToItems } = session;
             for (const param in params) {
@@ -297,47 +298,6 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
         return Promise.resolve(undefined);
     }
 
-    async $showCustomQuickPick<T extends QuickPickItemExt>(options: TransferQuickPick<T>): Promise<void> {
-        const sessionId = options.id;
-        const toDispose = new DisposableCollection();
-
-        toDispose.push(this.quickPickService.onDidAccept(() => {
-            this.proxy.$acceptOnDidAccept(sessionId);
-        }));
-        toDispose.push(this.quickPickService.onDidChangeActive((e: { quickPick: any, activeItems: Array<QuickPickValue<number>> }) => {
-            this.proxy.$onDidChangeActive(sessionId, e.activeItems.map(item => item.value!));
-        }));
-        toDispose.push(this.quickPickService.onDidChangeSelection((e: { quickPick: any, selectedItems: Array<QuickPickValue<number>> }) => {
-            this.proxy.$onDidChangeSelection(sessionId, e.selectedItems.map(item => item.value!));
-        }));
-        toDispose.push(this.quickPickService.onDidChangeValue((e: { quickPick: any, filter: string }) => {
-            this.proxy.$acceptDidChangeValue(sessionId, e.filter);
-        }));
-        toDispose.push(this.quickPickService.onDidTriggerButton(button => {
-            this.proxy.$acceptOnDidTriggerButton(sessionId, button);
-        }));
-        toDispose.push(this.quickPickService.onDidHide(() => {
-            this.proxy.$acceptOnDidHide(sessionId);
-            if (!toDispose.disposed) {
-                toDispose.dispose();
-            }
-        }));
-        this.toDispose.push(toDispose);
-
-        this.quickPickService.show(this.convertToQuickPickItem(options.items), {
-            buttons: options.buttons ? this.convertToQuickInputButtons(options.buttons) : [],
-            placeholder: options.placeholder,
-            matchOnDescription: options.matchOnDescription,
-            step: options.step,
-            title: options.title,
-            totalSteps: options.totalSteps,
-            ignoreFocusOut: options.ignoreFocusOut,
-            value: options.value,
-            matchOnLabel: true,
-            runIfSingle: false,
-        });
-    }
-
     $hide(): void {
         this.delegate.hide();
     }
@@ -351,21 +311,6 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
         return Promise.resolve(undefined);
     }
 
-    private convertToQuickPickItem(items: TransferQuickPickItems[] | undefined): Array<QuickPickItem> {
-        const convertedItems: QuickPickValue<number>[] = [];
-        if (items) {
-            for (const i of items) {
-                convertedItems.push({
-                    label: i.label,
-                    description: i.description,
-                    detail: i.detail,
-                    value: i.handle
-                });
-            }
-        }
-        return convertedItems;
-    }
-
     private convertToQuickInputButtons(buttons: Array<TransferQuickInputButton>): Array<QuickInputButton> {
         return buttons.map((button, i) => ({
             iconPath: getIconUris(button.iconPath),

package/src/main/browser/style/index.css

@@ -37,11 +37,7 @@
 .theia-plugin-view-container {
     -webkit-mask: url('');
     mask: url('');
-}
-
-.theia-plugin-test-tab-icon {
-    -webkit-mask: url('test.svg');
-    mask: url('test.svg');
+    background-color: var(--theia-activityBar-inactiveForeground);
 }
 
 .theia-plugin-file-icon,

package/src/main/browser/style/plugin-sidebar.css

@@ -30,7 +30,6 @@
 .theia-plugins .pluginHeaderContainer {
     padding: 5px 15px;
     font-size: var(--theia-ui-font-size0);
-    border-bottom: 1px solid;
 }
 
 .theia-side-panel .theia-plugins .pluginHeaderContainer {
@@ -48,6 +47,7 @@
 .theia-plugins .pluginName {
     flex: 1;
     margin-right: 5px;
+    margin-left: 4px;
     font-size: var(--theia-ui-font-size1);
     font-weight: 400;
 }

package/src/main/browser/timeline-main.ts

@@ -14,12 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { interfaces } from '@theia/core/shared/inversify';
-import { TimelineMain } from '../../common/plugin-api-rpc';
+import { MAIN_RPC_CONTEXT, TimelineExt, TimelineMain } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { TimelineService } from '@theia/timeline/lib/browser/timeline-service';
 import { Emitter } from '@theia/core/lib/common';
 import { URI } from '@theia/core/shared/vscode-uri';
-import { MAIN_RPC_CONTEXT, TimelineExt } from '../../common/plugin-api-rpc';
 import {
     InternalTimelineOptions,
     Timeline,

package/src/main/browser/view/plugin-view-registry.ts

@@ -16,9 +16,9 @@
 
 import { injectable, inject, postConstruct, optional } from '@theia/core/shared/inversify';
 import {
-    ApplicationShell, ViewContainer as ViewContainerWidget, WidgetManager,
+    ApplicationShell, ViewContainer as ViewContainerWidget, WidgetManager, QuickViewService,
     ViewContainerIdentifier, ViewContainerTitleOptions, Widget, FrontendApplicationContribution,
-    StatefulWidget, CommonMenus, BaseWidget, TreeViewWelcomeWidget
+    StatefulWidget, CommonMenus, BaseWidget, TreeViewWelcomeWidget, codicon, ViewContainerPart
 } from '@theia/core/lib/browser';
 import { ViewContainer, View, ViewWelcome } from '../../../common';
 import { PluginSharedStyle } from '../plugin-shared-style';
@@ -31,16 +31,15 @@ import { DebugFrontendApplicationContribution } from '@theia/debug/lib/browser/d
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
-import { QuickViewService } from '@theia/core/lib/browser';
 import { Emitter } from '@theia/core/lib/common/event';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
-import { SearchInWorkspaceWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-widget';
 import { ViewContextKeyService } from './view-context-key-service';
 import { PROBLEMS_WIDGET_ID } from '@theia/markers/lib/browser/problem/problem-widget';
 import { OUTPUT_WIDGET_KIND } from '@theia/output/lib/browser/output-widget';
 import { DebugConsoleContribution } from '@theia/debug/lib/browser/console/debug-console-contribution';
 import { TERMINAL_WIDGET_FACTORY_ID } from '@theia/terminal/lib/browser/terminal-widget-impl';
 import { TreeViewWidget } from './tree-view-widget';
+import { SEARCH_VIEW_CONTAINER_ID } from '@theia/search-in-workspace/lib/browser/search-in-workspace-factory';
 
 export const PLUGIN_VIEW_FACTORY_ID = 'plugin-view';
 export const PLUGIN_VIEW_CONTAINER_FACTORY_ID = 'plugin-view-container';
@@ -100,8 +99,8 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     protected init(): void {
         // VS Code Viewlets
         this.trackVisibleWidget(EXPLORER_VIEW_CONTAINER_ID, { viewletId: 'workbench.view.explorer' });
-        this.trackVisibleWidget(SearchInWorkspaceWidget.ID, { viewletId: 'workbench.view.search', sideArea: true });
         this.trackVisibleWidget(SCM_VIEW_CONTAINER_ID, { viewletId: 'workbench.view.scm' });
+        this.trackVisibleWidget(SEARCH_VIEW_CONTAINER_ID, { viewletId: 'workbench.view.search' });
         this.trackVisibleWidget(DebugWidget.ID, { viewletId: 'workbench.view.debug' });
         // TODO workbench.view.extensions - Theia does not have a proper extension view yet
 
@@ -111,7 +110,6 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         this.trackVisibleWidget(DebugConsoleContribution.options.id, { panelId: 'workbench.panel.repl' });
         this.trackVisibleWidget(TERMINAL_WIDGET_FACTORY_ID, { panelId: 'workbench.panel.terminal' });
         // TODO workbench.panel.comments - Theia does not have a proper comments view yet
-        this.trackVisibleWidget(SearchInWorkspaceWidget.ID, { panelId: 'workbench.view.search', sideArea: false });
 
         this.updateFocusedView();
         this.shell.onDidChangeActiveWidget(() => this.updateFocusedView());
@@ -123,6 +121,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             if (factoryId === SCM_VIEW_CONTAINER_ID && widget instanceof ViewContainerWidget) {
                 waitUntil(this.prepareViewContainer('scm', widget));
             }
+            if (factoryId === SEARCH_VIEW_CONTAINER_ID && widget instanceof ViewContainerWidget) {
+                waitUntil(this.prepareViewContainer('search', widget));
+            }
             if (factoryId === DebugWidget.ID && widget instanceof DebugWidget) {
                 const viewContainer = widget['sessionWidget']['viewContainer'];
                 waitUntil(this.prepareViewContainer('debug', viewContainer));
@@ -146,7 +147,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         });
         this.doRegisterViewContainer('test', 'left', {
             label: 'Test',
-            iconClass: 'theia-plugin-test-tab-icon',
+            iconClass: codicon('beaker'),
             closeable: true
         });
         this.contextKeyService.onDidChange(e => {
@@ -401,7 +402,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             return;
         }
         const [, view] = data;
-        widget.title.label = view.name;
+        if (!widget.title.label) {
+            widget.title.label = view.name;
+        }
         const currentDataWidget = widget.widgets[0];
         const viewDataWidget = await this.createViewDataWidget(view.id);
         if (widget.isDisposed) {
@@ -466,6 +469,14 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         }
         for (const viewId of this.getContainerViews(viewContainerId)) {
             const identifier = this.toPluginViewWidgetIdentifier(viewId);
+            // Keep existing widget in its current container and reregister its part to the plugin view widget events.
+            const existingWidget = this.widgetManager.tryGetWidget<PluginViewWidget>(PLUGIN_VIEW_FACTORY_ID, identifier);
+            if (existingWidget && existingWidget.currentViewContainerId) {
+                const currentContainer = await this.getPluginViewContainer(existingWidget.currentViewContainerId);
+                if (currentContainer && this.registerWidgetPartEvents(existingWidget, currentContainer)) {
+                    continue;
+                }
+            }
             const widget = await this.widgetManager.getOrCreateWidget<PluginViewWidget>(PLUGIN_VIEW_FACTORY_ID, identifier);
             if (containerWidget.getTrackableWidgets().indexOf(widget) === -1) {
                 containerWidget.addWidget(widget, {
@@ -473,27 +484,49 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
                     initiallyHidden: !this.isViewVisible(viewId)
                 });
             }
-            const part = containerWidget.getPartFor(widget);
-            if (part) {
-                // if a view is explicitly hidden then suppress updating visibility based on `when` closure
-                part.onDidChangeVisibility(() => widget.suppressUpdateViewVisibility = part.isHidden);
+            this.registerWidgetPartEvents(widget, containerWidget);
+        }
+    }
 
-                const tryFireOnDidExpandView = () => {
-                    if (widget.widgets.length === 0) {
-                        if (!part.collapsed && part.isVisible) {
-                            this.onDidExpandViewEmitter.fire(viewId);
-                        }
-                    } else {
-                        toFire.dispose();
+    protected registerWidgetPartEvents(widget: PluginViewWidget, containerWidget: ViewContainerWidget): ViewContainerPart | undefined {
+        const part = containerWidget.getPartFor(widget);
+        if (part) {
+
+            widget.currentViewContainerId = this.getViewContainerId(containerWidget);
+            part.onDidMove(event => { widget.currentViewContainerId = this.getViewContainerId(event); });
+
+            // if a view is explicitly hidden then suppress updating visibility based on `when` closure
+            part.onDidChangeVisibility(() => widget.suppressUpdateViewVisibility = part.isHidden);
+
+            const tryFireOnDidExpandView = () => {
+                if (widget.widgets.length === 0) {
+                    if (!part.collapsed && part.isVisible) {
+                        const viewId = this.toViewId(widget.options);
+                        this.onDidExpandViewEmitter.fire(viewId);
                     }
-                };
-                const toFire = new DisposableCollection(
-                    part.onCollapsed(tryFireOnDidExpandView),
-                    part.onDidChangeVisibility(tryFireOnDidExpandView)
-                );
+                } else {
+                    toFire.dispose();
+                }
+            };
+            const toFire = new DisposableCollection(
+                part.onCollapsed(tryFireOnDidExpandView),
+                part.onDidChangeVisibility(tryFireOnDidExpandView)
+            );
 
-                tryFireOnDidExpandView();
-            }
+            tryFireOnDidExpandView();
+            return part;
+        }
+    };
+
+    protected getViewContainerId(container: ViewContainerWidget): string | undefined {
+        const description = this.widgetManager.getDescription(container);
+        switch (description?.factoryId) {
+            case EXPLORER_VIEW_CONTAINER_ID: return 'explorer';
+            case SCM_VIEW_CONTAINER_ID: return 'scm';
+            case SEARCH_VIEW_CONTAINER_ID: return 'search';
+            case undefined: return container.parent?.parent instanceof DebugWidget ? 'debug' : container.id;
+            case PLUGIN_VIEW_CONTAINER_FACTORY_ID: return this.toViewContainerId(description.options);
+            default: return container.id;
         }
     }
 
@@ -504,6 +537,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         if (viewContainerId === 'scm') {
             return this.widgetManager.getWidget<ViewContainerWidget>(SCM_VIEW_CONTAINER_ID);
         }
+        if (viewContainerId === 'search') {
+            return this.widgetManager.getWidget<ViewContainerWidget>(SEARCH_VIEW_CONTAINER_ID);
+        }
         if (viewContainerId === 'debug') {
             const debug = await this.widgetManager.getWidget(DebugWidget.ID);
             if (debug instanceof DebugWidget) {
@@ -546,6 +582,12 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
                 await this.prepareViewContainer('scm', scm);
             }
         })().catch(console.error));
+        promises.push((async () => {
+            const search = await this.widgetManager.getWidget(SEARCH_VIEW_CONTAINER_ID);
+            if (search instanceof ViewContainerWidget) {
+                await this.prepareViewContainer('search', search);
+            }
+        })().catch(console.error));
         promises.push((async () => {
             const debug = await this.widgetManager.getWidget(DebugWidget.ID);
             if (debug instanceof DebugWidget) {

package/src/main/browser/view/plugin-view-widget.ts

@@ -46,6 +46,8 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
     @inject(PluginViewWidgetIdentifier)
     readonly options: PluginViewWidgetIdentifier;
 
+    currentViewContainerId: string | undefined;
+
     constructor() {
         super();
         this.node.tabIndex = -1;
@@ -75,7 +77,8 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
             label: this.title.label,
             message: this.message,
             widgets: this.widgets,
-            suppressUpdateViewVisibility: this._suppressUpdateViewVisibility
+            suppressUpdateViewVisibility: this._suppressUpdateViewVisibility,
+            currentViewContainerId: this.currentViewContainerId
         };
     }
 
@@ -83,6 +86,7 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         this.title.label = state.label;
         this.message = state.message;
         this.suppressUpdateViewVisibility = state.suppressUpdateViewVisibility;
+        this.currentViewContainerId = state.currentViewContainerId;
         for (const widget of state.widgets) {
             this.addWidget(widget);
         }
@@ -150,6 +154,7 @@ export namespace PluginViewWidget {
         label: string,
         message?: string,
         widgets: ReadonlyArray<Widget>,
-        suppressUpdateViewVisibility: boolean
+        suppressUpdateViewVisibility: boolean;
+        currentViewContainerId: string | undefined;
     }
 }

package/src/main/browser/view/tree-view-widget.tsx

@@ -16,7 +16,7 @@
 
 import { URI } from '@theia/core/shared/vscode-uri';
 import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { TreeViewsExt, TreeViewSelection } from '../../../common/plugin-api-rpc';
+import { TreeViewsExt, TreeViewItemCollapsibleState, TreeViewItem, TreeViewSelection } from '../../../common/plugin-api-rpc';
 import { Command } from '../../../common/plugin-api-rpc-model';
 import {
     TreeNode,
@@ -29,9 +29,10 @@ import {
     TREE_NODE_SEGMENT_GROW_CLASS,
     TREE_NODE_TAIL_CLASS,
     TreeModelImpl,
-    TreeViewWelcomeWidget
+    TreeViewWelcomeWidget,
+    TooltipService,
+    TooltipAttributes
 } from '@theia/core/lib/browser';
-import { TreeViewItem, TreeViewItemCollapsibleState } from '../../../common/plugin-api-rpc';
 import { MenuPath, MenuModelRegistry, ActionMenuNode } from '@theia/core/lib/common/menu';
 import * as React from '@theia/core/shared/react';
 import { PluginSharedStyle } from '../plugin-shared-style';
@@ -42,6 +43,8 @@ import { MessageService } from '@theia/core/lib/common/message-service';
 import { View } from '../../../common/plugin-protocol';
 import CoreURI from '@theia/core/lib/common/uri';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import * as markdownit from 'markdown-it';
+import { isMarkdownString } from '../../../plugin/markdown-string';
 
 export const TREE_NODE_HYPERLINK = 'theia-TreeNodeHyperlink';
 export const VIEW_ITEM_CONTEXT_MENU: MenuPath = ['view-item-context-menu'];
@@ -245,6 +248,9 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
+    @inject(TooltipService)
+    protected readonly tooltipService: TooltipService;
+
     protected readonly onDidChangeVisibilityEmitter = new Emitter<boolean>();
     readonly onDidChangeVisibility = this.onDidChangeVisibilityEmitter.event;
 
@@ -274,13 +280,32 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
             classes.push(TREE_NODE_SEGMENT_GROW_CLASS);
         }
         const className = classes.join(' ');
-        const title = node.tooltip ||
-            (node.resourceUri && this.labelProvider.getLongName(new CoreURI(node.resourceUri)))
-            || this.toNodeName(node);
-        const attrs = this.decorateCaption(node, {
-            className, id: node.id,
-            title
-        });
+
+        let attrs: React.HTMLAttributes<HTMLElement> & Partial<TooltipAttributes> = {
+            ...this.decorateCaption(node, {}),
+            className,
+            id: node.id
+        };
+
+        if (node.tooltip && isMarkdownString(node.tooltip)) {
+            // Render markdown in custom tooltip
+            const tooltip = markdownit().render(node.tooltip.value);
+
+            attrs = {
+                ...attrs,
+                'data-tip': tooltip,
+                'data-for': this.tooltipService.tooltipId
+            };
+        } else {
+            const title = node.tooltip ||
+                (node.resourceUri && this.labelProvider.getLongName(new CoreURI(node.resourceUri)))
+                || this.toNodeName(node);
+
+            attrs = {
+                ...attrs,
+                title
+            };
+        }
 
         const children: React.ReactNode[] = [];
         const caption = this.toNodeName(node);
@@ -294,43 +319,11 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         } else if (!highlight) {
             children.push(caption);
         }
-        return React.createElement('div', attrs, ...children);
-    }
-
-    protected getCaption(node: TreeNode): React.ReactNode {
-        const nodes: React.ReactNode[] = [];
-
-        const name = this.toNodeName(node) || '';
         const description = this.toNodeDescription(node);
-
-        let work = name;
-
-        const regex = /\[([^\[]+)\]\(([^\)]+)\)/g;
-        const matchResult = work.match(regex);
-
-        if (matchResult) {
-            matchResult.forEach((match, index) => {
-                nodes.push(<span key={`m${index}`}>{work.substring(0, work.indexOf(match))}</span>);
-
-                const execResult = regex.exec(name);
-                nodes.push(<a key={`l${index}`}
-                    href={execResult![2]}
-                    target='_blank'
-                    className={TREE_NODE_HYPERLINK}
-                    onClick={e => e.stopPropagation()}>{execResult![1]}</a>
-                );
-
-                work = work.substring(work.indexOf(match) + match.length);
-            });
+        if (description) {
+            children.push(<span className='theia-tree-view-description'>{description}</span>);
         }
-
-        return <div className='noWrapInfoTree'>
-            {...nodes}
-            {work && <span>{work}</span>}
-            {description && <span className='theia-tree-view-description'>
-                {description}
-            </span>}
-        </div>;
+        return React.createElement('div', attrs, ...children);
     }
 
     protected renderTailDecorations(node: TreeViewNode, props: NodeProps): React.ReactNode {
@@ -444,7 +437,9 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     }
 
     protected render(): React.ReactNode {
-        return React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
+        const node = React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
+        this.tooltipService.update();
+        return node;
     }
 
     protected renderSearchInfo(): React.ReactNode {

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

@@ -25,19 +25,27 @@
     const hostMessaging = new class HostMessaging {
         constructor() {
             this.handlers = new Map();
-            window.addEventListener('message', (e) => {
-                if (e.data && (e.data.command === 'onmessage' || e.data.command === 'do-update-state')) {
-                    // Came from inner iframe
-                    this.postMessage(e.data.command, e.data.data);
-                    return;
+            window.addEventListener('message', e => {
+                // Note: `window.parent === window` when there is no parent...
+                const sourceIsSelfOrParentFrame = e.source === window.parent;
+                let sourceIsChildFrame = false;
+                for (let i = 0; i < window.frames.length; i++) {
+                    const frame = window.frames[i];
+                    if (e.source === frame) {
+                        sourceIsChildFrame = true;
+                        break;
+                    }
                 }
-
-                const channel = e.data.channel;
-                const handler = this.handlers.get(channel);
-                if (handler) {
-                    handler(e, e.data.args);
-                } else {
-                    console.error('no handler for ', e);
+                if (sourceIsChildFrame && e.data && (e.data.command === 'onmessage' || e.data.command === 'do-update-state')) {
+                    this.postMessage(e.data.command, e.data.data);
+                } else if (sourceIsChildFrame || sourceIsSelfOrParentFrame) {
+                    const channel = e.data.channel;
+                    const handler = this.handlers.get(channel);
+                    if (handler) {
+                        handler(e, e.data.args);
+                    } else {
+                        console.error('no handler for ', e);
+                    }
                 }
             });
         }