@theia/plugin-ext 1.18.0-next.73c11a11 → 1.18.0-next.77

package/src/main/browser/debug/plugin-debug-adapter-contribution.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { DebugExt, } from '../../../common/plugin-api-rpc';
+import { DebugExt } from '../../../common/plugin-api-rpc';
 import { DebugConfiguration } from '@theia/debug/lib/common/debug-configuration';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
@@ -37,8 +37,8 @@ export class PluginDebugAdapterContribution {
         return this.description.label;
     }
 
-    async provideDebugConfigurations(workspaceFolderUri: string | undefined): Promise<DebugConfiguration[]> {
-        return this.debugExt.$provideDebugConfigurations(this.type, workspaceFolderUri);
+    async provideDebugConfigurations(workspaceFolderUri: string | undefined, dynamic: boolean = false): Promise<DebugConfiguration[]> {
+        return this.debugExt.$provideDebugConfigurations(this.type, workspaceFolderUri, dynamic);
     }
 
     async resolveDebugConfiguration(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration | undefined> {

package/src/main/browser/debug/plugin-debug-service.ts

@@ -25,6 +25,7 @@ import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { DebuggerContribution } from '../../../common/plugin-protocol';
 import { DebugRequestTypes } from '@theia/debug/lib/browser/debug-session-connection';
 import * as theia from '@theia/plugin';
+
 /**
  * Debug adapter contribution registrator.
  */
@@ -111,6 +112,28 @@ export class PluginDebugService implements DebugService, PluginDebugAdapterContr
         }
     }
 
+    async provideDynamicDebugConfigurations(): Promise<{ type: string, configurations: DebugConfiguration[] }[]> {
+        const result: Promise<{ type: string, configurations: theia.DebugConfiguration[] }>[] = [];
+
+        for (const [type, contributor] of this.contributors.entries()) {
+            const typeConfigurations = this.resolveDynamicConfigurationsForType(type, contributor);
+            result.push(typeConfigurations);
+        }
+
+        return Promise.all(result);
+    }
+
+    protected async resolveDynamicConfigurationsForType(
+        type: string,
+        contributor: PluginDebugAdapterContribution): Promise<{ type: string, configurations: DebugConfiguration[] }> {
+
+        const configurations = await contributor.provideDebugConfigurations(undefined, true);
+        for (const configuration of configurations) {
+            configuration.dynamic = true;
+        }
+        return { type, configurations };
+    }
+
     async resolveDebugConfiguration(config: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<DebugConfiguration> {
         let resolved = config;
 

package/src/main/browser/dialogs/modal-notification.ts

@@ -15,7 +15,7 @@
  ********************************************************************************/
 import { injectable } from '@theia/core/shared/inversify';
 import { Message } from '@theia/core/shared/@phosphor/messaging';
-import { Key } from '@theia/core/lib/browser';
+import { codiconArray, Key } from '@theia/core/lib/browser';
 import { AbstractDialog } from '@theia/core/lib/browser/dialogs';
 import '../../../../src/main/browser/dialogs/style/modal-notification.css';
 import { MainMessageItem } from '../../../common/plugin-api-rpc';
@@ -60,7 +60,7 @@ export class ModalNotification extends AbstractDialog<string | undefined> {
         const iconContainer = messageNode.appendChild(document.createElement('div'));
         iconContainer.classList.add(ICON);
         const iconElement = iconContainer.appendChild(document.createElement('i'));
-        iconElement.classList.add('fa', this.toIconClass(messageType), 'fa-fw', messageType.toString());
+        iconElement.classList.add(...this.toIconClass(messageType), messageType.toString());
 
         const textContainer = messageNode.appendChild(document.createElement('div'));
         textContainer.classList.add(TEXT);
@@ -86,13 +86,13 @@ export class ModalNotification extends AbstractDialog<string | undefined> {
         return messageNode;
     }
 
-    protected toIconClass(icon: MessageType): string {
+    protected toIconClass(icon: MessageType): string[] {
         if (icon === MessageType.Error) {
-            return 'fa-times-circle';
+            return codiconArray('error');
         }
         if (icon === MessageType.Warning) {
-            return 'fa-warning';
+            return codiconArray('warning');
         }
-        return 'fa-info-circle';
+        return codiconArray('info');
     }
 }

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

@@ -21,7 +21,7 @@ import '../../../src/main/browser/style/comments.css';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import {
     FrontendApplicationContribution, WidgetFactory, bindViewContribution,
-    ViewContainerIdentifier, ViewContainer, createTreeContainer, TreeImpl, TreeWidget, TreeModelImpl, LabelProviderContribution, TreeProps
+    ViewContainerIdentifier, ViewContainer, createTreeContainer, TreeImpl, TreeWidget, TreeModelImpl, LabelProviderContribution
 } from '@theia/core/lib/browser';
 import { MaybePromise, CommandContribution, ResourceResolver, bindContributionProvider } from '@theia/core/lib/common';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging';
@@ -147,10 +147,12 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
         createWidget: (identifier: TreeViewWidgetIdentifier) => {
             const child = createTreeContainer(container, {
                 contextMenuPath: VIEW_ITEM_CONTEXT_MENU,
-                search: true,
-                globalSelection: true
+                expandOnlyOnExpansionToggleClick: true,
+                expansionTogglePadding: 22,
+                globalSelection: true,
+                leftPadding: 8,
+                search: true
             });
-            child.rebind(TreeProps).toConstantValue({ leftPadding: 8, expansionTogglePadding: 22, expandOnlyOnExpansionToggleClick: true, });
             child.bind(TreeViewWidgetIdentifier).toConstantValue(identifier);
             child.bind(PluginTree).toSelf();
             child.rebind(TreeImpl).toService(PluginTree);

package/src/main/browser/plugin-ext-widget.tsx

@@ -23,6 +23,7 @@ import { AlertMessage } from '@theia/core/lib/browser/widgets/alert-message';
 import { HostedPluginSupport, PluginProgressLocation } from '../../hosted/browser/hosted-plugin';
 import { ProgressBarFactory } from '@theia/core/lib/browser/progress-bar-factory';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { codicon } from '@theia/core/lib/browser';
 
 @injectable()
 export class PluginWidget extends ReactWidget {
@@ -38,7 +39,7 @@ export class PluginWidget extends ReactWidget {
         this.id = 'plugins';
         this.title.label = 'Plugins';
         this.title.caption = 'Plugins';
-        this.title.iconClass = 'fa plugins-tab-icon';
+        this.title.iconClass = codicon('diff-added');
         this.title.closable = true;
         this.node.tabIndex = 0;
         this.addClass('theia-plugins');
@@ -86,7 +87,7 @@ export class PluginWidget extends ReactWidget {
         return <div key={plugin.model.name} className={this.createPluginClassName(plugin)}>
             <div className='column flexcontainer pluginInformationContainer'>
                 <div className='row flexcontainer'>
-                    <div className='fa fa-puzzle-piece fa-2x fa-fw'></div>
+                    <div className={codicon('list-selection')}></div>
                     <div title={plugin.model.name} className='pluginName noWrapInfo'>{plugin.model.name}</div>
                 </div>
                 <div className='row flexcontainer'>

package/src/main/browser/plugin-icon-theme-service.ts

@@ -36,6 +36,7 @@ import { WorkspaceRootNode } from '@theia/navigator/lib/browser/navigator-tree';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileStat, FileChangeType } from '@theia/filesystem/lib/common/files';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
 
 export interface PluginIconDefinition {
     iconPath: string;
@@ -107,6 +108,9 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
     @inject(PluginIconThemeDefinition)
     protected readonly definition: PluginIconThemeDefinition;
 
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
     protected readonly onDidChangeEmitter = new Emitter<DidChangeLabelEvent>();
     readonly onDidChange = this.onDidChangeEmitter.event;
 
@@ -508,9 +512,15 @@ export class PluginIconTheme extends PluginIconThemeDefinition implements IconTh
         const name = this.labelProvider.getName(element);
         const classNames = this.fileNameIcon(name);
         if (uri) {
-            const language = monaco.services.StaticServices.modeService.get().createByFilepathOrFirstLine(monaco.Uri.parse(uri));
+            const parsedURI = new URI(uri);
+            const isRoot = this.workspaceService.getWorkspaceRootUri(new URI(uri))?.isEqual(parsedURI);
+            if (isRoot) {
+                classNames.unshift(this.rootFolderIcon);
+            } else {
+                classNames.unshift(this.fileIcon);
+            }
+            const language = monaco.services.StaticServices.modeService.get().createByFilepathOrFirstLine(parsedURI['codeUri']);
             classNames.push(this.languageIcon(language.languageIdentifier.language));
-            classNames.unshift(this.fileIcon);
         }
         return classNames;
     }

package/src/main/browser/plugin-shared-style.ts

@@ -111,7 +111,7 @@ export class PluginSharedStyle {
                 background-position: 2px;
                 width: ${size}px;
                 height: ${size}px;
-                background: no-repeat url("${theme.type === 'light' ? lightIconUrl : darkIconUrl}");
+                background: center no-repeat url("${theme.type === 'light' ? lightIconUrl : darkIconUrl}");
                 background-size: ${size}px;
             `));
         return {

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 {
@@ -196,52 +196,53 @@ export class QuickOpenMainImpl implements QuickOpenMain, Disposable {
 
     $createOrUpdate<T extends theia.QuickPickItem>(params: TransferQuickInput<T>): 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/view/plugin-view-registry.ts

@@ -18,7 +18,7 @@ import { injectable, inject, postConstruct, optional } from '@theia/core/shared/
 import {
     ApplicationShell, ViewContainer as ViewContainerWidget, WidgetManager,
     ViewContainerIdentifier, ViewContainerTitleOptions, Widget, FrontendApplicationContribution,
-    StatefulWidget, CommonMenus, BaseWidget, TreeViewWelcomeWidget
+    StatefulWidget, CommonMenus, BaseWidget, TreeViewWelcomeWidget, codicon
 } from '@theia/core/lib/browser';
 import { ViewContainer, View, ViewWelcome } from '../../../common';
 import { PluginSharedStyle } from '../plugin-shared-style';
@@ -146,7 +146,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 => {

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

@@ -22,6 +22,8 @@ import { ViewContextKeyService } from './view-context-key-service';
 import { StatefulWidget } from '@theia/core/lib/browser/shell/shell-layout-restorer';
 import { Message } from '@theia/core/shared/@phosphor/messaging';
 import { TreeViewWidget } from './tree-view-widget';
+import { DescriptionWidget } from '@theia/core/lib/browser/view-container';
+import { Emitter } from '@theia/core/lib/common';
 
 @injectable()
 export class PluginViewWidgetIdentifier {
@@ -30,7 +32,7 @@ export class PluginViewWidgetIdentifier {
 }
 
 @injectable()
-export class PluginViewWidget extends Panel implements StatefulWidget {
+export class PluginViewWidget extends Panel implements StatefulWidget, DescriptionWidget {
 
     @inject(MenuModelRegistry)
     protected readonly menus: MenuModelRegistry;
@@ -50,6 +52,8 @@ export class PluginViewWidget extends Panel implements StatefulWidget {
         this.node.style.height = '100%';
     }
 
+    public onDidChangeDescription: Emitter<void> = new Emitter<void>();
+
     @postConstruct()
     protected init(): void {
         this.id = this.options.id;
@@ -112,6 +116,16 @@ export class PluginViewWidget extends Panel implements StatefulWidget {
         this.updateWidgetMessage();
     }
 
+    private _description: string = '';
+    get description(): string {
+        return this._description;
+    }
+
+    set description(description: string) {
+        this._description = description;
+        this.onDidChangeDescription.fire();
+    }
+
     private updateWidgetMessage(): void {
         const widget = this.widgets[0];
         if (widget) {

package/src/main/browser/view/tree-views-main.ts

@@ -150,6 +150,13 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
         }
     }
 
+    async $setDescription(treeViewId: string, description: string): Promise<void> {
+        const viewPanel = await this.viewRegistry.getView(treeViewId);
+        if (viewPanel) {
+            viewPanel.description = description;
+        }
+    }
+
     protected handleTreeEvents(treeViewId: string, treeViewWidget: TreeViewWidget): void {
         this.toDispose.push(treeViewWidget.model.onExpansionChanged(event => {
             this.proxy.$setExpanded(treeViewId, event.id, event.expanded);

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

@@ -25,19 +25,28 @@
     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')) {
+            window.addEventListener('message', e => {
+                let sourceIsChildFrame = false;
+                for (let i = 0; i < window.frames.length; i++) {
+                    const frame = window.frames[i];
+                    if (e.source === frame) {
+                        sourceIsChildFrame = true;
+                        break;
+                    }
+                }
+                if (sourceIsChildFrame && 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;
                 }
-
-                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);
+                // Note: `window.parent === window` when there is no parent...
+                if (sourceIsChildFrame || e.source === window.parent) {
+                    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);
+                    }
                 }
             });
         }

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

@@ -193,7 +193,6 @@
             initialScrollProgress: undefined
         };
 
-
         /**
          * @param {HTMLDocument?} document
          * @param {HTMLElement?} body
@@ -477,7 +476,7 @@
                 const newFrame = document.createElement('iframe');
                 newFrame.setAttribute('id', 'pending-frame');
                 newFrame.setAttribute('frameborder', '0');
-                newFrame.setAttribute('sandbox', options.allowScripts ? 'allow-scripts allow-forms allow-same-origin' : 'allow-same-origin');
+                newFrame.setAttribute('sandbox', options.allowScripts ? 'allow-scripts allow-forms allow-same-origin allow-downloads' : 'allow-same-origin');
                 if (host.fakeLoad) {
                     // We should just be able to use srcdoc, but I wasn't
                     // seeing the service worker applying properly.

package/src/main/browser/webview/pre/service-worker.js

@@ -248,7 +248,7 @@ async function processLocalhostRequest(event, requestUrl) {
     const origin = requestUrl.origin;
 
     const resolveRedirect = redirectOrigin => {
-        if (!redirectOrigin) {
+        if (!redirectOrigin || requestUrl.origin === redirectOrigin) {
             return fetch(event.request);
         }
         const location = event.request.url.replace(new RegExp(`^${requestUrl.origin}(/|$)`), `${redirectOrigin}$1`);

package/src/main/browser/webview/webview.ts

@@ -249,7 +249,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget {
 
         const element = document.createElement('iframe');
         element.className = 'webview';
-        element.sandbox.add('allow-scripts', 'allow-forms', 'allow-same-origin');
+        element.sandbox.add('allow-scripts', 'allow-forms', 'allow-same-origin', 'allow-downloads');
         element.setAttribute('src', `${this.externalEndpoint}/index.html?id=${this.identifier.id}`);
         element.style.border = 'none';
         element.style.width = '100%';

package/src/plugin/languages/call-hierarchy.ts

@@ -72,7 +72,8 @@ export class CallHierarchyAdapter {
             range: this.fromRange(item.range),
             selectionRange: this.fromRange(item.selectionRange),
             name: item.name,
-            kind: item.kind
+            kind: item.kind,
+            tags: item.tags
         };
     }
 

package/src/plugin/languages.ts

@@ -90,6 +90,7 @@ import { DeclarationAdapter } from './languages/declaration';
 import { CallHierarchyAdapter } from './languages/call-hierarchy';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { DocumentSemanticTokensAdapter, DocumentRangeSemanticTokensAdapter } from './languages/semantic-highlighting';
+import { isReadonlyArray } from '../common/arrays';
 
 type Adapter = CompletionAdapter |
     SignatureHelpAdapter |
@@ -204,7 +205,7 @@ export class LanguagesExtImpl implements LanguagesExt {
     }
 
     private transformDocumentSelector(selector: theia.DocumentSelector): SerializedDocumentFilter[] {
-        if (Array.isArray(selector)) {
+        if (isReadonlyArray(selector)) {
             return selector.map(sel => this.doTransformDocumentSelector(sel)!);
         }