@theia/plugin-ext 1.18.0 → 1.21.0-next.12

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, codicon
+    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));
@@ -217,15 +218,28 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         }
         const toDispose = new DisposableCollection();
         const containerClass = 'theia-plugin-view-container';
+        let themeIconClass = '';
         const iconClass = 'plugin-view-container-icon-' + viewContainer.id;
-        const iconUrl = PluginSharedStyle.toExternalIconUrl(viewContainer.iconUrl);
-        toDispose.push(this.style.insertRule('.' + containerClass + '.' + iconClass, () => `
+
+        if (viewContainer.themeIcon) {
+            const icon = monaco.theme.ThemeIcon.fromString(viewContainer.themeIcon);
+            if (icon) {
+                themeIconClass = monaco.theme.ThemeIcon.asClassName(icon) ?? '';
+            }
+        }
+
+        if (!themeIconClass) {
+            const iconUrl = PluginSharedStyle.toExternalIconUrl(viewContainer.iconUrl);
+            toDispose.push(this.style.insertRule('.' + containerClass + '.' + iconClass, () => `
                 mask: url('${iconUrl}') no-repeat 50% 50%;
                 -webkit-mask: url('${iconUrl}') no-repeat 50% 50%;
             `));
+        }
+
         toDispose.push(this.doRegisterViewContainer(viewContainer.id, location, {
             label: viewContainer.title,
-            iconClass: containerClass + ' ' + iconClass,
+            // The container class automatically sets a mask; if we're using a theme icon, we don't want one.
+            iconClass: (themeIconClass || containerClass) + ' ' + iconClass,
             closeable: true
         }));
         return toDispose;
@@ -401,7 +415,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 +482,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 +497,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 +550,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 +595,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,19 +29,22 @@ 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';
 import { ViewContextKeyService } from './view-context-key-service';
-import { Widget } from '@theia/core/lib/browser/widgets/widget';
+import { ACTION_ITEM, Widget } from '@theia/core/lib/browser/widgets/widget';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 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,49 +319,14 @@ 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 {
-        if (this.model.selectedNodes.every(selected => selected.id !== node.id) && node.id !== this.hoverNodeId) {
-            return false;
-        }
         return this.contextKeys.with({ view: this.id, viewItem: node.contextValue }, () => {
             const menu = this.menus.getMenu(VIEW_ITEM_INLINE_MENU);
             const arg = this.toTreeViewSelection(node);
@@ -356,27 +346,13 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         if (!icon || !this.commands.isVisible(node.action.commandId, arg) || !this.contextKeys.match(node.action.when)) {
             return false;
         }
-        const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, icon, 'theia-tree-view-inline-action'].join(' ');
+        const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, icon, ACTION_ITEM, 'theia-tree-view-inline-action'].join(' ');
         return <div key={index} className={className} title={node.label} onClick={e => {
             e.stopPropagation();
             this.commands.executeCommand(node.action.commandId, arg);
         }} />;
     }
 
-    protected hoverNodeId: string | undefined;
-    protected setHoverNodeId(hoverNodeId: string | undefined): void {
-        this.hoverNodeId = hoverNodeId;
-        this.update();
-    }
-
-    protected createNodeAttributes(node: TreeNode, props: NodeProps): React.Attributes & React.HTMLAttributes<HTMLElement> {
-        return {
-            ...super.createNodeAttributes(node, props),
-            onMouseOver: () => this.setHoverNodeId(node.id),
-            onMouseOut: () => this.setHoverNodeId(undefined)
-        };
-    }
-
     protected toContextMenuArgs(node: SelectableTreeNode): [TreeViewSelection] {
         return [this.toTreeViewSelection(node)];
     }
@@ -444,7 +420,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

@@ -26,6 +26,8 @@
         constructor() {
             this.handlers = new Map();
             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];
@@ -35,11 +37,8 @@
                     }
                 }
                 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);
-                }
-                // Note: `window.parent === window` when there is no parent...
-                if (sourceIsChildFrame || e.source === window.parent) {
+                } else if (sourceIsChildFrame || sourceIsSelfOrParentFrame) {
                     const channel = e.data.channel;
                     const handler = this.handlers.get(channel);
                     if (handler) {

package/src/main/browser/webview/webview-frontend-security-warnings.ts

@@ -15,8 +15,9 @@
  ********************************************************************************/
 
 import { MessageService } from '@theia/core';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { Dialog, FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import { nls } from '@theia/core/lib/common/nls';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { WebviewExternalEndpoint } from '../../common/webview-protocol';
@@ -44,12 +45,12 @@ export class WebviewFrontendSecurityWarnings implements FrontendApplicationContr
         }
         const hostPattern = await this.webviewEnvironment.hostPatternPromise;
         if (hostPattern !== WebviewExternalEndpoint.defaultPattern) {
-            this.messageService.warn(`\
-The webview endpoint's host pattern has been changed to \`${hostPattern}\`; changing the pattern can lead to security vulnerabilities. \
-See \`@theia/plugin-ext/README.md\` for more information.`,
-            /* actions: */ 'Ok', 'Go To README',
-            ).then(action => {
-                if (action === 'Go To README') {
+            const goToReadme = nls.localize('theia/webview/goToReadme', 'Go To README');
+            const message = nls.localize('theia/webview/messageWarning', '\
+            The {0} endpoint\'s host pattern has been changed to `{1}`; changing the pattern can lead to security vulnerabilities. \
+            See `{2}` for more information.', 'webview', hostPattern, '@theia/plugin-ext/README.md');
+            this.messageService.warn(message, Dialog.OK, goToReadme).then(action => {
+                if (action === goToReadme) {
                     this.windowService.openNewWindow('https://www.npmjs.com/package/@theia/plugin-ext', { external: true });
                 }
             });

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

@@ -23,6 +23,7 @@ import {
     PreferenceContribution,
     PreferenceSchema
 } from '@theia/core/lib/browser/preferences';
+import { nls } from '@theia/core/lib/common/nls';
 
 const frontendConfig = FrontendApplicationConfigProvider.get();
 
@@ -32,7 +33,7 @@ export const WebviewConfigSchema: PreferenceSchema = {
         'webview.trace': {
             type: 'string',
             enum: ['off', 'on', 'verbose'],
-            description: 'Controls communication tracing with webviews.',
+            description: nls.localize('theia/plugin-ext/webviewTrace', 'Controls communication tracing with webviews.'),
             default: 'off'
         }
     }
@@ -42,7 +43,7 @@ if (frontendConfig.securityWarnings) {
     WebviewConfigSchema.properties['webview.warnIfUnsecure'] = {
         scope: 'application',
         type: 'boolean',
-        description: 'Warns users that webviews are currently deployed unsecurely.',
+        description: nls.localize('theia/plugin-ext/webviewWarnIfUnsecure', 'Warns users that webviews are currently deployed unsecurely.'),
         default: true,
     };
 }

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

@@ -40,7 +40,7 @@ import { Schemes } from '../../../common/uri-components';
 import { PluginSharedStyle } from '../plugin-shared-style';
 import { WebviewThemeDataProvider } from './webview-theme-data-provider';
 import { ExternalUriService } from '@theia/core/lib/browser/external-uri-service';
-import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import { WebviewPreferences } from './webview-preferences';
 import { WebviewResourceCache } from './webview-resource-cache';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';

package/src/plugin/comments.ts

@@ -18,7 +18,7 @@ import * as theia from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { CommandRegistryImpl } from './command-registry';
 import { UriComponents } from '../common/uri-components';
-import { URI } from './types-impl';
+import { CommentThreadCollapsibleState, URI } from './types-impl';
 import {
     Range,
     Comment,
@@ -29,7 +29,6 @@ import { DocumentsExtImpl } from './documents';
 import { Emitter } from '@theia/core/lib/common/event';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { fromMarkdown, fromRange, toRange } from './type-converters';
-import { CommentThreadCollapsibleState } from './types-impl';
 import {
     CommentsCommandArg, CommentsContextCommandArg, CommentsEditCommandArg,
     CommentsExt,

package/src/plugin/custom-editors.ts

@@ -19,17 +19,15 @@
  *--------------------------------------------------------------------------------------------*/
 // copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/workbench/api/common/extHostCustomEditors.ts
 
-import { CustomEditorsExt, CustomEditorsMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
+import { CustomEditorsExt, CustomEditorsMain, Plugin, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
 import * as theia from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { Plugin } from '../common/plugin-api-rpc';
-import { URI } from './types-impl';
+import { Disposable, URI } from './types-impl';
 import { UriComponents } from '../common/uri-components';
 import { DocumentsExtImpl } from './documents';
 import { WebviewImpl, WebviewsExtImpl } from './webviews';
 import { CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { Disposable } from './types-impl';
 import { WorkspaceExtImpl } from './workspace';
 import * as Converters from './type-converters';
 

package/src/plugin/decorations.ts

@@ -24,8 +24,7 @@ import {
     PLUGIN_RPC_CONTEXT, PluginInfo
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
-import { URI } from './types-impl';
-import { Disposable, FileDecoration } from './types-impl';
+import { Disposable, FileDecoration, URI } from './types-impl';
 import { CancellationToken } from '@theia/core/lib/common';
 import { dirname } from 'path';
 

package/src/plugin/document-data.ts

@@ -17,9 +17,8 @@
 import * as theia from '@theia/plugin';
 import { ModelChangedEvent, DocumentsMain } from '../common/plugin-api-rpc';
 import { Range as ARange } from '../common/plugin-api-rpc-model';
-import { URI } from './types-impl';
+import { EndOfLine, Position, Range, URI } from './types-impl';
 import { ok } from '../common/assert';
-import { Range, Position, EndOfLine } from './types-impl';
 import { PrefixSumComputer } from './prefix-sum-computer';
 import { getWordAtText, ensureValidWordDefinition } from './word-helper';
 

package/src/plugin/documents.ts

@@ -21,7 +21,7 @@
  * based on https://github.com/Microsoft/vscode/blob/bf9a27ec01f2ef82fc45f69e0c946c7d74a57d3e/src/vs/workbench/api/node/extHostDocumentSaveParticipant.ts
  */
 import { DocumentsExt, ModelChangedEvent, PLUGIN_RPC_CONTEXT, DocumentsMain, SingleEditOperation } from '../common/plugin-api-rpc';
-import { URI } from './types-impl';
+import { TextEdit, URI } from './types-impl';
 import { UriComponents } from '../common/uri-components';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { Emitter, Event } from '@theia/core/lib/common/event';
@@ -31,7 +31,6 @@ import { EditorsAndDocumentsExtImpl } from './editors-and-documents';
 import * as Converter from './type-converters';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Range, TextDocumentShowOptions } from '../common/plugin-api-rpc-model';
-import { TextEdit } from './types-impl';
 
 export class DocumentsExtImpl implements DocumentsExt {
     private toDispose = new DisposableCollection();

package/src/plugin/file-system-event-service-ext-impl.ts

@@ -31,11 +31,10 @@
 import { Emitter, WaitUntilEvent, AsyncEmitter } from '@theia/core/lib/common/event';
 import { IRelativePattern, parse } from '@theia/callhierarchy/lib/common/glob';
 import { UriComponents } from '@theia/core/shared/vscode-uri';
-import { URI } from './types-impl';
+import { Disposable, URI, WorkspaceEdit } from './types-impl';
 import { EditorsAndDocumentsExtImpl as ExtHostDocumentsAndEditors } from './editors-and-documents';
 import type * as vscode from '@theia/plugin';
 import * as typeConverter from './type-converters';
-import { Disposable, WorkspaceEdit } from './types-impl';
 import { FileOperation } from '@theia/filesystem/lib/common/files';
 import { flatten } from '../common/arrays';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';

package/src/plugin/file-system-ext-impl.ts

@@ -29,12 +29,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { UriComponents } from '@theia/core/shared/vscode-uri';
-import { URI } from './types-impl';
+import { FileChangeType, FileSystemError, URI } from './types-impl';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { PLUGIN_RPC_CONTEXT, FileSystemExt, FileSystemMain, IFileChangeDto } from '../common/plugin-api-rpc';
 import * as vscode from '@theia/plugin';
 import * as files from '@theia/filesystem/lib/common/files';
-import { FileChangeType, FileSystemError } from './types-impl';
 import * as typeConverter from './type-converters';
 import { LanguagesExtImpl } from './languages';
 import { Schemes as Schemas } from '../common/uri-components';

package/src/plugin/known-commands.spec.ts

@@ -16,8 +16,7 @@
 
 import * as assert from 'assert';
 import { KnownCommands } from './known-commands';
-import { URI } from './types-impl';
-import { Position } from './types-impl';
+import { Position, URI } from './types-impl';
 import { fromPosition } from './type-converters';
 
 describe('Known Command Conversions', () => {