@theia/plugin-ext 1.27.0-next.9 → 1.27.0

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

@@ -28,9 +28,10 @@ import {
     DecorationRenderOptions,
     ThemeDecorationInstanceRenderOptions,
     DecorationOptions,
-    WorkspaceEditDto
+    WorkspaceEditDto,
+    DocumentsMain,
 } from '../../common/plugin-api-rpc';
-import { Range } from '../../common/plugin-api-rpc-model';
+import { Range, TextDocumentShowOptions } from '../../common/plugin-api-rpc-model';
 import { EditorsAndDocumentsMain } from './editors-and-documents-main';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
@@ -54,6 +55,7 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
     constructor(
         private readonly editorsAndDocuments: EditorsAndDocumentsMain,
+        private readonly documents: DocumentsMain,
         rpc: RPCProtocol,
         private readonly bulkEditService: MonacoBulkEditService,
         private readonly monacoEditorService: MonacoEditorService,
@@ -87,6 +89,10 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         }
     }
 
+    $tryShowTextDocument(uri: UriComponents, options?: TextDocumentShowOptions): Promise<void> {
+        return this.documents.$tryShowDocument(uri, options);
+    }
+
     $trySetOptions(id: string, options: TextEditorConfigurationUpdate): Promise<void> {
         if (!this.editorsAndDocuments.getEditor(id)) {
             return Promise.reject(disposed(`TextEditor: ${id}`));
@@ -173,6 +179,10 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         this.monacoEditorService.removeDecorationType(key);
     }
 
+    $tryHideEditor(id: string): Promise<void> {
+        return this.editorsAndDocuments.hideEditor(id);
+    }
+
     $trySetDecorations(id: string, key: string, ranges: DecorationOptions[]): Promise<void> {
         if (!this.editorsAndDocuments.getEditor(id)) {
             return Promise.reject(disposed(`TextEditor(${id})`));

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

@@ -30,14 +30,10 @@ export class ThemingMainImpl implements ThemingMain {
     private readonly proxy: ThemingExt;
     private readonly themeChangeListener: Disposable;
 
-    constructor(
-        rpc: RPCProtocol
-    ) {
+    constructor(rpc: RPCProtocol, themeService: ThemeService) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.THEMING_EXT);
-        this.themeChangeListener = ThemeService.get().onDidColorThemeChange(e => {
-            this.proxy.$onColorThemeChange(e.newTheme.type);
-        });
-        this.proxy.$onColorThemeChange(ThemeService.get().getCurrentTheme().type);
+        this.themeChangeListener = themeService.onDidColorThemeChange(e => this.proxy.$onColorThemeChange(e.newTheme.type));
+        this.proxy.$onColorThemeChange(themeService.getCurrentTheme().type);
     }
 
     dispose(): void {

package/src/main/browser/view/plugin-tree-view-node-label-provider.ts

@@ -33,7 +33,7 @@ export class PluginTreeViewNodeLabelProvider implements LabelProviderContributio
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     canHandle(element: TreeViewNode | any): number {
-        if (TreeNode.is(element) && ('resourceUri' in element || 'themeIconId' in element)) {
+        if (TreeNode.is(element) && ('resourceUri' in element || 'themeIcon' in element)) {
             return this.treeLabelProvider.canHandle(element) + 1;
         }
         return 0;
@@ -43,12 +43,14 @@ export class PluginTreeViewNodeLabelProvider implements LabelProviderContributio
         if (node.icon) {
             return node.icon;
         }
-        if (node.themeIconId) {
-            if (node.themeIconId === 'file' || node.themeIconId === 'folder') {
+        if (node.themeIcon) {
+            if (node.themeIcon.id === 'file' || node.themeIcon.id === 'folder') {
                 const uri = node.resourceUri && new URI(node.resourceUri) || undefined;
-                return this.labelProvider.getIcon(URIIconReference.create(node.themeIconId, uri));
+                if (uri) {
+                    return this.labelProvider.getIcon(URIIconReference.create(node.themeIcon.id, uri));
+                }
             }
-            return ThemeIcon.asClassName({ id: node.themeIconId });
+            return ThemeIcon.asClassName(node.themeIcon);
         }
         if (node.resourceUri) {
             return this.labelProvider.getIcon(new URI(node.resourceUri));

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

@@ -35,7 +35,7 @@ import { Emitter, Event } from '@theia/core/lib/common/event';
 import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
 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 { OutputWidget } 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';
@@ -45,6 +45,7 @@ import { WebviewView, WebviewViewResolver } from '../webview-views/webview-views
 import { WebviewWidget, WebviewWidgetIdentifier } from '../webview/webview';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
 import { v4 } from 'uuid';
+import { nls } from '@theia/core';
 
 export const PLUGIN_VIEW_FACTORY_ID = 'plugin-view';
 export const PLUGIN_VIEW_CONTAINER_FACTORY_ID = 'plugin-view-container';
@@ -113,7 +114,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
 
         // VS Code Panels
         this.trackVisibleWidget(PROBLEMS_WIDGET_ID, { panelId: 'workbench.panel.markers' });
-        this.trackVisibleWidget(OUTPUT_WIDGET_KIND, { panelId: 'workbench.panel.output' });
+        this.trackVisibleWidget(OutputWidget.ID, { panelId: 'workbench.panel.output' });
         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
@@ -144,12 +145,13 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         });
         this.widgetManager.onDidCreateWidget(event => {
             if (event.widget instanceof FileNavigatorWidget) {
-                this.registerViewWelcome({
+                const disposable = new DisposableCollection();
+                disposable.push(this.registerViewWelcome({
                     view: 'explorer',
-                    // eslint-disable-next-line max-len
-                    content: 'You have not yet opened a folder.\n[Open Folder](command:workbench.action.files.openFolder)',
+                    content: nls.localizeByDefault('You have not yet opened a folder.\n[Open Folder](command:{0})', 'workbench.action.files.openFolder'),
                     order: 0
-                });
+                }));
+                disposable.push(event.widget.onDidDispose(() => disposable.dispose()));
             }
         });
         this.doRegisterViewContainer('test', 'left', {
@@ -401,6 +403,9 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
         const toDispose = new DisposableCollection();
 
         const viewsWelcome = this.viewsWelcome.get(viewWelcome.view) || [];
+        if (viewsWelcome.some(e => e.content === viewWelcome.content)) {
+            return toDispose;
+        }
         viewsWelcome.push(viewWelcome);
         this.viewsWelcome.set(viewWelcome.view, viewsWelcome);
         this.handleViewWelcomeChange(viewWelcome.view);
@@ -715,7 +720,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     }
 
     /**
-     * retrieve restored layout state from previous user session but close widgets
+     * retrieve restored layout state from previous user session but close widgets
      * widgets should be opened only when view data providers are registered
      */
     onDidInitializeLayout(): void {

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, TreeViewItemCollapsibleState, TreeViewItem, TreeViewSelection } from '../../../common/plugin-api-rpc';
+import { TreeViewsExt, TreeViewItemCollapsibleState, TreeViewItem, TreeViewSelection, ThemeIcon } from '../../../common/plugin-api-rpc';
 import { Command } from '../../../common/plugin-api-rpc-model';
 import {
     TreeNode,
@@ -46,6 +46,9 @@ import * as markdownit from '@theia/core/shared/markdown-it';
 import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
 import { LabelParser } from '@theia/core/lib/browser/label-parser';
 import { AccessibilityInformation } from '@theia/plugin';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { DecoratedTreeNode } from '@theia/core/lib/browser/tree/tree-decorator';
+import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
 
 export const TREE_NODE_HYPERLINK = 'theia-TreeNodeHyperlink';
 export const VIEW_ITEM_CONTEXT_MENU: MenuPath = ['view-item-context-menu'];
@@ -56,11 +59,11 @@ export interface SelectionEventHandler {
     readonly contextSelection: boolean;
 }
 
-export interface TreeViewNode extends SelectableTreeNode {
+export interface TreeViewNode extends SelectableTreeNode, DecoratedTreeNode {
     contextValue?: string;
     command?: Command;
     resourceUri?: string;
-    themeIconId?: string | 'folder' | 'file';
+    themeIcon?: ThemeIcon;
     tooltip?: string;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     description?: string | boolean | any;
@@ -68,7 +71,7 @@ export interface TreeViewNode extends SelectableTreeNode {
 }
 export namespace TreeViewNode {
     export function is(arg: TreeNode | undefined): arg is TreeViewNode {
-        return !!arg && SelectableTreeNode.is(arg) && !ExpandableTreeNode.is(arg) && !CompositeTreeNode.is(arg);
+        return !!arg && SelectableTreeNode.is(arg) && DecoratedTreeNode.is(arg);
     }
 }
 
@@ -78,7 +81,7 @@ export interface CompositeTreeViewNode extends TreeViewNode, ExpandableTreeNode,
 }
 export namespace CompositeTreeViewNode {
     export function is(arg: TreeNode | undefined): arg is CompositeTreeViewNode {
-        return !!arg && SelectableTreeNode.is(arg) && ExpandableTreeNode.is(arg) && CompositeTreeNode.is(arg);
+        return TreeViewNode.is(arg) && ExpandableTreeNode.is(arg) && CompositeTreeNode.is(arg);
     }
 }
 
@@ -149,14 +152,16 @@ export class PluginTree extends TreeImpl {
     }
 
     protected createTreeNode(item: TreeViewItem, parent: CompositeTreeNode): TreeNode {
+        const decorationData = this.toDecorationData(item);
         const icon = this.toIconClass(item);
         const resourceUri = item.resourceUri && URI.revive(item.resourceUri).toString();
-        const themeIconId = item.themeIconId ? item.themeIconId : item.collapsibleState !== TreeViewItemCollapsibleState.None ? 'folder' : 'file';
+        const themeIcon = item.themeIcon ? item.themeIcon : item.collapsibleState !== TreeViewItemCollapsibleState.None ? { id: 'folder' } : undefined;
         const update: Partial<TreeViewNode> = {
             name: item.label,
+            decorationData,
             icon,
             description: item.description,
-            themeIconId,
+            themeIcon,
             resourceUri,
             tooltip: item.tooltip,
             contextValue: item.contextValue,
@@ -178,7 +183,7 @@ export class PluginTree extends TreeImpl {
                 command: item.command
             }, update);
         }
-        if (TreeViewNode.is(node)) {
+        if (TreeViewNode.is(node) && !ExpandableTreeNode.is(node)) {
             return Object.assign(node, update, { command: item.command });
         }
         return Object.assign({
@@ -190,6 +195,17 @@ export class PluginTree extends TreeImpl {
         }, update);
     }
 
+    protected toDecorationData(item: TreeViewItem): WidgetDecoration.Data {
+        let decoration: WidgetDecoration.Data = {};
+        if (item.highlights) {
+            const highlight = {
+                ranges: item.highlights.map(h => ({ offset: h[0], length: h[1] - h[0] }))
+            };
+            decoration = { highlight };
+        }
+        return decoration;
+    }
+
     protected toIconClass(item: TreeViewItem): string | undefined {
         if (item.icon) {
             return 'fa ' + item.icon;
@@ -257,6 +273,9 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(LabelParser)
     protected readonly labelParser: LabelParser;
 
+    @inject(ColorRegistry)
+    protected readonly colorRegistry: ColorRegistry;
+
     protected readonly markdownIt = markdownit();
 
     @postConstruct()
@@ -286,7 +305,14 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     protected override renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
         const icon = this.toNodeIcon(node);
         if (icon) {
-            return <div className={icon + ' theia-tree-view-icon'}></div>;
+            let style: React.CSSProperties | undefined;
+            if (TreeViewNode.is(node) && node.themeIcon?.color) {
+                const color = this.colorRegistry.getCurrentColor(node.themeIcon.color.id);
+                if (color) {
+                    style = { color };
+                }
+            }
+            return <div className={icon + ' theia-tree-view-icon'} style={style}></div>;
         }
         return undefined;
     }
@@ -358,8 +384,10 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
             const inlineCommands = menu.children.filter((item): item is ActionMenuNode => item instanceof ActionMenuNode);
             const tailDecorations = super.renderTailDecorations(node, props);
             return <React.Fragment>
-                {inlineCommands.length > 0 && <div className={TREE_NODE_SEGMENT_CLASS}>{inlineCommands.map((item, index) => this.renderInlineCommand(item, index, arg))}</div>}
-                {tailDecorations !== undefined && <div className={TREE_NODE_SEGMENT_CLASS}>{super.renderTailDecorations(node, props)}</div>}
+                {inlineCommands.length > 0 && <div className={TREE_NODE_SEGMENT_CLASS + ' flex'}>
+                    {inlineCommands.map((item, index) => this.renderInlineCommand(item, index, this.focusService.hasFocus(node), arg))}
+                </div>}
+                {tailDecorations !== undefined && <div className={TREE_NODE_SEGMENT_CLASS + ' flex'}>{tailDecorations}</div>}
             </React.Fragment>;
         });
     }
@@ -369,13 +397,14 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    protected renderInlineCommand(node: ActionMenuNode, index: number, arg: any): React.ReactNode {
+    protected renderInlineCommand(node: ActionMenuNode, index: number, tabbable: boolean, arg: any): React.ReactNode {
         const { icon } = node;
         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(' ');
-        return <div key={index} className={className} title={node.label} onClick={e => {
+        const tabIndex = tabbable ? 0 : undefined;
+        return <div key={index} className={className} title={node.label} tabIndex={tabIndex} onClick={e => {
             e.stopPropagation();
             this.commands.executeCommand(node.action.commandId, arg);
         }} />;
@@ -404,13 +433,12 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         this.tryExecuteCommand();
     }
 
-    override handleClickEvent(node: TreeNode, event: React.MouseEvent<HTMLElement>): void {
-        super.handleClickEvent(node, event);
-        // If clicked on item (not collapsable icon) - execute command or toggle expansion if item has no command
+    protected override tapNode(node?: TreeNode): void {
+        super.tapNode(node);
         const commandMap = this.findCommands(node);
         if (commandMap.size > 0) {
             this.tryExecuteCommandMap(commandMap);
-        } else if (this.isExpandable(node) && !this.hasShiftMask(event) && !this.hasCtrlCmdMask(event)) {
+        } else if (node && this.isExpandable(node)) {
             this.model.toggleNodeExpansion(node);
         }
     }

package/src/main/browser/webview/webview-theme-data-provider.ts

@@ -22,7 +22,8 @@
 import { inject, postConstruct, injectable } from '@theia/core/shared/inversify';
 import { Emitter } from '@theia/core/lib/common/event';
 import { EditorPreferences, EditorConfiguration } from '@theia/editor/lib/browser/editor-preferences';
-import { Theme, ThemeService } from '@theia/core/lib/browser/theming';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+import { Theme } from '@theia/core/lib/common/theme';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { ColorApplicationContribution } from '@theia/core/lib/browser/color-application-contribution';
 
@@ -39,14 +40,10 @@ export class WebviewThemeDataProvider {
     protected readonly onDidChangeThemeDataEmitter = new Emitter<void>();
     readonly onDidChangeThemeData = this.onDidChangeThemeDataEmitter.event;
 
-    @inject(EditorPreferences)
-    protected readonly editorPreferences: EditorPreferences;
-
-    @inject(ColorRegistry)
-    protected readonly colors: ColorRegistry;
-
-    @inject(ColorApplicationContribution)
-    protected readonly colorContribution: ColorApplicationContribution;
+    @inject(EditorPreferences) protected readonly editorPreferences: EditorPreferences;
+    @inject(ColorRegistry) protected readonly colors: ColorRegistry;
+    @inject(ColorApplicationContribution) protected readonly colorContribution: ColorApplicationContribution;
+    @inject(ThemeService) protected readonly themeService: ThemeService;
 
     protected themeData: WebviewThemeData | undefined;
 
@@ -113,7 +110,7 @@ export class WebviewThemeDataProvider {
     }
 
     protected getActiveTheme(): Theme {
-        return ThemeService.get().getCurrentTheme();
+        return this.themeService.getCurrentTheme();
     }
 
     protected getThemeType(theme: Theme): WebviewThemeType {

package/src/main/node/handlers/plugin-theia-directory-handler.ts

@@ -14,18 +14,24 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import * as path from 'path';
+import * as filenamify from 'filenamify';
+import * as fs from '@theia/core/shared/fs-extra';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { FileUri } from '@theia/core/lib/node';
 import {
-    PluginDeployerDirectoryHandler,
-    PluginDeployerEntry, PluginPackage, PluginDeployerDirectoryHandlerContext,
-    PluginDeployerEntryType
+    PluginDeployerDirectoryHandler, PluginDeployerEntry, PluginPackage, PluginDeployerDirectoryHandlerContext, PluginDeployerEntryType, PluginType, PluginIdentifiers
 } from '../../../common/plugin-protocol';
-import { injectable } from '@theia/core/shared/inversify';
-import * as fs from '@theia/core/shared/fs-extra';
-import * as path from 'path';
+import { PluginCliContribution } from '../plugin-cli-contribution';
+import { getTempDir } from '../temp-dir-util';
 
 @injectable()
 export class PluginTheiaDirectoryHandler implements PluginDeployerDirectoryHandler {
 
+    protected readonly deploymentDirectory = FileUri.create(getTempDir('theia-copied'));
+
+    @inject(PluginCliContribution) protected readonly pluginCli: PluginCliContribution;
+
     accept(resolvedPlugin: PluginDeployerEntry): boolean {
 
         console.log('PluginTheiaDirectoryHandler: accepting plugin with path', resolvedPlugin.path());
@@ -37,33 +43,26 @@ export class PluginTheiaDirectoryHandler implements PluginDeployerDirectoryHandl
 
         // is there a package.json ?
         const packageJsonPath = path.resolve(resolvedPlugin.path(), 'package.json');
-        const existsPackageJson: boolean = fs.existsSync(packageJsonPath);
-        if (!existsPackageJson) {
-            return false;
-        }
-
-        let packageJson: PluginPackage = resolvedPlugin.getValue('package.json');
-        if (!packageJson) {
-            packageJson = fs.readJSONSync(packageJsonPath);
-            resolvedPlugin.storeValue('package.json', packageJson);
-        }
 
-        if (!packageJson.engines) {
-            return false;
-        }
-
-        if (packageJson.engines && packageJson.engines.theiaPlugin) {
-            return true;
-        }
+        try {
+            let packageJson = resolvedPlugin.getValue<PluginPackage>('package.json');
+            if (!packageJson) {
+                packageJson = fs.readJSONSync(packageJsonPath);
+                packageJson.publisher ??= PluginIdentifiers.UNPUBLISHED;
+                resolvedPlugin.storeValue('package.json', packageJson);
+            }
 
+            if (packageJson?.engines?.theiaPlugin) {
+                return true;
+            }
+        } catch { /* Failed to read file. Fall through. */ }
         return false;
-
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    handle(context: PluginDeployerDirectoryHandlerContext): Promise<any> {
+    async handle(context: PluginDeployerDirectoryHandlerContext): Promise<void> {
+        await this.copyDirectory(context);
         const types: PluginDeployerEntryType[] = [];
-        const packageJson: PluginPackage = context.pluginEntry().getValue('package.json');
+        const packageJson = context.pluginEntry().getValue<PluginPackage>('package.json');
         if (packageJson.theiaPlugin && packageJson.theiaPlugin.backend) {
             types.push(PluginDeployerEntryType.BACKEND);
         }
@@ -72,6 +71,35 @@ export class PluginTheiaDirectoryHandler implements PluginDeployerDirectoryHandl
         }
 
         context.pluginEntry().accept(...types);
-        return Promise.resolve(true);
+    }
+
+    protected async copyDirectory(context: PluginDeployerDirectoryHandlerContext): Promise<void> {
+        if (this.pluginCli.copyUncompressedPlugins() && context.pluginEntry().type === PluginType.User) {
+            const entry = context.pluginEntry();
+            const id = entry.id();
+            const pathToRestore = entry.path();
+            const origin = entry.originalPath();
+            const targetDir = await this.getExtensionDir(context);
+            try {
+                if (fs.existsSync(targetDir) || !entry.path().startsWith(origin)) {
+                    console.log(`[${id}]: already copied.`);
+                } else {
+                    console.log(`[${id}]: copying to "${targetDir}"`);
+                    await fs.mkdirp(FileUri.fsPath(this.deploymentDirectory));
+                    await context.copy(origin, targetDir);
+                    entry.updatePath(targetDir);
+                    if (!this.accept(entry)) {
+                        throw new Error('Unable to resolve plugin metadata after copying');
+                    }
+                }
+            } catch (e) {
+                console.warn(`[${id}]: Error when copying.`, e);
+                entry.updatePath(pathToRestore);
+            }
+        }
+    }
+
+    protected async getExtensionDir(context: PluginDeployerDirectoryHandlerContext): Promise<string> {
+        return FileUri.fsPath(this.deploymentDirectory.resolve(filenamify(context.pluginEntry().id(), { replacement: '_' })));
     }
 }

package/src/main/node/handlers/plugin-theia-file-handler.ts

@@ -14,6 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import * as path from 'path';
 import { PluginDeployerFileHandler, PluginDeployerEntry, PluginDeployerFileHandlerContext, PluginType } from '../../../common/plugin-protocol';
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { getTempDir } from '../temp-dir-util';
@@ -21,6 +22,7 @@ import * as fs from '@theia/core/shared/fs-extra';
 import * as filenamify from 'filenamify';
 import { FileUri } from '@theia/core/lib/node/file-uri';
 import { PluginTheiaEnvironment } from '../../common/plugin-theia-environment';
+import URI from '@theia/core/lib/common/uri';
 
 @injectable()
 export class PluginTheiaFileHandler implements PluginDeployerFileHandler {
@@ -35,6 +37,7 @@ export class PluginTheiaFileHandler implements PluginDeployerFileHandler {
     }
 
     async handle(context: PluginDeployerFileHandlerContext): Promise<void> {
+        await this.ensureDiscoverability(context);
         const id = context.pluginEntry().id();
         const pluginDir = await this.getPluginDir(context);
         console.log(`[${id}]: trying to decompress into "${pluginDir}"...`);
@@ -48,11 +51,30 @@ export class PluginTheiaFileHandler implements PluginDeployerFileHandler {
         context.pluginEntry().updatePath(pluginDir);
     }
 
-    protected async getPluginDir(context: PluginDeployerFileHandlerContext): Promise<string> {
-        let pluginsDirUri = this.systemPluginsDirUri;
+    /**
+     * Ensures that a user-installed plugin file is transferred to the user extension folder.
+     */
+    protected async ensureDiscoverability(context: PluginDeployerFileHandlerContext): Promise<void> {
         if (context.pluginEntry().type === PluginType.User) {
-            pluginsDirUri = await this.environment.getPluginsDirUri();
+            const userExtensionsDir = await this.environment.getPluginsDirUri();
+            const currentPath = context.pluginEntry().path();
+            if (!userExtensionsDir.isEqualOrParent(new URI(currentPath)) && !userExtensionsDir.isEqualOrParent(new URI(context.pluginEntry().originalPath()))) {
+                try {
+                    const newPath = FileUri.fsPath(userExtensionsDir.resolve(path.basename(currentPath)));
+                    await fs.mkdirp(FileUri.fsPath(userExtensionsDir));
+                    await new Promise<void>((resolve, reject) => {
+                        fs.copyFile(currentPath, newPath, error => error ? reject(error) : resolve());
+                    });
+                    context.pluginEntry().updatePath(newPath);
+                    context.pluginEntry().storeValue('sourceLocations', [newPath]);
+                } catch (e) {
+                    console.error(`[${context.pluginEntry().id}]: Failed to copy to user directory. Future sessions may not have access to this plugin.`);
+                }
+            }
         }
-        return FileUri.fsPath(pluginsDirUri.resolve(filenamify(context.pluginEntry().id(), { replacement: '_' })));
+    }
+
+    protected async getPluginDir(context: PluginDeployerFileHandlerContext): Promise<string> {
+        return FileUri.fsPath(this.systemPluginsDirUri.resolve(filenamify(context.pluginEntry().id(), { replacement: '_' })));
     }
 }

package/src/main/node/plugin-cli-contribution.ts

@@ -24,6 +24,7 @@ export class PluginCliContribution implements CliContribution {
 
     static PLUGINS = 'plugins';
     static PLUGIN_MAX_SESSION_LOGS_FOLDERS = 'plugin-max-session-logs-folders';
+    static UNCOMPRESSED_PLUGINS_IN_PLACE = 'uncompressed-plugins-in-place';
     /**
      * This is the default value used in VSCode, see:
      * - https://github.com/Microsoft/vscode/blob/613447d6b3f458ef7fee227e3876303bf5184580/src/vs/code/electron-browser/sharedProcess/contrib/logsDataCleaner.ts#L32
@@ -32,6 +33,7 @@ export class PluginCliContribution implements CliContribution {
 
     protected _localDir: string | undefined;
     protected _maxSessionLogsFolders: number;
+    protected _keepUncompressedInPlace = false;
 
     configure(conf: Argv): void {
         conf.option(PluginCliContribution.PLUGINS, {
@@ -48,6 +50,12 @@ export class PluginCliContribution implements CliContribution {
             default: PluginCliContribution.DEFAULT_PLUGIN_MAX_SESSION_LOGS_FOLDERS,
             nargs: 1
         });
+
+        conf.option(PluginCliContribution.UNCOMPRESSED_PLUGINS_IN_PLACE, {
+            description: 'Whether user plugins that are stored on disk as uncompressed directories should be run in place or copied to temporary folder.',
+            type: 'boolean',
+            default: false,
+        });
     }
 
     setArguments(args: Arguments): void {
@@ -60,6 +68,7 @@ export class PluginCliContribution implements CliContribution {
         if (maxSessionLogsFoldersArg && Number.isInteger(maxSessionLogsFoldersArg) && maxSessionLogsFoldersArg > 0) {
             this._maxSessionLogsFolders = maxSessionLogsFoldersArg;
         }
+        this._keepUncompressedInPlace = Boolean(args[PluginCliContribution.UNCOMPRESSED_PLUGINS_IN_PLACE]);
     }
 
     localDir(): string | undefined {
@@ -70,4 +79,7 @@ export class PluginCliContribution implements CliContribution {
         return this._maxSessionLogsFolders;
     }
 
+    copyUncompressedPlugins(): boolean {
+        return !this._keepUncompressedInPlace;
+    }
 }

package/src/main/node/plugin-deployer-directory-handler-context-impl.ts

@@ -14,12 +14,28 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 
+import * as path from 'path';
+import * as fs from '@theia/core/shared/fs-extra';
 import { PluginDeployerEntry, PluginDeployerDirectoryHandlerContext } from '../../common/plugin-protocol';
 
 export class PluginDeployerDirectoryHandlerContextImpl implements PluginDeployerDirectoryHandlerContext {
 
-    constructor(private readonly pluginDeployerEntry: PluginDeployerEntry) {
+    constructor(private readonly pluginDeployerEntry: PluginDeployerEntry) { }
 
+    async copy(origin: string, target: string): Promise<void> {
+        const contents = await fs.readdir(origin);
+        await fs.mkdirp(target);
+        await Promise.all(contents.map(async item => {
+            const itemPath = path.resolve(origin, item);
+            const targetPath = path.resolve(target, item);
+            const stat = await fs.stat(itemPath);
+            if (stat.isDirectory()) {
+                return this.copy(itemPath, targetPath);
+            }
+            if (stat.isFile()) {
+                return new Promise<void>((resolve, reject) => fs.copyFile(itemPath, targetPath, e => e === null ? resolve() : reject(e)));
+            }
+        }));
     }
 
     pluginEntry(): PluginDeployerEntry {

package/src/main/node/plugin-deployer-file-handler-context-impl.ts

@@ -25,7 +25,6 @@ export class PluginDeployerFileHandlerContextImpl implements PluginDeployerFileH
 
     async unzip(sourcePath: string, destPath: string): Promise<void> {
         await decompress(sourcePath, destPath);
-        return Promise.resolve();
     }
 
     pluginEntry(): PluginDeployerEntry {