@theia/plugin-ext 1.32.0-next.5 → 1.32.0

package/src/main/browser/menus/plugin-menu-command-adapter.ts

@@ -247,9 +247,11 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
 
     protected getSelectedResources(): [CodeUri | TreeViewSelection | undefined, CodeUri[] | undefined] {
         const selection = this.selectionService.selection;
+        const resourceKey = this.resourceContextKey.get();
+        const resourceUri = resourceKey ? CodeUri.parse(resourceKey) : undefined;
         const firstMember = TreeWidgetSelection.is(selection) && selection.source instanceof TreeViewWidget && selection[0]
             ? selection.source.toTreeViewSelection(selection[0])
-            : (UriSelection.getUri(selection) ?? this.resourceContextKey.get())?.['codeUri'];
+            : UriSelection.getUri(selection)?.['codeUri'] ?? resourceUri;
         const secondMember = TreeWidgetSelection.is(selection)
             ? UriSelection.getUris(selection).map(uri => uri['codeUri'])
             : undefined;

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

@@ -15,7 +15,8 @@
 // *****************************************************************************
 
 import { injectable, inject, named } from '@theia/core/shared/inversify';
-import { ITokenTypeMap, IEmbeddedLanguagesMap, StandardTokenType } from 'vscode-textmate';
+import { ITokenTypeMap, IEmbeddedLanguagesMap } from 'vscode-textmate';
+import { StandardTokenType } from 'vscode-textmate/release/encodedTokenAttributes';
 import { TextmateRegistry, getEncodedLanguageId, MonacoTextmateService, GrammarDefinition } from '@theia/monaco/lib/browser/textmate';
 import { MenusContributionPointHandler } from './menus/menus-contribution-handler';
 import { PluginViewRegistry } from './view/plugin-view-registry';

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

@@ -35,8 +35,13 @@
 }
 
 .theia-plugin-view-container {
-    -webkit-mask: url('');
-    mask: url('');
+    /*
+        It might take a second or two until the real plugin mask is loaded
+        To prevent flickering on the icon, we set a transparent mask instead
+        Since masks only support images, svg or gradients, we create a transparent gradient here
+    */
+    -webkit-mask: linear-gradient(transparent, transparent);
+    mask: linear-gradient(transparent, transparent);
     background-color: var(--theia-activityBar-inactiveForeground);
 }
 
@@ -51,10 +56,10 @@
 .theia-plugin-root-folder-expanded-icon,
 .theia-plugin-root-folder-expanded-icon::before {
     padding-right: var(--theia-ui-padding);
-	width: var(--theia-icon-size);
-	height: var(--theia-content-line-height);
-	line-height: inherit !important;
-	display: inline-block;
+    width: var(--theia-icon-size);
+    height: var(--theia-content-line-height);
+    line-height: inherit !important;
+    display: inline-block;
 }
 
 .p-TabBar.theia-app-sides .theia-plugin-file-icon,

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

@@ -202,7 +202,7 @@ export class TasksMainImpl implements TasksMain, Disposable {
     }
 
     protected toTaskConfiguration(taskDto: TaskDto): TaskConfiguration {
-        const { group, presentation, scope, source, ...common } = taskDto ?? {};
+        const { group, presentation, scope, source, runOptions, ...common } = taskDto ?? {};
         const partialConfig: Partial<TaskConfiguration> = {};
         if (presentation) {
             partialConfig.presentation = this.convertTaskPresentation(presentation);
@@ -213,6 +213,7 @@ export class TasksMainImpl implements TasksMain, Disposable {
         return {
             ...common,
             ...partialConfig,
+            runOptions,
             _scope: scope,
             _source: source,
         };

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

@@ -282,7 +282,8 @@ export class TextEditorMain implements Disposable {
         if (!this.editor) {
             return;
         }
-        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorations('Plugin decorations', key, ranges.map(option => Object.assign(option, { color: undefined })));
+        (this.editor.getControl() as unknown as StandaloneCodeEditor)
+            .setDecorationsByType('Plugin decorations', key, ranges.map(option => Object.assign(option, { color: undefined })));
     }
 
     setDecorationsFast(key: string, _ranges: number[]): void {
@@ -294,7 +295,7 @@ export class TextEditorMain implements Disposable {
         for (let i = 0; i < len; i++) {
             ranges[i] = new monaco.Range(_ranges[4 * i], _ranges[4 * i + 1], _ranges[4 * i + 2], _ranges[4 * i + 3]);
         }
-        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorationsFast(key, ranges);
+        (this.editor.getControl() as unknown as StandaloneCodeEditor).setDecorationsByTypeFast(key, ranges);
     }
 
     private static toMonacoSelections(selection: Selection): monaco.Selection {

package/src/main/browser/theme-icon-override.ts

@@ -28,13 +28,44 @@ const codeIconMap: Record<string, string> = {
     'callstack-view-icon': 'debug-alt',
     'callstack-view-session': 'bug',
     'comments-view-icon': 'comment-discussion',
+    'debug-breakpoint': 'debug-breakpoint',
+    'debug-breakpoint-conditional': 'debug-breakpoint-conditional',
+    'debug-breakpoint-conditional-disabled': 'debug-breakpoint-conditional-disabled',
+    'debug-breakpoint-conditional-verified': 'debug-breakpoint-conditional-unverified',
+    'debug-breakpoint-data': 'debug-breakpoint-data',
+    'debug-breakpoint-data-disabled': 'debug-breakpoint-data-disabled',
+    'debug-breakpoint-data-unverified': 'debug-breakpoint-data-unverified',
+    'debug-breakpoint-disabled': 'debug-breakpoint-disabled',
+    'debug-breakpoint-function': 'debug-breakpoint-function',
+    'debug-breakpoint-function-disabled': 'debug-breakpoint-function-disabled',
+    'debug-breakpoint-function-unverified': 'debug-breakpoint-function-unverified',
+    'debug-breakpoint-log': 'debug-breakpoint-log',
+    'debug-breakpoint-log-disabled': 'debug-breakpoint-log-disabled',
+    'debug-breakpoint-log-unverified': 'debug-breakpoint-log-unverified',
+    'debug-breakpoint-unsupported': 'debug-breakpoint-unsupported',
+    'debug-breakpoint-unverified': 'debug-breakpoint-unverified',
     'debug-collapse-all': 'collapse-all',
     'debug-configure': 'gear',
     'debug-console-clear-all': 'clear-all',
     'debug-console-evaluation-input': 'arrow-small-right',
     'debug-console-evaluation-prompt': 'chevron-right',
     'debug-console-view-icon': 'debug-console',
+    'debug-continue': 'debug-continue',
+    'debug-disconnect': 'debug-disconnect',
     'debug-gripper': 'gripper',
+    'debug-hint': 'debug-hint',
+    'debug-pause': 'debug-pause',
+    'debug-restart': 'debug-restart',
+    'debug-restart-frame': 'debug-restart-frame',
+    'debug-reverse-continue': 'debug-reverse-continue',
+    'debug-stackframe': 'debug-stackframe',
+    'debug-stackframe-focused': 'debug-stackframe-focused',
+    'debug-start': 'debug-start',
+    'debug-step-back': 'debug-step-back',
+    'debug-step-into': 'debug-step-into',
+    'debug-step-out': 'debug-step-out',
+    'debug-step-over': 'debug-step-over',
+    'debug-stop': 'debug-stop',
     'default-view-icon': 'window',
     'diff-editor-next-change': 'arrow-down',
     'diff-editor-previous-change': 'arrow-up',

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

@@ -34,7 +34,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 || 'themeIcon' in element)) {
-            return this.treeLabelProvider.canHandle(element) + 1;
+            return Number.MAX_SAFE_INTEGER - 512;
         }
         return 0;
     }

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

@@ -30,19 +30,19 @@ import {
     TREE_NODE_TAIL_CLASS,
     TreeModelImpl,
     TreeViewWelcomeWidget,
-    TooltipService,
-    TooltipAttributes
+    TooltipAttributes,
+    TreeSelection,
+    HoverService
 } from '@theia/core/lib/browser';
 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 { ACTION_ITEM, codicon, 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 '@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';
@@ -408,8 +408,8 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(ContextKeyService)
     protected readonly contextKeyService: ContextKeyService;
 
-    @inject(TooltipService)
-    protected readonly tooltipService: TooltipService;
+    @inject(HoverService)
+    protected readonly hoverService: HoverService;
 
     @inject(LabelParser)
     protected readonly labelParser: LabelParser;
@@ -417,33 +417,18 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     @inject(ColorRegistry)
     protected readonly colorRegistry: ColorRegistry;
 
-    protected readonly markdownIt = markdownit();
-
     @postConstruct()
     protected override init(): void {
         super.init();
         this.id = this.identifier.id;
         this.addClass('theia-tree-view');
         this.node.style.height = '100%';
-        this.markdownItPlugin();
         this.model.onDidChangeWelcomeState(this.update, this);
         this.toDispose.push(this.model.onDidChangeWelcomeState(this.update, this));
         this.toDispose.push(this.onDidChangeVisibilityEmitter);
         this.toDispose.push(this.contextKeyService.onDidChange(() => this.update()));
     }
 
-    protected markdownItPlugin(): void {
-        this.markdownIt.renderer.rules.text = (tokens, idx) => {
-            const content = tokens[idx].content;
-            return this.labelParser.parse(content).map(chunk => {
-                if (typeof chunk === 'string') {
-                    return chunk;
-                }
-                return `<i class="${codicon(chunk.name)} ${chunk.animation ? `fa-${chunk.animation}` : ''} icon-inline"></i>`;
-            }).join('');
-        };
-    }
-
     protected override renderIcon(node: TreeNode, props: NodeProps): React.ReactNode {
         const icon = this.toNodeIcon(node);
         if (icon) {
@@ -480,16 +465,21 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
             };
         }
 
-        const elementRef = React.createRef<HTMLDivElement & Partial<TooltipAttributes>>();
         if (!node.tooltip && node instanceof ResolvableTreeViewNode) {
             let configuredTip = false;
             let source: CancellationTokenSource | undefined;
             attrs = {
                 ...attrs,
-                'data-for': this.tooltipService.tooltipId,
                 onMouseLeave: () => source?.cancel(),
-                onMouseEnter: async () => {
+                onMouseEnter: async event => {
                     if (configuredTip) {
+                        if (MarkdownString.is(node.tooltip)) {
+                            this.hoverService.requestHover({
+                                content: node.tooltip,
+                                target: event.target as HTMLElement,
+                                position: 'right'
+                            });
+                        }
                         return;
                     }
                     if (!node.resolved) {
@@ -500,27 +490,31 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
                             return;
                         }
                     }
-                    if (elementRef.current) {
-                        // Set the resolved tooltip. After an HTML element was created data-* properties must be accessed via the dataset
-                        elementRef.current.dataset.tip = MarkdownString.is(node.tooltip) ? this.markdownIt.render(node.tooltip.value) : node.tooltip;
-                        this.tooltipService.update();
-                        configuredTip = true;
-                        // Manually fire another mouseenter event to get react-tooltip to update the tooltip content.
-                        // Without this, the resolved tooltip is only shown after re-entering the tree item with the mouse.
-                        elementRef.current.dispatchEvent(new MouseEvent('mouseenter'));
+                    if (MarkdownString.is(node.tooltip)) {
+                        this.hoverService.requestHover({
+                            content: node.tooltip,
+                            target: event.target as HTMLElement,
+                            position: 'right'
+                        });
                     } else {
-                        console.error(`Could not set resolved tooltip for tree node '${node.id}' because its React Ref was not set.`);
+                        const title = node.tooltip ||
+                            (node.resourceUri && this.labelProvider.getLongName(new CoreURI(node.resourceUri)))
+                            || this.toNodeName(node);
+                        event.currentTarget.title = title;
                     }
+                    configuredTip = true;
                 }
             };
         } else if (MarkdownString.is(node.tooltip)) {
-            // Render markdown in custom tooltip
-            const tooltip = this.markdownIt.render(node.tooltip.value);
-
             attrs = {
                 ...attrs,
-                'data-tip': tooltip,
-                'data-for': this.tooltipService.tooltipId
+                onMouseEnter: event => {
+                    this.hoverService.requestHover({
+                        content: node.tooltip!,
+                        target: event.target as HTMLElement,
+                        position: 'right'
+                    });
+                }
             };
         } else {
             const title = node.tooltip ||
@@ -549,7 +543,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
         if (description) {
             children.push(<span className='theia-tree-view-description'>{description}</span>);
         }
-        return <div {...attrs} ref={elementRef}>{...children}</div>;
+        return <div {...attrs}>{...children}</div>;
     }
 
     protected override renderTailDecorations(node: TreeViewNode, props: NodeProps): React.ReactNode {
@@ -666,9 +660,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     }
 
     protected override render(): React.ReactNode {
-        const node = React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
-        this.tooltipService.update();
-        return node;
+        return React.createElement('div', this.createContainerAttributes(), this.renderSearchInfo(), this.renderTree(this.model));
     }
 
     protected renderSearchInfo(): React.ReactNode {
@@ -681,4 +673,33 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
     override shouldShowWelcomeView(): boolean {
         return (this.model.proxy === undefined || this.model.isTreeEmpty) && this.message === undefined;
     }
+
+    protected override handleContextMenuEvent(node: TreeNode | undefined, event: React.MouseEvent<HTMLElement, MouseEvent>): void {
+        if (SelectableTreeNode.is(node)) {
+            // Keep the selection for the context menu, if the widget support multi-selection and the right click happens on an already selected node.
+            if (!this.props.multiSelect || !node.selected) {
+                const type = !!this.props.multiSelect && this.hasCtrlCmdMask(event) ? TreeSelection.SelectionType.TOGGLE : TreeSelection.SelectionType.DEFAULT;
+                this.model.addSelection({ node, type });
+            }
+            this.focusService.setFocus(node);
+            const contextMenuPath = this.props.contextMenuPath;
+            if (contextMenuPath) {
+                const { x, y } = event.nativeEvent;
+                const args = this.toContextMenuArgs(node);
+                const contextKeyService = this.contextKeyService.createOverlay([
+                    ['viewItem', (TreeViewNode.is(node) && node.contextValue) || undefined],
+                    ['view', this.identifier.id]
+                ]);
+                setTimeout(() => this.contextMenuRenderer.render({
+                    menuPath: contextMenuPath,
+                    anchor: { x, y },
+                    args,
+                    contextKeyService,
+                    onHide: () => contextKeyService.dispose(),
+                }), 10);
+            }
+        }
+        event.stopPropagation();
+        event.preventDefault();
+    }
 }

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

@@ -163,14 +163,7 @@ export class TreeViewsMainImpl implements TreeViewsMain, Disposable {
         }));
 
         this.toDispose.push(treeViewWidget.model.onSelectionChanged(event => {
-            if (event.length === 1) {
-                const { contextValue } = event[0] as TreeViewNode;
-                this.contextKeys.viewItem.set(contextValue);
-            } else {
-                this.contextKeys.viewItem.set('');
-            }
             this.contextKeys.view.set(treeViewId);
-
             this.proxy.$setSelection(treeViewId, event.map((node: TreeViewNode) => node.id));
         }));
 

package/src/plugin/languages.ts

@@ -520,7 +520,8 @@ export class LanguagesExtImpl implements LanguagesExt {
         return this.createDisposable(callId, disposables?.dispose);
     }
 
-    $provideCodeActions(handle: number,
+    $provideCodeActions(
+        handle: number,
         resource: UriComponents,
         rangeOrSelection: Range | Selection,
         context: CodeActionContext,

package/src/plugin/plugin-context.ts

@@ -158,7 +158,8 @@ import {
     TestRunProfileKind,
     TestTag,
     TestRunRequest,
-    TestMessage
+    TestMessage,
+    ExtensionKind
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -180,7 +181,6 @@ import { ConnectionImpl } from '../common/connection';
 import { TasksExtImpl } from './tasks/tasks';
 import { DebugExtImpl } from './debug/debug-ext';
 import { FileSystemExtImpl } from './file-system-ext-impl';
-import { QuickPick, QuickPickItem, ResourceLabelFormatter, LineChange } from '@theia/plugin';
 import { ScmExtImpl } from './scm';
 import { DecorationsExtImpl } from './decorations';
 import { TextEditorExt } from './text-editor';
@@ -308,7 +308,7 @@ export function createAPIFactory(
             getCommands(filterInternal: boolean = false): PromiseLike<string[]> {
                 return commandRegistry.getCommands(filterInternal);
             },
-            registerDiffInformationCommand(command: string, callback: (diff: LineChange[], ...args: any[]) => any, thisArg?: any): Disposable {
+            registerDiffInformationCommand(command: string, callback: (diff: theia.LineChange[], ...args: any[]) => any, thisArg?: any): Disposable {
                 // Dummy implementation.
                 return new Disposable(() => { });
             }
@@ -385,7 +385,7 @@ export function createAPIFactory(
             showQuickPick(items: any, options?: theia.QuickPickOptions, token?: theia.CancellationToken): any {
                 return quickOpenExt.showQuickPick(items, options, token);
             },
-            createQuickPick<T extends QuickPickItem>(): QuickPick<T> {
+            createQuickPick<T extends theia.QuickPickItem>(): theia.QuickPick<T> {
                 return quickOpenExt.createQuickPick(plugin);
             },
             showWorkspaceFolderPick(options?: theia.WorkspaceFolderPickOptions): PromiseLike<theia.WorkspaceFolder | undefined> {
@@ -461,7 +461,7 @@ export function createAPIFactory(
             },
             createTerminal(nameOrOptions: theia.TerminalOptions | theia.PseudoTerminalOptions | theia.ExtensionTerminalOptions | (string | undefined),
                 shellPath?: string,
-                shellArgs?: string[]): theia.Terminal {
+                shellArgs?: string[] | string): theia.Terminal {
                 return terminalExt.createTerminal(nameOrOptions, shellPath, shellArgs);
             },
             onDidChangeTerminalState,
@@ -476,6 +476,10 @@ export function createAPIFactory(
             createTreeView<T>(viewId: string, options: { treeDataProvider: theia.TreeDataProvider<T> }): theia.TreeView<T> {
                 return treeViewsExt.createTreeView(plugin, viewId, options);
             },
+            withScmProgress<R>(task: (progress: theia.Progress<number>) => Thenable<R>) {
+                const options: ProgressOptions = { location: ProgressLocation.SourceControl };
+                return notificationExt.withProgress(options, () => task({ report() { /* noop */ } }));
+            },
             withProgress<R>(
                 options: ProgressOptions,
                 task: (progress: Progress<{ message?: string; increment?: number }>, token: theia.CancellationToken) => PromiseLike<R>
@@ -610,7 +614,7 @@ export function createAPIFactory(
             registerTaskProvider(type: string, provider: theia.TaskProvider): theia.Disposable {
                 return tasks.registerTaskProvider(type, provider);
             },
-            registerResourceLabelFormatter(formatter: ResourceLabelFormatter): theia.Disposable {
+            registerResourceLabelFormatter(formatter: theia.ResourceLabelFormatter): theia.Disposable {
                 return labelServiceExt.$registerResourceLabelFormatter(formatter);
             },
             registerTimelineProvider(scheme: string | string[], provider: theia.TimelineProvider): theia.Disposable {
@@ -667,6 +671,24 @@ export function createAPIFactory(
             get onDidChangeLogLevel(): theia.Event<theia.LogLevel> { return onDidChangeLogLevel.event; }
         });
 
+        const extensions: typeof theia.extensions = Object.freeze({
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            getExtension<T = any>(extensionId: string): theia.Extension<T> | undefined {
+                const plg = pluginManager.getPluginById(extensionId.toLowerCase());
+                if (plg) {
+                    return new PluginExt(pluginManager, plg);
+                }
+                return undefined;
+            },
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            get all(): readonly theia.Extension<any>[] {
+                return pluginManager.getAllPlugins().map(plg => new PluginExt(pluginManager, plg));
+            },
+            get onDidChange(): theia.Event<void> {
+                return pluginManager.onDidChange;
+            }
+        });
+
         const languages: typeof theia.languages = {
             getLanguages(): PromiseLike<string[]> {
                 return languagesExt.getLanguages();
@@ -967,6 +989,7 @@ export function createAPIFactory(
             window,
             workspace,
             env,
+            extensions,
             languages,
             plugins,
             debug,
@@ -1100,16 +1123,12 @@ export function createAPIFactory(
             TestRunProfileKind,
             TestTag,
             TestRunRequest,
-            TestMessage
+            TestMessage,
+            ExtensionKind
         };
     };
 }
 
-export enum ExtensionKind {
-    UI = 1,
-    Workspace = 2
-}
-
 /**
  * Represents a Theia plugin as well as a VSCode extension.
  */
@@ -1131,7 +1150,7 @@ export interface ExtensionPlugin<T> extends theia.Plugin<T> {
      * is defined in the `package.json`-file of extensions. When no remote extension host exists,
      * the value is {@linkcode ExtensionKind.UI}.
      */
-    extensionKind: ExtensionKind;
+    extensionKind: theia.ExtensionKind;
 }
 
 export class Plugin<T> implements theia.Plugin<T> {

package/src/plugin/preference-registry.ts

@@ -17,13 +17,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { Emitter, Event } from '@theia/core/lib/common/event';
+import { isOSX, isWindows } from '@theia/core/lib/common/os';
 import { URI } from '@theia/core/shared/vscode-uri';
 import { ResourceMap } from '@theia/monaco-editor-core/esm/vs/base/common/map';
 import { IConfigurationOverrides, IOverrides } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
 import { Configuration, ConfigurationModel } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configurationModels';
 import { Workspace, WorkspaceFolder } from '@theia/monaco-editor-core/esm/vs/platform/workspace/common/workspace';
 import * as theia from '@theia/plugin';
-import { platform } from 'os';
 import { v4 } from 'uuid';
 import {
     PLUGIN_RPC_CONTEXT, PreferenceChangeExt, PreferenceData, PreferenceRegistryExt,
@@ -74,7 +74,7 @@ function lookUp(tree: any, key: string): any {
 export class TheiaWorkspace extends Workspace {
     constructor(ext: WorkspaceExtImpl) {
         const folders = (ext.workspaceFolders ?? []).map(folder => new WorkspaceFolder(folder));
-        super(v4(), folders, false, ext.workspaceFile ?? null, () => ['win32', 'darwin'].includes(platform()));
+        super(v4(), folders, false, ext.workspaceFile ?? null, () => isOSX || isWindows);
     }
 }
 
@@ -239,7 +239,15 @@ export class PreferenceRegistryExtImpl implements PreferenceRegistryExt {
         Object.keys(data[PreferenceScope.Folder]).forEach(resource => {
             folderConfigurations.set(URI.parse(resource), this.getConfigurationModel(data[PreferenceScope.Folder][resource]));
         });
-        return new Configuration(defaultConfiguration, userConfiguration, undefined, workspaceConfiguration, folderConfigurations);
+        return new Configuration(
+            defaultConfiguration,
+            new ConfigurationModel(), /** policy configuration. */
+            new ConfigurationModel(), /** application configuration. */
+            userConfiguration,
+            new ConfigurationModel(), /** remote configuration. */
+            workspaceConfiguration,
+            folderConfigurations
+        );
     }
 
     private getConfigurationModel(data: { [key: string]: any }): ConfigurationModel {

package/src/plugin/quick-open.ts

@@ -635,16 +635,18 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
             this._handlesToItems.set(i, item);
             this._itemsToHandles.set(item, i);
         });
-        this.update({
-            items: items.map((item, i) => {
-                if (item.kind === QuickPickItemKind.Separator) {
-                    return { kind: item.kind, label: item.label };
-                }
-                return {
+
+        const pickItems: TransferQuickPickItems[] = [];
+        for (let handle = 0; handle < items.length; handle++) {
+            const item = items[handle];
+            if (item.kind === QuickPickItemKind.Separator) {
+                pickItems.push({ type: 'separator', label: item.label, handle });
+            } else {
+                pickItems.push({
                     kind: item.kind,
                     label: item.label,
                     description: item.description,
-                    handle: i,
+                    handle,
                     detail: item.detail,
                     picked: item.picked,
                     alwaysShow: item.alwaysShow,
@@ -654,8 +656,12 @@ export class QuickPickExt<T extends theia.QuickPickItem> extends QuickInputExt i
                         tooltip: button.tooltip,
                         handle: button === QuickInputButtons.Back ? -1 : index,
                     }))
-                };
-            })
+                });
+            }
+        }
+
+        this.update({
+            items: pickItems,
         });
     }
 

package/src/plugin/terminal-ext.ts

@@ -61,7 +61,10 @@ export class TerminalServiceExtImpl implements TerminalServiceExt {
         return [...this._terminals.values()];
     }
 
-    createTerminal(nameOrOptions: TerminalOptions | PseudoTerminalOptions | ExtensionTerminalOptions | (string | undefined), shellPath?: string, shellArgs?: string[]): Terminal {
+    createTerminal(
+        nameOrOptions: TerminalOptions | PseudoTerminalOptions | ExtensionTerminalOptions | (string | undefined),
+        shellPath?: string, shellArgs?: string[] | string
+    ): Terminal {
         let options: TerminalOptions;
         let pseudoTerminal: theia.Pseudoterminal | undefined = undefined;
         const id = `plugin-terminal-${UUID.uuid4()}`;

package/src/plugin/type-converters.spec.ts

@@ -202,7 +202,10 @@ describe('Type converters:', () => {
                 reveal: 3,
                 focus: true
             },
-            group: groupDto
+            group: groupDto,
+            runOptions: {
+                reevaluateOnRerun: false
+            }
         };
 
         const shellTaskDtoWithCommandLine: TaskDto = {
@@ -213,7 +216,10 @@ describe('Type converters:', () => {
             scope: 2,
             command: commandLine,
             options: { cwd },
-            additionalProperty
+            additionalProperty,
+            runOptions: {
+                reevaluateOnRerun: false
+            }
         };
 
         const shellPluginTask: theia.Task = {
@@ -235,6 +241,9 @@ describe('Type converters:', () => {
                 options: {
                     cwd
                 }
+            },
+            runOptions: {
+                reevaluateOnRerun: false
             }
         };
 
@@ -264,6 +273,9 @@ describe('Type converters:', () => {
                 options: {
                     cwd
                 }
+            },
+            runOptions: {
+                reevaluateOnRerun: false
             }
         };
 
@@ -291,6 +303,9 @@ describe('Type converters:', () => {
                 options: {
                     cwd
                 }
+            },
+            runOptions: {
+                reevaluateOnRerun: false
             }
         };