@theia/plugin-ext 1.34.0-next.7 → 1.34.0

package/src/common/rpc-protocol.ts

@@ -22,7 +22,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { Channel, Disposable, DisposableCollection, ReadBuffer, WriteBuffer } from '@theia/core';
+import { Channel, Disposable, DisposableCollection, isObject, ReadBuffer, URI, WriteBuffer } from '@theia/core';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { ChannelMultiplexer, MessageProvider } from '@theia/core/lib/common/message-rpc/channel';
 import { MsgPackMessageDecoder, MsgPackMessageEncoder } from '@theia/core/lib/common/message-rpc/rpc-message-encoder';
@@ -30,7 +30,6 @@ import { Uint8ArrayReadBuffer, Uint8ArrayWriteBuffer } from '@theia/core/lib/com
 import { ClientProxyHandler, RpcInvocationHandler } from './proxy-handler';
 import { MsgPackExtensionManager } from '@theia/core/lib/common/message-rpc/msg-pack-extension-manager';
 import { URI as VSCodeURI } from '@theia/core/shared/vscode-uri';
-import URI from '@theia/core/lib/common/uri';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { Range, Position } from '../plugin/types-impl';
 
@@ -74,7 +73,7 @@ export namespace ConnectionClosedError {
         return Object.assign(new Error(message), { code });
     }
     export function is(error: unknown): error is ConnectionClosedError {
-        return !!error && typeof error === 'object' && 'code' in error && (error as ConnectionClosedError).code === code;
+        return isObject(error) && 'code' in error && (error as ConnectionClosedError).code === code;
     }
 }
 

package/src/common/types.ts

@@ -19,13 +19,13 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
+import { isObject as isObject0 } from '@theia/core/lib/common';
+
 /**
  * Returns `true` if the parameter has type "object" and not null, an array, a regexp, a date.
  */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function isObject(obj: any): boolean {
-    return typeof obj === 'object'
-        && obj !== null // eslint-disable-line @typescript-eslint/no-explicit-any
+export function isObject(obj: unknown): boolean {
+    return isObject0(obj)
         && !Array.isArray(obj)
         && !(obj instanceof RegExp)
         && !(obj instanceof Date);

package/src/hosted/browser/hosted-plugin.ts

@@ -616,6 +616,10 @@ export class HostedPluginSupport {
         return this.activateByEvent(`onFileSystem:${event.scheme}`);
     }
 
+    activateByTerminalProfile(profileId: string): Promise<void> {
+        return this.activateByEvent(`onTerminalProfile:${profileId}`);
+    }
+
     protected ensureFileSystemActivation(event: FileSystemProviderActivationEvent): void {
         event.waitUntil(this.activateByFileSystem(event));
     }

package/src/hosted/node/hosted-plugin-localization-service.ts

@@ -23,7 +23,7 @@ import { DeployedPlugin, Localization as PluginLocalization, PluginIdentifiers }
 import { URI } from '@theia/core/shared/vscode-uri';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { BackendApplicationContribution } from '@theia/core/lib/node';
-import { Disposable, MaybePromise } from '@theia/core';
+import { Disposable, isObject, MaybePromise } from '@theia/core';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 
 export interface VSCodeNlsConfig {
@@ -205,7 +205,7 @@ interface LocalizeInfo {
 }
 
 function isLocalizeInfo(obj: unknown): obj is LocalizeInfo {
-    return typeof obj === 'object' && obj && 'message' in obj || false;
+    return isObject(obj) && 'message' in obj || false;
 }
 
 function coerceLocalizations(translations: Record<string, string | LocalizeInfo>): Record<string, string> {
@@ -243,7 +243,7 @@ function localizePackage(value: unknown, translations: PackageTranslation, callb
         }
         return result;
     }
-    if (typeof value === 'object' && value) {
+    if (isObject(value)) {
         const result: Record<string, unknown> = {};
         for (const [name, item] of Object.entries(value)) {
             result[name] = localizePackage(item, translations, callback);

package/src/hosted/node/plugin-host.ts

@@ -13,8 +13,7 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
-// eslint-disable-next-line import/no-extraneous-dependencies
-import 'reflect-metadata';
+import '@theia/core/shared/reflect-metadata';
 import { ConnectionClosedError, RPCProtocolImpl } from '../../common/rpc-protocol';
 import { ProcessTerminatedMessage, ProcessTerminateMessage } from './hosted-plugin-protocol';
 import { PluginHostRPC } from './plugin-host-rpc';

package/src/hosted/node/scanners/scanner-theia.ts

@@ -59,7 +59,8 @@ import {
     Localization,
     PluginPackageTranslation,
     Translation,
-    PluginIdentifiers
+    PluginIdentifiers,
+    TerminalProfile
 } from '../../../common/plugin-protocol';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -358,9 +359,22 @@ export class TheiaPluginScanner implements PluginScanner {
             console.error(`Could not read '${rawPlugin.name}' contribution 'localizations'.`, rawPlugin.contributes.colors, err);
         }
 
+        try {
+            contributions.terminalProfiles = this.readTerminals(rawPlugin);
+        } catch (err) {
+            console.error(`Could not read '${rawPlugin.name}' contribution 'terminals'.`, rawPlugin.contributes.terminal, err);
+        }
+
         return contributions;
     }
 
+    protected readTerminals(pck: PluginPackage): TerminalProfile[] | undefined {
+        if (!pck?.contributes?.terminal?.profiles) {
+            return undefined;
+        }
+        return pck.contributes.terminal.profiles.filter(profile => profile.id && profile.title);
+    }
+
     protected readLocalizations(pck: PluginPackage): Localization[] | undefined {
         if (!pck.contributes || !pck.contributes.localizations) {
             return undefined;

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

@@ -199,7 +199,7 @@ export class AuthenticationMainImpl implements AuthenticationMain {
 
     protected async loginPrompt(providerName: string, extensionName: string, recreatingSession: boolean, _detail?: string): Promise<boolean> {
         const message = recreatingSession
-            ? nls.localize('theia/plugin-ext/signInAgain', "The extension '{0}' wants you to sign in again using {1}.", extensionName, providerName)
+            ? nls.localizeByDefault("The extension '{0}' wants you to sign in again using {1}.", extensionName, providerName)
             : nls.localizeByDefault("The extension '{0}' wants to sign in using {1}.", extensionName, providerName);
         const choice = await this.messageService.info(message, 'Allow', 'Cancel');
         return choice === 'Allow';

package/src/main/browser/commands.ts

@@ -71,7 +71,7 @@ class OpenNewTabDialog extends AbstractDialog<string> {
 
     constructor(windowService: WindowService) {
         super({
-            title: 'Your browser prevented opening of a new tab'
+            title: nls.localize('theia/plugin/blockNewTab', 'Your browser prevented opening of a new tab')
         });
         this.windowService = windowService;
 

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

@@ -114,6 +114,7 @@ export class DebugMainImpl implements DebugMain, Disposable {
             this.breakpointsManager.onDidChangeBreakpoints(fireDidChangeBreakpoints),
             this.breakpointsManager.onDidChangeFunctionBreakpoints(fireDidChangeBreakpoints),
             this.sessionManager.onDidCreateDebugSession(debugSession => this.debugExt.$sessionDidCreate(debugSession.id)),
+            this.sessionManager.onDidStartDebugSession(debugSession => this.debugExt.$sessionDidStart(debugSession.id)),
             this.sessionManager.onDidDestroyDebugSession(debugSession => this.debugExt.$sessionDidDestroy(debugSession.id)),
             this.sessionManager.onDidChangeActiveDebugSession(event => this.debugExt.$sessionDidChange(event.current && event.current.id)),
             this.sessionManager.onDidReceiveDebugSessionCustomEvent(event => this.debugExt.$onSessionCustomEvent(event.session.id, event.event, event.body))

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

@@ -24,6 +24,7 @@ import { FileUploadService } from '@theia/filesystem/lib/browser/file-upload-ser
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileStat } from '@theia/filesystem/lib/common/files';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { nls } from '@theia/core';
 
 export class DialogsMainImpl implements DialogsMain {
 
@@ -146,7 +147,7 @@ export class DialogsMainImpl implements DialogsMain {
         try {
             // Create save file dialog props
             const dialogProps = {
-                title: options.title ?? 'Save',
+                title: options.title ?? nls.localizeByDefault('Save'),
                 saveLabel: options.saveLabel,
                 filters: options.filters,
                 inputValue: fileNameValue

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

@@ -22,7 +22,7 @@ import { TreeWidgetSelection } from '@theia/core/lib/browser/tree/tree-widget-se
 import { ScmRepository } from '@theia/scm/lib/browser/scm-repository';
 import { ScmService } from '@theia/scm/lib/browser/scm-service';
 import { TimelineItem } from '@theia/timeline/lib/common/timeline-model';
-import { ScmCommandArg, TimelineCommandArg, TreeViewSelection } from '../../../common';
+import { ScmCommandArg, TimelineCommandArg, TreeViewItemReference } from '../../../common';
 import { PluginScmProvider, PluginScmResource, PluginScmResourceGroup } from '../scm-main';
 import { TreeViewWidget } from '../view/tree-view-widget';
 import { CodeEditorWidgetUtil, codeToTheiaMappings, ContributionPoint } from './vscode-theia-menu-mappings';
@@ -89,6 +89,7 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
             ['comments/comment/title', toCommentArgs],
             ['comments/commentThread/context', toCommentArgs],
             ['debug/callstack/context', firstArgOnly],
+            ['debug/variables/context', firstArgOnly],
             ['debug/toolBar', noArgs],
             ['editor/context', selectedResource],
             ['editor/title', widgetURI],
@@ -238,19 +239,21 @@ export class PluginMenuCommandAdapter implements MenuCommandAdapter {
     protected toTreeArgs(...args: any[]): any[] {
         const treeArgs: any[] = [];
         for (const arg of args) {
-            if (TreeViewSelection.is(arg)) {
+            if (TreeViewItemReference.is(arg)) {
                 treeArgs.push(arg);
+            } else if (Array.isArray(arg)) {
+                treeArgs.push(arg.filter(TreeViewItemReference.is));
             }
         }
         return treeArgs;
     }
 
-    protected getSelectedResources(): [CodeUri | TreeViewSelection | undefined, CodeUri[] | undefined] {
+    protected getSelectedResources(): [CodeUri | TreeViewItemReference | 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])
+            ? selection.source.toTreeViewItemReference(selection[0])
             : UriSelection.getUri(selection)?.['codeUri'] ?? resourceUri;
         const secondMember = TreeWidgetSelection.is(selection)
             ? UriSelection.getUris(selection).map(uri => uri['codeUri'])

package/src/main/browser/menus/vscode-theia-menu-mappings.ts

@@ -21,6 +21,8 @@ import { injectable } from '@theia/core/shared/inversify';
 import { URI as CodeUri } from '@theia/core/shared/vscode-uri';
 import { DebugStackFramesWidget } from '@theia/debug/lib/browser/view/debug-stack-frames-widget';
 import { DebugThreadsWidget } from '@theia/debug/lib/browser/view/debug-threads-widget';
+import { DebugToolBar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
+import { DebugVariablesWidget } from '@theia/debug/lib/browser/view/debug-variables-widget';
 import { EditorWidget, EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
 import { NAVIGATOR_CONTEXT_MENU } from '@theia/navigator/lib/browser/navigator-contribution';
 import { ScmTreeWidget } from '@theia/scm/lib/browser/scm-tree-widget';
@@ -38,6 +40,8 @@ export const implementedVSCodeContributionPoints = [
     'comments/comment/title',
     'comments/commentThread/context',
     'debug/callstack/context',
+    'debug/variables/context',
+    'debug/toolBar',
     'editor/context',
     'editor/title',
     'editor/title/context',
@@ -59,6 +63,8 @@ export const codeToTheiaMappings = new Map<ContributionPoint, MenuPath[]>([
     ['comments/comment/title', [COMMENT_TITLE]],
     ['comments/commentThread/context', [COMMENT_THREAD_CONTEXT]],
     ['debug/callstack/context', [DebugStackFramesWidget.CONTEXT_MENU, DebugThreadsWidget.CONTEXT_MENU]],
+    ['debug/variables/context', [DebugVariablesWidget.CONTEXT_MENU]],
+    ['debug/toolBar', [DebugToolBar.MENU]],
     ['editor/context', [EDITOR_CONTEXT_MENU]],
     ['editor/title', [PLUGIN_EDITOR_TITLE_MENU]],
     ['editor/title/context', [SHELL_TABBAR_CONTEXT_MENU]],

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

@@ -43,6 +43,10 @@ import { PluginIconThemeService } from './plugin-icon-theme-service';
 import { ContributionProvider } from '@theia/core/lib/common';
 import * as monaco from '@theia/monaco-editor-core';
 import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { ContributedTerminalProfileStore, TerminalProfileStore } from '@theia/terminal/lib/browser/terminal-profile-service';
+import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
+import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
+import { PluginTerminalRegistry } from './plugin-terminal-registry';
 
 @injectable()
 export class PluginContributionHandler {
@@ -106,6 +110,15 @@ export class PluginContributionHandler {
     @inject(PluginIconThemeService)
     protected readonly iconThemeService: PluginIconThemeService;
 
+    @inject(TerminalService)
+    protected readonly terminalService: TerminalService;
+
+    @inject(PluginTerminalRegistry)
+    protected readonly pluginTerminalRegistry: PluginTerminalRegistry;
+
+    @inject(ContributedTerminalProfileStore)
+    protected readonly contributedProfileStore: TerminalProfileStore;
+
     @inject(ContributionProvider) @named(LabelProviderContribution)
     protected readonly contributionProvider: ContributionProvider<LabelProviderContribution>;
 
@@ -356,6 +369,28 @@ export class PluginContributionHandler {
             }
         }
 
+        const self = this;
+        if (contributions.terminalProfiles) {
+            for (const profile of contributions.terminalProfiles) {
+                pushContribution(`terminalProfiles.${profile.id}`, () => {
+                    this.contributedProfileStore.registerTerminalProfile(profile.title, {
+                        async start(): Promise<TerminalWidget> {
+                            const terminalId = await self.pluginTerminalRegistry.start(profile.id);
+                            const result = self.terminalService.getById(terminalId);
+                            if (!result) {
+                                throw new Error(`Error starting terminal from profile ${profile.id}`);
+                            }
+                            return result;
+
+                        }
+                    });
+                    return Disposable.create(() => {
+                        this.contributedProfileStore.unregisterTerminalProfile(profile.id);
+                    });
+                });
+            }
+        }
+
         return toDispose;
     }
 

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

@@ -50,7 +50,7 @@ import { SelectionProviderCommandContribution } from './selection-provider-comma
 import { ViewColumnService } from './view-column-service';
 import { ViewContextKeyService } from './view/view-context-key-service';
 import { PluginViewWidget, PluginViewWidgetIdentifier } from './view/plugin-view-widget';
-import { TreeViewWidgetIdentifier, VIEW_ITEM_CONTEXT_MENU, PluginTree, TreeViewWidget, PluginTreeModel } from './view/tree-view-widget';
+import { TreeViewWidgetOptions, VIEW_ITEM_CONTEXT_MENU, PluginTree, TreeViewWidget, PluginTreeModel } from './view/tree-view-widget';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { LanguagesMainFactory, OutputChannelRegistryFactory } from '../../common';
 import { LanguagesMainImpl } from './languages-main';
@@ -80,6 +80,8 @@ import { bindTreeViewDecoratorUtilities, TreeViewDecoratorService } from './view
 import { CodeEditorWidgetUtil } from './menus/vscode-theia-menu-mappings';
 import { PluginMenuCommandAdapter } from './menus/plugin-menu-command-adapter';
 import './theme-icon-override';
+import { PluginTerminalRegistry } from './plugin-terminal-registry';
+import { DnDFileContentStore } from './view/dnd-file-content-store';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
@@ -143,16 +145,18 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bindTreeViewDecoratorUtilities(bind);
     bind(PluginTreeViewNodeLabelProvider).toSelf().inSingletonScope();
     bind(LabelProviderContribution).toService(PluginTreeViewNodeLabelProvider);
+    bind(DnDFileContentStore).toSelf().inSingletonScope();
     bind(WidgetFactory).toDynamicValue(({ container }) => ({
         id: PLUGIN_VIEW_DATA_FACTORY_ID,
-        createWidget: (identifier: TreeViewWidgetIdentifier) => {
+        createWidget: (options: TreeViewWidgetOptions) => {
             const props = {
                 contextMenuPath: VIEW_ITEM_CONTEXT_MENU,
                 expandOnlyOnExpansionToggleClick: true,
                 expansionTogglePadding: 22,
                 globalSelection: true,
                 leftPadding: 8,
-                search: true
+                search: true,
+                multiSelect: options.multiSelect
             };
             const child = createTreeContainer(container, {
                 props,
@@ -161,7 +165,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
                 widget: TreeViewWidget,
                 decoratorService: TreeViewDecoratorService
             });
-            child.bind(TreeViewWidgetIdentifier).toConstantValue(identifier);
+            child.bind(TreeViewWidgetOptions).toConstantValue(options);
             return child.get(TreeWidget);
         }
     })).inSingletonScope();
@@ -240,4 +244,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
     bind(PluginAuthenticationServiceImpl).toSelf().inSingletonScope();
     rebind(AuthenticationService).toService(PluginAuthenticationServiceImpl);
+
+    bind(PluginTerminalRegistry).toSelf().inSingletonScope();
 });

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

@@ -0,0 +1,27 @@
+// *****************************************************************************
+// Copyright (C) 2022 STMicroelectronics and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+
+@injectable()
+export class PluginTerminalRegistry {
+
+    startCallback: (id: string) => Promise<string>;
+
+    start(profileId: string): Promise<string> {
+        return this.startCallback(profileId);
+    }
+}

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

@@ -440,4 +440,14 @@ export class ScmMainImpl implements ScmMain {
 
         repository.input.visible = visible;
     }
+
+    $setInputBoxEnabled(sourceControlHandle: number, enabled: boolean): void {
+        const repository = this.repositories.get(sourceControlHandle);
+
+        if (!repository) {
+            return;
+        }
+
+        repository.input.enabled = enabled;
+    }
 }

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

@@ -16,9 +16,8 @@
 
 import { interfaces } from '@theia/core/shared/inversify';
 import { ApplicationShell, WidgetOpenerOptions } from '@theia/core/lib/browser';
-import { TerminalOptions } from '@theia/plugin';
-import { CancellationToken } from '@theia/core/shared/vscode-languageserver-protocol';
-import { TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
+import { TerminalEditorLocationOptions, TerminalOptions } from '@theia/plugin';
+import { TerminalLocation, TerminalWidget } from '@theia/terminal/lib/browser/base/terminal-widget';
 import { TerminalService } from '@theia/terminal/lib/browser/base/terminal-service';
 import { TerminalServiceMain, TerminalServiceExt, MAIN_RPC_CONTEXT } from '../../common/plugin-api-rpc';
 import { RPCProtocol } from '../../common/rpc-protocol';
@@ -27,6 +26,10 @@ import { SerializableEnvironmentVariableCollection } from '@theia/terminal/lib/c
 import { ShellTerminalServerProxy } from '@theia/terminal/lib/common/shell-terminal-protocol';
 import { TerminalLink, TerminalLinkProvider } from '@theia/terminal/lib/browser/terminal-link-provider';
 import { URI } from '@theia/core/lib/common/uri';
+import { getIconClass } from '../../plugin/terminal-ext';
+import { PluginTerminalRegistry } from './plugin-terminal-registry';
+import { CancellationToken } from '@theia/core';
+import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
 
 /**
  * Plugin api service allows working with terminal emulator.
@@ -34,6 +37,8 @@ import { URI } from '@theia/core/lib/common/uri';
 export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLinkProvider, Disposable {
 
     private readonly terminals: TerminalService;
+    private readonly pluginTerminalRegistry: PluginTerminalRegistry;
+    private readonly hostedPluginSupport: HostedPluginSupport;
     private readonly shell: ApplicationShell;
     private readonly extProxy: TerminalServiceExt;
     private readonly shellTerminalServer: ShellTerminalServerProxy;
@@ -43,6 +48,8 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
 
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.terminals = container.get(TerminalService);
+        this.pluginTerminalRegistry = container.get(PluginTerminalRegistry);
+        this.hostedPluginSupport = container.get(HostedPluginSupport);
         this.shell = container.get(ApplicationShell);
         this.shellTerminalServer = container.get(ShellTerminalServerProxy);
         this.extProxy = rpc.getProxy(MAIN_RPC_CONTEXT.TERMINAL_EXT);
@@ -58,9 +65,16 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
             this.extProxy.$initEnvironmentVariableCollections(serializedCollections);
         }
 
+        this.pluginTerminalRegistry.startCallback = id => this.startProfile(id);
+
         container.bind(TerminalLinkProvider).toDynamicValue(() => this);
     }
 
+    async startProfile(id: string): Promise<string> {
+        await this.hostedPluginSupport.activateByTerminalProfile(id);
+        return this.extProxy.$startProfile(id, CancellationToken.None);
+    }
+
     $setEnvironmentVariableCollection(extensionIdentifier: string, persistent: boolean, collection: SerializableEnvironmentVariableCollection | undefined): void {
         if (collection) {
             this.shellTerminalServer.setCollection(extensionIdentifier, persistent, collection);
@@ -122,30 +136,46 @@ export class TerminalServiceMainImpl implements TerminalServiceMain, TerminalLin
         terminal.resize(cols, rows);
     }
 
-    async $createTerminal(id: string, options: TerminalOptions, isPseudoTerminal?: boolean): Promise<string> {
-        try {
-            const terminal = await this.terminals.newTerminal({
-                id,
-                title: options.name,
-                shellPath: options.shellPath,
-                shellArgs: options.shellArgs,
-                cwd: options.cwd ? new URI(options.cwd) : undefined,
-                env: options.env,
-                strictEnv: options.strictEnv,
-                destroyTermOnClose: true,
-                useServerTitle: false,
-                attributes: options.attributes,
-                hideFromUser: options.hideFromUser,
-                isPseudoTerminal
-            });
-            if (options.message) {
-                terminal.writeLine(options.message);
+    async $createTerminal(id: string, options: TerminalOptions, parentId?: string, isPseudoTerminal?: boolean): Promise<string> {
+        const terminal = await this.terminals.newTerminal({
+            id,
+            title: options.name,
+            iconClass: getIconClass(options),
+            shellPath: options.shellPath,
+            shellArgs: options.shellArgs,
+            cwd: options.cwd ? new URI(options.cwd) : undefined,
+            env: options.env,
+            strictEnv: options.strictEnv,
+            destroyTermOnClose: true,
+            useServerTitle: false,
+            attributes: options.attributes,
+            hideFromUser: options.hideFromUser,
+            location: this.getTerminalLocation(options, parentId),
+            isPseudoTerminal,
+            isTransient: options.isTransient
+        });
+        if (options.message) {
+            terminal.writeLine(options.message);
+        }
+        terminal.start();
+        return terminal.id;
+    }
+
+    protected getTerminalLocation(options: TerminalOptions, parentId?: string): TerminalLocation | TerminalEditorLocationOptions | { parentTerminal: string; } | undefined {
+        if (typeof options.location === 'number' && Object.values(TerminalLocation).includes(options.location)) {
+            return options.location;
+        } else if (options.location && typeof options.location === 'object') {
+            if ('parentTerminal' in options.location) {
+                if (!parentId) {
+                    throw new Error('parentTerminal is set but no parentId is provided');
+                }
+                return { 'parentTerminal': parentId };
+            } else {
+                return options.location;
             }
-            terminal.start();
-            return terminal.id;
-        } catch (error) {
-            throw new Error('Failed to create terminal. Cause: ' + error);
         }
+
+        return undefined;
     }
 
     $sendText(id: string, text: string, addNewLine?: boolean): void {

package/src/main/browser/view/dnd-file-content-store.ts

@@ -0,0 +1,42 @@
+// *****************************************************************************
+// Copyright (C) 2022 STMicroelectronics and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { injectable } from '@theia/core/shared/inversify';
+
+@injectable()
+export class DnDFileContentStore {
+    private static id: number = 0;
+    private files: Map<string, File> = new Map();
+
+    addFile(f: File): string {
+        const id = (DnDFileContentStore.id++).toString();
+        this.files.set(id, f);
+        return id;
+    }
+
+    removeFile(id: string): boolean {
+        return this.files.delete(id);
+    }
+
+    getFile(id: string): File {
+        const file = this.files.get(id);
+        if (file) {
+            return file;
+        }
+
+        throw new Error(`File with id ${id} not found in dnd operation`);
+    }
+}

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

@@ -148,7 +148,10 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
                 const disposable = new DisposableCollection();
                 disposable.push(this.registerViewWelcome({
                     view: 'explorer',
-                    content: nls.localizeByDefault('You have not yet opened a folder.\n[Open Folder](command:{0})', 'workbench.action.files.openFolder'),
+                    content: nls.localizeByDefault(
+                        'You have not yet opened a folder.\n{0}',
+                        `[${nls.localizeByDefault('Open Folder')}](command:workbench.action.files.openFolder)`
+                    ),
                     order: 0
                 }));
                 disposable.push(event.widget.onDidDispose(() => disposable.dispose()));

package/src/main/browser/view/tree-view-decorator-service.ts

@@ -16,9 +16,9 @@
 
 import { inject, injectable, interfaces, named } from '@theia/core/shared/inversify';
 import { AbstractTreeDecoratorService, TreeDecorator } from '@theia/core/lib/browser/tree/tree-decorator';
-import { bindContributionProvider, ContributionProvider } from '@theia/core';
+import { bindContributionProvider, ContributionProvider, isObject } from '@theia/core';
 import { TreeNode } from '@theia/core/lib/browser';
-import { TreeItem, Uri } from '@theia/plugin';
+import { TreeItem } from '@theia/plugin';
 import URI from '@theia/core/lib/common/uri';
 import { FileTreeDecoratorAdapter } from '@theia/filesystem/lib/browser';
 
@@ -32,9 +32,8 @@ export class TreeViewDecoratorAdapter extends FileTreeDecoratorAdapter {
         }
     }
 
-    protected isTreeItem(node: unknown): node is TreeItem & { resourceUri: Uri } {
-        const candidate = node as TreeItem;
-        return !!candidate && typeof node === 'object' && 'resourceUri' in candidate && !!candidate.resourceUri;
+    protected isTreeItem(node: unknown): node is TreeItem {
+        return isObject<TreeItem>(node) && !!node.resourceUri;
     }
 }