@theia/plugin-ext 1.22.0-next.7 → 1.22.1

package/package.json

@@ -1,32 +1,31 @@
 {
   "name": "@theia/plugin-ext",
-  "version": "1.22.0-next.7+ff1121f7f2b",
+  "version": "1.22.1",
   "description": "Theia - Plugin Extension",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
   "dependencies": {
-    "@theia/bulk-edit": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/callhierarchy": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/console": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/core": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/debug": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/editor": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/file-search": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/filesystem": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/markers": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/messages": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/monaco": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/navigator": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/output": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/plugin": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/preferences": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/scm": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/search-in-workspace": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/task": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/terminal": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/timeline": "1.22.0-next.7+ff1121f7f2b",
-    "@theia/workspace": "1.22.0-next.7+ff1121f7f2b",
-    "@types/markdown-it": "*",
+    "@theia/bulk-edit": "1.22.1",
+    "@theia/callhierarchy": "1.22.1",
+    "@theia/console": "1.22.1",
+    "@theia/core": "1.22.1",
+    "@theia/debug": "1.22.1",
+    "@theia/editor": "1.22.1",
+    "@theia/file-search": "1.22.1",
+    "@theia/filesystem": "1.22.1",
+    "@theia/markers": "1.22.1",
+    "@theia/messages": "1.22.1",
+    "@theia/monaco": "1.22.1",
+    "@theia/navigator": "1.22.1",
+    "@theia/output": "1.22.1",
+    "@theia/plugin": "1.22.1",
+    "@theia/preferences": "1.22.1",
+    "@theia/scm": "1.22.1",
+    "@theia/search-in-workspace": "1.22.1",
+    "@theia/task": "1.22.1",
+    "@theia/terminal": "1.22.1",
+    "@theia/timeline": "1.22.1",
+    "@theia/workspace": "1.22.1",
     "@types/mime": "^2.0.1",
     "decompress": "^4.2.1",
     "escape-html": "^1.0.3",
@@ -35,7 +34,6 @@
     "jsonc-parser": "^2.2.0",
     "lodash.clonedeep": "^4.5.0",
     "macaddress": "^0.2.9",
-    "markdown-it": "^8.4.0",
     "mime": "^2.4.4",
     "ps-tree": "^1.2.0",
     "request": "^2.82.0",
@@ -82,7 +80,7 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.21.0",
+    "@theia/ext-scripts": "1.22.1",
     "@types/decompress": "^4.2.2",
     "@types/escape-html": "^0.0.20",
     "@types/lodash.clonedeep": "^4.5.3",
@@ -92,5 +90,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "ff1121f7f2b42324ded29d8ef70838cb0941083d"
+  "gitHead": "49910aeaecf520a54b253db0215b28c2268bb2f3"
 }

package/src/common/plugin-api-rpc.ts

@@ -93,7 +93,7 @@ import type {
 import { SerializableEnvironmentVariableCollection } from '@theia/terminal/lib/common/base-terminal-protocol';
 import { ThemeType } from '@theia/core/lib/common/theme';
 import { Disposable } from '@theia/core/lib/common/disposable';
-import { PickOptions, QuickInputButtonHandle, QuickPickItem } from '@theia/core/lib/browser';
+import { PickOptions, QuickInputButtonHandle, QuickPickItem, WidgetOpenerOptions } from '@theia/core/lib/browser';
 
 export interface PreferenceData {
     [scope: number]: any;
@@ -1555,7 +1555,7 @@ export interface CustomEditorsExt {
         newWebviewHandle: string,
         viewType: string,
         title: string,
-        position: number,
+        widgetOpenerOptions: WidgetOpenerOptions | undefined,
         options: theia.WebviewPanelOptions,
         cancellation: CancellationToken): Promise<void>;
     $createCustomDocument(resource: UriComponents, viewType: string, backupId: string | undefined, cancellation: CancellationToken): Promise<{ editable: boolean }>;
@@ -1578,7 +1578,7 @@ export interface CustomEditorsMain {
     $registerTextEditorProvider(viewType: string, options: theia.WebviewPanelOptions, capabilities: CustomTextEditorCapabilities): void;
     $registerCustomEditorProvider(viewType: string, options: theia.WebviewPanelOptions, supportsMultipleEditorsPerDocument: boolean): void;
     $unregisterEditorProvider(viewType: string): void;
-    $createCustomEditorPanel(handle: string, title: string, viewColumn: theia.ViewColumn | undefined, options: theia.WebviewPanelOptions & theia.WebviewOptions): Promise<void>;
+    $createCustomEditorPanel(handle: string, title: string, widgetOpenerOptions: WidgetOpenerOptions | undefined, options: theia.WebviewPanelOptions & theia.WebviewOptions): Promise<void>;
     $onDidEdit(resource: UriComponents, viewType: string, editId: number, label: string | undefined): void;
     $onContentChange(resource: UriComponents, viewType: string): void;
 }
@@ -1636,6 +1636,7 @@ export interface DebugMain {
     $addBreakpoints(breakpoints: Breakpoint[]): Promise<void>;
     $removeBreakpoints(breakpoints: string[]): Promise<void>;
     $startDebugging(folder: theia.WorkspaceFolder | undefined, nameOrConfiguration: string | theia.DebugConfiguration, options: theia.DebugSessionOptions): Promise<boolean>;
+    $stopDebugging(sessionId?: string): Promise<void>;
     $customRequest(sessionId: string, command: string, args?: any): Promise<DebugProtocol.Response>;
 }
 

package/src/common/plugin-protocol.ts

@@ -406,6 +406,11 @@ export enum PluginType {
     User
 };
 
+export interface UnresolvedPluginEntry {
+    id: string;
+    type?: PluginType;
+}
+
 export interface PluginDeployerEntry {
 
     /**
@@ -822,9 +827,10 @@ export interface PluginDeployerHandler {
     deployFrontendPlugins(frontendPlugins: PluginDeployerEntry[]): Promise<void>;
     deployBackendPlugins(backendPlugins: PluginDeployerEntry[]): Promise<void>;
 
+    getDeployedPlugin(pluginId: string): DeployedPlugin | undefined;
     undeployPlugin(pluginId: string): Promise<boolean>;
 
-    getPluginDependencies(pluginToBeInstalled: PluginDeployerEntry): Promise<PluginDependencies | undefined>
+    getPluginDependencies(pluginToBeInstalled: PluginDeployerEntry): Promise<PluginDependencies | undefined>;
 }
 
 export interface GetDeployedPluginsParams {

package/src/main/browser/custom-editors/custom-editor-opener.tsx

@@ -16,7 +16,7 @@
 
 import { inject } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
-import { ApplicationShell, OpenerOptions, OpenHandler, Widget, WidgetManager } from '@theia/core/lib/browser';
+import { ApplicationShell, OpenHandler, Widget, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
 import { CustomEditor, CustomEditorPriority, CustomEditorSelector } from '../../../common';
 import * as glob from './glob';
 import { CustomEditorWidget } from './custom-editor-widget';
@@ -28,7 +28,7 @@ export class CustomEditorOpener implements OpenHandler {
     readonly id: string;
     readonly label: string;
 
-    private readonly onDidOpenCustomEditorEmitter = new Emitter<CustomEditorWidget>();
+    private readonly onDidOpenCustomEditorEmitter = new Emitter<[CustomEditorWidget, WidgetOpenerOptions?]>();
     readonly onDidOpenCustomEditor = this.onDidOpenCustomEditorEmitter.event;
 
     constructor(
@@ -62,7 +62,7 @@ export class CustomEditorOpener implements OpenHandler {
     }
 
     protected readonly pendingWidgetPromises = new Map<string, Promise<CustomEditorWidget>>();
-    async open(uri: URI, options?: OpenerOptions): Promise<Widget | undefined> {
+    async open(uri: URI, options?: WidgetOpenerOptions): Promise<Widget | undefined> {
         let widget: CustomEditorWidget | undefined;
         const widgets = this.widgetManager.getWidgets(CustomEditorWidget.FACTORY_ID) as CustomEditorWidget[];
         widget = widgets.find(w => w.viewType === this.editor.viewType && w.resource.toString() === uri.toString());
@@ -84,7 +84,7 @@ export class CustomEditorOpener implements OpenHandler {
                 this.pendingWidgetPromises.delete(uriString);
                 widget.viewType = this.editor.viewType;
                 widget.resource = uri;
-                this.onDidOpenCustomEditorEmitter.fire(widget);
+                this.onDidOpenCustomEditorEmitter.fire([widget, options]);
             }
         }
         return widget;

package/src/main/browser/custom-editors/custom-editors-main.ts

@@ -20,7 +20,7 @@
 // some code copied and modified from https://github.com/microsoft/vscode/blob/53eac52308c4611000a171cc7bf1214293473c78/src/vs/workbench/api/browser/mainThreadCustomEditors.ts
 
 import { interfaces } from '@theia/core/shared/inversify';
-import { MAIN_RPC_CONTEXT, CustomEditorsMain, CustomEditorsExt, CustomTextEditorCapabilities, EditorPosition } from '../../../common/plugin-api-rpc';
+import { MAIN_RPC_CONTEXT, CustomEditorsMain, CustomEditorsExt, CustomTextEditorCapabilities } from '../../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../../common/rpc-protocol';
 import { HostedPluginSupport } from '../../../hosted/browser/hosted-plugin';
 import { PluginCustomEditorRegistry } from './plugin-custom-editor-registry';
@@ -39,10 +39,11 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { UndoRedoService } from './undo-redo-service';
 import { WebviewsMainImpl } from '../webviews-main';
 import { WidgetManager } from '@theia/core/lib/browser/widget-manager';
-import { ApplicationShell, DefaultUriLabelProviderContribution, Saveable, SaveOptions } from '@theia/core/lib/browser';
-import { WebviewOptions, WebviewPanelOptions, ViewColumn } from '@theia/plugin';
+import { ApplicationShell, DefaultUriLabelProviderContribution, Saveable, SaveOptions, WidgetOpenerOptions } from '@theia/core/lib/browser';
+import { WebviewOptions, WebviewPanelOptions, WebviewPanelShowOptions } from '@theia/plugin';
 import { WebviewWidgetIdentifier } from '../webview/webview';
 import { EditorPreferences } from '@theia/editor/lib/browser';
+import { ViewColumn, WebviewPanelTargetArea } from '../../../plugin/types-impl';
 
 const enum CustomEditorModelType {
     Custom,
@@ -110,7 +111,7 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
         const disposables = new DisposableCollection();
 
         disposables.push(
-            this.customEditorRegistry.registerResolver(viewType, async widget => {
+            this.customEditorRegistry.registerResolver(viewType, async (widget, widgetOpenerOptions) => {
                 const { resource, identifier } = widget;
                 widget.options = options;
 
@@ -149,7 +150,7 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
                     identifier.id,
                     viewType,
                     this.labelProvider.getName(resource)!,
-                    EditorPosition.ONE, // TODO: fix this when Theia has support splitting editors,
+                    widgetOpenerOptions,
                     options,
                     _cancellationSource.token
                 );
@@ -216,14 +217,14 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
     async $createCustomEditorPanel(
         panelId: string,
         title: string,
-        viewColumn: ViewColumn,
+        widgetOpenerOptions: WidgetOpenerOptions | undefined,
         options: WebviewPanelOptions & WebviewOptions
     ): Promise<void> {
         const view = await this.widgetManager.getOrCreateWidget<CustomEditorWidget>(CustomEditorWidget.FACTORY_ID, <WebviewWidgetIdentifier>{ id: panelId });
         this.webviewsMain.hookWebview(view);
         view.title.label = title;
         const { enableFindWidget, retainContextWhenHidden, enableScripts, localResourceRoots, ...contentOptions } = options;
-        view.viewColumn = viewColumn;
+        view.viewColumn = ViewColumn.One; // behaviour might be overridden later using widgetOpenerOptions (if available)
         view.options = { enableFindWidget, retainContextWhenHidden };
         view.setContentOptions({
             allowScripts: enableScripts,
@@ -237,7 +238,39 @@ export class CustomEditorsMainImpl implements CustomEditorsMain, Disposable {
             }
             return;
         }
-        this.webviewsMain.addOrReattachWidget(view, { preserveFocus: true });
+        const showOptions: WebviewPanelShowOptions = {
+            preserveFocus: true
+        };
+
+        if (widgetOpenerOptions) {
+            if (widgetOpenerOptions.mode === 'reveal') {
+                showOptions.preserveFocus = false;
+            }
+
+            if (widgetOpenerOptions.widgetOptions) {
+                let area: WebviewPanelTargetArea;
+                switch (widgetOpenerOptions.widgetOptions.area) {
+                    case 'main':
+                        area = WebviewPanelTargetArea.Main;
+                    case 'left':
+                        area = WebviewPanelTargetArea.Left;
+                    case 'right':
+                        area = WebviewPanelTargetArea.Right;
+                    case 'bottom':
+                        area = WebviewPanelTargetArea.Bottom;
+                    default: // includes 'top'
+                        area = WebviewPanelTargetArea.Main;
+                }
+                showOptions.area = area;
+
+                if (widgetOpenerOptions.widgetOptions.mode === 'split-right' ||
+                    widgetOpenerOptions.widgetOptions.mode === 'open-to-right') {
+                    showOptions.viewColumn = ViewColumn.Beside;
+                }
+            }
+        }
+
+        this.webviewsMain.addOrReattachWidget(view, showOptions);
     }
 }
 

package/src/main/browser/custom-editors/plugin-custom-editor-registry.ts

@@ -23,14 +23,14 @@ import { CommandRegistry, Emitter, MenuModelRegistry } from '@theia/core';
 import { SelectionService } from '@theia/core/lib/common';
 import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
 import { NavigatorContextMenu } from '@theia/navigator/lib//browser/navigator-contribution';
-import { ApplicationShell, DefaultOpenerService, WidgetManager } from '@theia/core/lib/browser';
+import { ApplicationShell, DefaultOpenerService, WidgetManager, WidgetOpenerOptions } from '@theia/core/lib/browser';
 import { CustomEditorWidget } from './custom-editor-widget';
 
 @injectable()
 export class PluginCustomEditorRegistry {
     private readonly editors = new Map<string, CustomEditor>();
     private readonly pendingEditors = new Set<CustomEditorWidget>();
-    private readonly resolvers = new Map<string, (widget: CustomEditorWidget) => void>();
+    private readonly resolvers = new Map<string, (widget: CustomEditorWidget, options?: WidgetOpenerOptions) => void>();
 
     private readonly onWillOpenCustomEditorEmitter = new Emitter<string>();
     readonly onWillOpenCustomEditor = this.onWillOpenCustomEditorEmitter.event;
@@ -109,22 +109,22 @@ export class PluginCustomEditorRegistry {
             )
         );
         toDispose.push(
-            editorOpenHandler.onDidOpenCustomEditor(widget => this.resolveWidget(widget))
+            editorOpenHandler.onDidOpenCustomEditor(event => this.resolveWidget(event[0], event[1]))
         );
         return toDispose;
     }
 
-    resolveWidget = (widget: CustomEditorWidget) => {
+    resolveWidget = (widget: CustomEditorWidget, options?: WidgetOpenerOptions) => {
         const resolver = this.resolvers.get(widget.viewType);
         if (resolver) {
-            resolver(widget);
+            resolver(widget, options);
         } else {
             this.pendingEditors.add(widget);
             this.onWillOpenCustomEditorEmitter.fire(widget.viewType);
         }
     };
 
-    registerResolver(viewType: string, resolver: (widget: CustomEditorWidget) => void): Disposable {
+    registerResolver(viewType: string, resolver: (widget: CustomEditorWidget, options?: WidgetOpenerOptions) => void): Disposable {
         if (this.resolvers.has(viewType)) {
             throw new Error(`Resolver for ${viewType} already registered`);
         }

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

@@ -274,16 +274,26 @@ export class DebugMainImpl implements DebugMain, Disposable {
             return false;
         }
 
-        Object.assign(configuration, options);
-
+        const debugConfiguration = { ...configuration, ...options };
         const session = await this.sessionManager.start({
-            configuration,
+            configuration: debugConfiguration,
             workspaceFolderUri: folder && Uri.revive(folder.uri).toString()
         });
 
         return !!session;
     }
 
+    async $stopDebugging(sessionId?: string): Promise<void> {
+        if (sessionId) {
+            const session = this.sessionManager.getSession(sessionId);
+            return this.sessionManager.terminateSession(session);
+        }
+        // Terminate all sessions if no session is provided.
+        for (const session of this.sessionManager.sessions) {
+            this.sessionManager.terminateSession(session);
+        }
+    }
+
     private toTheiaPluginApiBreakpoints(breakpoints: (SourceBreakpoint | FunctionBreakpoint)[]): Breakpoint[] {
         return breakpoints.map(b => this.toTheiaPluginApiBreakpoint(b));
     }

package/src/main/browser/menus/menus-contribution-handler.ts

@@ -242,14 +242,10 @@ export class MenusContributionPointHandler {
     }
 
     protected registerViewTitleAction(location: string, action: Menu): Disposable {
-        return this.registerTitleAction(location, { ...action, when: undefined }, {
+        return this.registerTitleAction(location, action, {
             execute: widget => widget instanceof PluginViewWidget && this.commands.executeCommand(action.command!),
-            isEnabled: widget => widget instanceof PluginViewWidget &&
-                this.viewContextKeys.with({ view: widget.options.viewId }, () =>
-                    this.commands.isEnabled(action.command!) && this.viewContextKeys.match(action.when)),
-            isVisible: widget => widget instanceof PluginViewWidget &&
-                this.viewContextKeys.with({ view: widget.options.viewId }, () =>
-                    this.commands.isVisible(action.command!) && this.viewContextKeys.match(action.when))
+            isEnabled: widget => widget instanceof PluginViewWidget && this.commands.isEnabled(action.command!),
+            isVisible: widget => widget instanceof PluginViewWidget && this.commands.isVisible(action.command!),
         });
     }
 

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

@@ -18,12 +18,12 @@ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'
 import { Panel, Widget } from '@theia/core/shared/@phosphor/widgets';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
 import { CommandRegistry } from '@theia/core/lib/common/command';
-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';
+import { DisposableCollection, Emitter } from '@theia/core/lib/common';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 
 @injectable()
 export class PluginViewWidgetIdentifier {
@@ -34,14 +34,16 @@ export class PluginViewWidgetIdentifier {
 @injectable()
 export class PluginViewWidget extends Panel implements StatefulWidget, DescriptionWidget {
 
+    protected readonly toDispose = new DisposableCollection();
+
     @inject(MenuModelRegistry)
     protected readonly menus: MenuModelRegistry;
 
     @inject(CommandRegistry)
     protected readonly commands: CommandRegistry;
 
-    @inject(ViewContextKeyService)
-    protected readonly contextKeys: ViewContextKeyService;
+    @inject(ContextKeyService)
+    protected readonly contextKeyService: ContextKeyService;
 
     @inject(PluginViewWidgetIdentifier)
     readonly options: PluginViewWidgetIdentifier;
@@ -59,6 +61,9 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
     @postConstruct()
     protected init(): void {
         this.id = this.options.id;
+        const localContext = this.contextKeyService.createScoped(this.node);
+        localContext.setContext('view', this.options.viewId);
+        this.toDispose.push(localContext);
     }
 
     protected onActivateRequest(msg: Message): void {
@@ -148,6 +153,11 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         super.insertWidget(index, widget);
         this.updateWidgetMessage();
     }
+
+    dispose(): void {
+        this.toDispose.dispose();
+        super.dispose();
+    }
 }
 export namespace PluginViewWidget {
     export interface State {

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

@@ -36,14 +36,13 @@ import {
 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 { 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 * as markdownit from '@theia/core/shared/markdown-it';
 import { isMarkdownString } from '../../../plugin/markdown-string';
 
 export const TREE_NODE_HYPERLINK = 'theia-TreeNodeHyperlink';
@@ -236,8 +235,8 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(MenuModelRegistry)
     protected readonly menus: MenuModelRegistry;
 
-    @inject(ViewContextKeyService)
-    protected readonly contextKeys: ViewContextKeyService;
+    @inject(ContextKeyService)
+    protected readonly contextKeys: ContextKeyService;
 
     @inject(TreeViewWidgetIdentifier)
     readonly identifier: TreeViewWidgetIdentifier;
@@ -343,7 +342,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     protected renderInlineCommand(node: ActionMenuNode, index: number, arg: any): React.ReactNode {
         const { icon } = node;
-        if (!icon || !this.commands.isVisible(node.action.commandId, arg) || !this.contextKeys.match(node.action.when)) {
+        if (!icon || !this.commands.isVisible(node.action.commandId, arg) || !node.action.when || !this.contextKeys.match(node.action.when)) {
             return false;
         }
         const className = [TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS, icon, ACTION_ITEM, 'theia-tree-view-inline-action'].join(' ');

package/src/main/browser/view/view-context-key-service.ts

@@ -74,18 +74,4 @@ export class ViewContextKeyService {
     match(expression: string | undefined): boolean {
         return !expression || this.contextKeyService.match(expression);
     }
-
-    with<T>(input: { view?: string, viewItem?: string }, cb: () => T): T {
-        const view = this.view.get();
-        const viewItem = this.viewItem.get();
-        this.view.set(input.view);
-        this.viewItem.set(input.viewItem);
-        try {
-            return cb();
-        } finally {
-            this.view.set(view);
-            this.viewItem.set(viewItem);
-        }
-    }
-
 }

package/src/main/electron-browser/webview/electron-webview-widget-factory.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
-import { remote } from '@theia/core/shared/electron';
+import * as electronRemote from '@theia/core/electron-shared/@electron/remote';
 import { ElectronSecurityToken } from '@theia/core/lib/electron-common/electron-token';
 import { WebviewWidgetFactory } from '../../browser/webview/webview-widget-factory';
 import { WebviewWidgetIdentifier, WebviewWidget } from '../../browser/webview/webview';
@@ -35,7 +35,7 @@ export class ElectronWebviewWidgetFactory extends WebviewWidgetFactory {
      * @param endpoint cookie's target url
      */
     protected async attachElectronSecurityCookie(endpoint: string): Promise<void> {
-        await remote.session.defaultSession!.cookies.set({
+        await electronRemote.session.defaultSession!.cookies.set({
             url: endpoint,
             name: ElectronSecurityToken,
             value: JSON.stringify(this.container.get(ElectronSecurityToken)),
@@ -59,7 +59,7 @@ export class ElectronCustomEditorWidgetFactory extends CustomEditorWidgetFactory
      * @param endpoint cookie's target url
      */
     protected async attachElectronSecurityCookie(endpoint: string): Promise<void> {
-        await remote.session.defaultSession!.cookies.set({
+        await electronRemote.session.defaultSession!.cookies.set({
             url: endpoint,
             name: ElectronSecurityToken,
             value: JSON.stringify(this.container.get(ElectronSecurityToken)),

package/src/main/node/plugin-deployer-impl.ts

@@ -21,7 +21,7 @@ import {
     PluginDeployerResolver, PluginDeployerFileHandler, PluginDeployerDirectoryHandler,
     PluginDeployerEntry, PluginDeployer, PluginDeployerParticipant, PluginDeployerStartContext,
     PluginDeployerResolverInit, PluginDeployerFileHandlerContext,
-    PluginDeployerDirectoryHandlerContext, PluginDeployerEntryType, PluginDeployerHandler, PluginType
+    PluginDeployerDirectoryHandlerContext, PluginDeployerEntryType, PluginDeployerHandler, PluginType, UnresolvedPluginEntry
 } from '../../common/plugin-protocol';
 import { PluginDeployerEntryImpl } from './plugin-deployer-entry-impl';
 import {
@@ -118,11 +118,16 @@ export class PluginDeployerImpl implements PluginDeployer {
         }
 
         const startDeployTime = performance.now();
-        const [userPlugins, systemPlugins] = await Promise.all([
-            this.resolvePlugins(context.userEntries, PluginType.User),
-            this.resolvePlugins(context.systemEntries, PluginType.System)
-        ]);
-        await this.deployPlugins([...userPlugins, ...systemPlugins]);
+        const unresolvedUserEntries = context.userEntries.map(id => ({
+            id,
+            type: PluginType.User
+        }));
+        const unresolvedSystemEntries = context.systemEntries.map(id => ({
+            id,
+            type: PluginType.System
+        }));
+        const plugins = await this.resolvePlugins([...unresolvedUserEntries, ...unresolvedSystemEntries]);
+        await this.deployPlugins(plugins);
         this.logMeasurement('Deploy plugins list', startDeployTime);
     }
 
@@ -132,50 +137,53 @@ export class PluginDeployerImpl implements PluginDeployer {
         }
     }
 
-    async deploy(pluginEntry: string, type: PluginType = PluginType.System): Promise<void> {
+    async deploy(plugin: UnresolvedPluginEntry): Promise<void> {
         const startDeployTime = performance.now();
-        await this.deployMultipleEntries([pluginEntry], type);
+        await this.deployMultipleEntries([plugin]);
         this.logMeasurement('Deploy plugin entry', startDeployTime);
     }
 
-    protected async deployMultipleEntries(pluginEntries: ReadonlyArray<string>, type: PluginType = PluginType.System): Promise<void> {
-        const pluginsToDeploy = await this.resolvePlugins(pluginEntries, type);
+    protected async deployMultipleEntries(plugins: UnresolvedPluginEntry[]): Promise<void> {
+        const pluginsToDeploy = await this.resolvePlugins(plugins);
         await this.deployPlugins(pluginsToDeploy);
     }
 
     /**
      * Resolves plugins for the given type.
      *
-     * One can call it multiple times for different types before triggering a single deploy, i.e.
+     * Only call it a single time before triggering a single deploy to prevent re-resolving of extension dependencies, i.e.
      * ```ts
      * const deployer: PluginDeployer;
-     * deployer.deployPlugins([
-     *     ...await deployer.resolvePlugins(userEntries, PluginType.User),
-     *     ...await deployer.resolvePlugins(systemEntries, PluginType.System)
-     * ]);
+     * deployer.deployPlugins(await deployer.resolvePlugins(allPluginEntries));
      * ```
      */
-    async resolvePlugins(pluginEntries: ReadonlyArray<string>, type: PluginType): Promise<PluginDeployerEntry[]> {
+    async resolvePlugins(plugins: UnresolvedPluginEntry[]): Promise<PluginDeployerEntry[]> {
         const visited = new Set<string>();
         const pluginsToDeploy = new Map<string, PluginDeployerEntry>();
 
-        let queue = [...pluginEntries];
+        let queue: UnresolvedPluginEntry[] = [...plugins];
         while (queue.length) {
-            const dependenciesChunk: Array<Map<string, string>> = [];
-            const workload: string[] = [];
+            const dependenciesChunk: Array<{
+                dependencies: Map<string, string>
+                type: PluginType
+            }> = [];
+            const workload: UnresolvedPluginEntry[] = [];
             while (queue.length) {
                 const current = queue.shift()!;
-                if (visited.has(current)) {
+                if (visited.has(current.id)) {
                     continue;
                 } else {
                     workload.push(current);
                 }
-                visited.add(current);
+                visited.add(current.id);
             }
             queue = [];
-            await Promise.all(workload.map(async current => {
+            await Promise.all(workload.map(async ({ id, type }) => {
+                if (type === undefined) {
+                    type = PluginType.System;
+                }
                 try {
-                    const pluginDeployerEntries = await this.resolvePlugin(current, type);
+                    const pluginDeployerEntries = await this.resolvePlugin(id, type);
                     await this.applyFileHandlers(pluginDeployerEntries);
                     await this.applyDirectoryFileHandlers(pluginDeployerEntries);
                     for (const deployerEntry of pluginDeployerEntries) {
@@ -183,18 +191,21 @@ export class PluginDeployerImpl implements PluginDeployer {
                         if (dependencies && !pluginsToDeploy.has(dependencies.metadata.model.id)) {
                             pluginsToDeploy.set(dependencies.metadata.model.id, deployerEntry);
                             if (dependencies.mapping) {
-                                dependenciesChunk.push(dependencies.mapping);
+                                dependenciesChunk.push({ dependencies: dependencies.mapping, type });
                             }
                         }
                     }
                 } catch (e) {
-                    console.error(`Failed to resolve plugins from '${current}'`, e);
+                    console.error(`Failed to resolve plugins from '${id}'`, e);
                 }
             }));
-            for (const dependencies of dependenciesChunk) {
+            for (const { dependencies, type } of dependenciesChunk) {
                 for (const [dependency, deployableDependency] of dependencies) {
                     if (!pluginsToDeploy.has(dependency)) {
-                        queue.push(deployableDependency);
+                        queue.push({
+                            id: deployableDependency,
+                            type
+                        });
                     }
                 }
             }