@theia/terminal 1.34.0-next.7 → 1.34.1

package/lib/browser/base/terminal-widget.d.ts

@@ -1,4 +1,4 @@
-import { Event } from '@theia/core';
+import { Event, ViewColumn } from '@theia/core';
 import { BaseWidget } from '@theia/core/lib/browser';
 import { CommandLineOptions } from '@theia/process/lib/common/shell-command-builder';
 import { TerminalSearchWidget } from '../search/terminal-search-widget';
@@ -11,6 +11,18 @@ export interface TerminalDimensions {
 export interface TerminalExitStatus {
     readonly code: number | undefined;
 }
+export declare type TerminalLocationOptions = TerminalLocation | TerminalEditorLocation | TerminalSplitLocation;
+export declare enum TerminalLocation {
+    Panel = 1,
+    Editor = 2
+}
+export interface TerminalEditorLocation {
+    readonly viewColumn: ViewColumn;
+    readonly preserveFocus?: boolean;
+}
+export interface TerminalSplitLocation {
+    readonly parentTerminal: string;
+}
 /**
  * Terminal UI widget.
  */
@@ -27,6 +39,8 @@ export declare abstract class TerminalWidget extends BaseWidget {
     abstract readonly exitStatus: TerminalExitStatus | undefined;
     /** Terminal widget can be hidden from users until explicitly shown once. */
     abstract readonly hiddenFromUser: boolean;
+    /** The position of the terminal widget. */
+    abstract readonly location: TerminalLocationOptions;
     /** The last CWD assigned to the terminal, useful when attempting getCwdURI on a task terminal fails */
     lastCwd: URI;
     /**
@@ -103,6 +117,10 @@ export interface TerminalWidgetOptions {
      * Human readable terminal representation on the UI.
      */
     readonly title?: string;
+    /**
+     * icon class
+     */
+    readonly iconClass?: string;
     /**
      * Path to the executable shell. For example: `/bin/bash`, `bash`, `sh`.
      */
@@ -158,5 +176,10 @@ export interface TerminalWidgetOptions {
      * When enabled the terminal will run the process as normal but not be surfaced to the user until `Terminal.show` is called.
      */
     readonly hideFromUser?: boolean;
+    readonly location?: TerminalLocationOptions;
+    /**
+     * When enabled, the terminal will not be persisted across window reloads.
+     */
+    readonly isTransient?: boolean;
 }
 //# sourceMappingURL=terminal-widget.d.ts.map

package/lib/browser/base/terminal-widget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/base/terminal-widget.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/base/terminal-widget.ts"],"names":[],"mappings":"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"}

package/lib/browser/base/terminal-widget.js

@@ -15,8 +15,13 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminalWidgetOptions = exports.TerminalWidget = void 0;
+exports.TerminalWidgetOptions = exports.TerminalWidget = exports.TerminalLocation = void 0;
 const browser_1 = require("@theia/core/lib/browser");
+var TerminalLocation;
+(function (TerminalLocation) {
+    TerminalLocation[TerminalLocation["Panel"] = 1] = "Panel";
+    TerminalLocation[TerminalLocation["Editor"] = 2] = "Editor";
+})(TerminalLocation = exports.TerminalLocation || (exports.TerminalLocation = {}));
 /**
  * Terminal UI widget.
  */

package/lib/browser/base/terminal-widget.js.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-widget.js","sourceRoot":"","sources":["../../../src/browser/base/terminal-widget.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAGhF,qDAAqD;AAerD;;GAEG;AACH,MAAsB,cAAe,SAAQ,oBAAU;CAuGtD;AAvGD,wCAuGC;AAED;;GAEG;AACU,QAAA,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"terminal-widget.js","sourceRoot":"","sources":["../../../src/browser/base/terminal-widget.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAGhF,qDAAqD;AAiBrD,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,yDAAS,CAAA;IACT,2DAAU,CAAA;AACd,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAWD;;GAEG;AACH,MAAsB,cAAe,SAAQ,oBAAU;CAyGtD;AAzGD,wCAyGC;AAED;;GAEG;AACU,QAAA,qBAAqB,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC"}

package/lib/browser/shell-terminal-profile.d.ts

@@ -0,0 +1,18 @@
+import { IShellTerminalServerOptions } from '../common/shell-terminal-protocol';
+import { TerminalService } from './base/terminal-service';
+import { TerminalWidget, TerminalWidgetOptions } from './base/terminal-widget';
+import { TerminalProfile } from './terminal-profile-service';
+export declare class ShellTerminalProfile implements TerminalProfile {
+    protected readonly terminalService: TerminalService;
+    protected readonly options: TerminalWidgetOptions;
+    constructor(terminalService: TerminalService, options: TerminalWidgetOptions);
+    start(): Promise<TerminalWidget>;
+    /**
+     * Makes a copy of this profile modified with the options given
+     * as an argument.
+     * @param options the options to override
+     * @returns a modified copy of this profile
+     */
+    modify(options: IShellTerminalServerOptions): TerminalProfile;
+}
+//# sourceMappingURL=shell-terminal-profile.d.ts.map

package/lib/browser/shell-terminal-profile.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-terminal-profile.d.ts","sourceRoot":"","sources":["../../src/browser/shell-terminal-profile.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,qBAAa,oBAAqB,YAAW,eAAe;IAC5C,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,qBAAqB;gBAAnF,eAAe,EAAE,eAAe,EAAqB,OAAO,EAAE,qBAAqB;IAE5G,KAAK,IAAI,OAAO,CAAC,cAAc,CAAC;IAMtC;;;;;OAKG;IACH,MAAM,CAAC,OAAO,EAAE,2BAA2B,GAAG,eAAe;CAGhE"}

package/lib/browser/shell-terminal-profile.js

@@ -0,0 +1,40 @@
+"use strict";
+// *****************************************************************************
+// 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
+// *****************************************************************************
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShellTerminalProfile = void 0;
+class ShellTerminalProfile {
+    constructor(terminalService, options) {
+        this.terminalService = terminalService;
+        this.options = options;
+    }
+    async start() {
+        const widget = await this.terminalService.newTerminal(this.options);
+        widget.start();
+        return widget;
+    }
+    /**
+     * Makes a copy of this profile modified with the options given
+     * as an argument.
+     * @param options the options to override
+     * @returns a modified copy of this profile
+     */
+    modify(options) {
+        return new ShellTerminalProfile(this.terminalService, Object.assign(Object.assign({}, this.options), options));
+    }
+}
+exports.ShellTerminalProfile = ShellTerminalProfile;
+//# sourceMappingURL=shell-terminal-profile.js.map

package/lib/browser/shell-terminal-profile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-terminal-profile.js","sourceRoot":"","sources":["../../src/browser/shell-terminal-profile.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAOhF,MAAa,oBAAoB;IAC7B,YAA+B,eAAgC,EAAqB,OAA8B;QAAnF,oBAAe,GAAf,eAAe,CAAiB;QAAqB,YAAO,GAAP,OAAO,CAAuB;IAAI,CAAC;IAEvH,KAAK,CAAC,KAAK;QACP,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,OAAoC;QACvC,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,eAAe,kCAAO,IAAI,CAAC,OAAO,GAAK,OAAO,EAAG,CAAC;IAC3F,CAAC;CACJ;AAlBD,oDAkBC"}

package/lib/browser/terminal-frontend-contribution.d.ts

@@ -1,8 +1,9 @@
 import { CommandContribution, Command, CommandRegistry, DisposableCollection, MenuContribution, MenuModelRegistry, SelectionService, Emitter, Event } from '@theia/core/lib/common';
-import { ApplicationShell, KeybindingContribution, WidgetManager, KeybindingRegistry, Widget, LabelProvider, WidgetOpenerOptions, StorageService, QuickInputService, FrontendApplicationContribution, OnWillStopAction } from '@theia/core/lib/browser';
+import { ApplicationShell, KeybindingContribution, WidgetManager, PreferenceService, KeybindingRegistry, Widget, LabelProvider, WidgetOpenerOptions, StorageService, QuickInputService, FrontendApplicationContribution, OnWillStopAction, FrontendApplication } from '@theia/core/lib/browser';
 import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { TerminalService } from './base/terminal-service';
 import { TerminalWidgetOptions, TerminalWidget } from './base/terminal-widget';
+import { TerminalProfile, TerminalProfileService, TerminalProfileStore } from './terminal-profile-service';
 import { ShellTerminalServerProxy } from '../common/shell-terminal-protocol';
 import URI from '@theia/core/lib/common/uri';
 import { WorkspaceService } from '@theia/workspace/lib/browser';
@@ -12,6 +13,7 @@ import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { TerminalWatcher } from '../common/terminal-watcher';
 import { TerminalPreferences } from './terminal-preferences';
+import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
 export declare namespace TerminalMenus {
     const TERMINAL: string[];
     const TERMINAL_NEW: string[];
@@ -23,6 +25,8 @@ export declare namespace TerminalMenus {
 }
 export declare namespace TerminalCommands {
     const NEW: Command;
+    const PROFILE_NEW: Command;
+    const PROFILE_DEFAULT: Command;
     const NEW_ACTIVE_WORKSPACE: Command;
     const TERMINAL_CLEAR: Command;
     const TERMINAL_CONTEXT: Command;
@@ -49,15 +53,25 @@ export declare class TerminalFrontendContribution implements FrontendApplication
     protected readonly labelProvider: LabelProvider;
     protected readonly quickInputService: QuickInputService;
     protected readonly workspaceService: WorkspaceService;
+    protected readonly profileService: TerminalProfileService;
+    protected readonly userProfileStore: TerminalProfileStore;
+    protected readonly contributedProfileStore: TerminalProfileStore;
     protected readonly terminalWatcher: TerminalWatcher;
+    protected readonly variableResolver: VariableResolverService;
     protected readonly storageService: StorageService;
+    protected readonly preferenceService: PreferenceService;
     protected terminalPreferences: TerminalPreferences;
+    protected mergePreferencesPromise: Promise<void>;
     protected readonly onDidCreateTerminalEmitter: Emitter<TerminalWidget>;
     readonly onDidCreateTerminal: Event<TerminalWidget>;
     protected readonly onDidChangeCurrentTerminalEmitter: Emitter<TerminalWidget | undefined>;
     readonly onDidChangeCurrentTerminal: Event<TerminalWidget | undefined>;
     protected readonly contextKeyService: ContextKeyService;
     protected init(): void;
+    onStart(app: FrontendApplication): Promise<void>;
+    contributeDefaultProfiles(): Promise<void>;
+    protected mergePreferences(): Promise<void>;
+    protected resolveShellPath(path: string | string[] | undefined): Promise<string | undefined>;
     onWillStop(): OnWillStopAction<number> | undefined;
     protected confirmExitWithActiveTerminals(activeTerminalCount: number): Promise<boolean>;
     protected _currentTerminal: TerminalWidget | undefined;
@@ -84,9 +98,12 @@ export declare class TerminalFrontendContribution implements FrontendApplication
     newTerminal(options: TerminalWidgetOptions): Promise<TerminalWidget>;
     open(widget: TerminalWidget, options?: WidgetOpenerOptions): void;
     protected selectTerminalCwd(): Promise<string | undefined>;
+    protected selectTerminalProfile(placeholder: string): Promise<[string, TerminalProfile] | undefined>;
     protected splitTerminal(widget?: Widget): Promise<void>;
     protected getTerminalRef(widget?: Widget): TerminalWidget | undefined;
     protected openTerminal(options?: ApplicationShell.WidgetOptions): Promise<void>;
+    protected openTerminalFromProfile(options?: ApplicationShell.WidgetOptions): Promise<void>;
+    protected chooseDefaultProfile(): Promise<void>;
     protected openActiveWorkspaceTerminal(options?: ApplicationShell.WidgetOptions): Promise<void>;
     /**
      * It should be aligned with https://code.visualstudio.com/api/references/theme-color#integrated-terminal-colors

package/lib/browser/terminal-frontend-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminal-frontend-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-frontend-contribution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terminal-frontend-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/terminal-frontend-contribution.ts"],"names":[],"mappings":"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"}

package/lib/browser/terminal-frontend-contribution.js

@@ -31,8 +31,10 @@ const browser_1 = require("@theia/core/lib/browser");
 const terminal_widget_impl_1 = require("./terminal-widget-impl");
 const terminal_keybinding_contexts_1 = require("./terminal-keybinding-contexts");
 const terminal_widget_1 = require("./base/terminal-widget");
+const terminal_profile_service_1 = require("./terminal-profile-service");
 const uri_command_handler_1 = require("@theia/core/lib/common/uri-command-handler");
 const shell_terminal_protocol_1 = require("../common/shell-terminal-protocol");
+const uri_1 = require("@theia/core/lib/common/uri");
 const core_1 = require("@theia/core");
 const browser_2 = require("@theia/workspace/lib/browser");
 const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
@@ -42,6 +44,8 @@ const terminal_watcher_1 = require("../common/terminal-watcher");
 const base_terminal_protocol_1 = require("../common/base-terminal-protocol");
 const nls_1 = require("@theia/core/lib/common/nls");
 const terminal_preferences_1 = require("./terminal-preferences");
+const shell_terminal_profile_1 = require("./shell-terminal-profile");
+const browser_3 = require("@theia/variable-resolver/lib/browser");
 var TerminalMenus;
 (function (TerminalMenus) {
     TerminalMenus.TERMINAL = [...core_1.MAIN_MENU_BAR, '7_terminal'];
@@ -58,12 +62,22 @@ var TerminalCommands;
     TerminalCommands.NEW = common_1.Command.toDefaultLocalizedCommand({
         id: 'terminal:new',
         category: TERMINAL_CATEGORY,
-        label: 'Create New Integrated Terminal'
+        label: 'Create New Terminal'
+    });
+    TerminalCommands.PROFILE_NEW = common_1.Command.toLocalizedCommand({
+        id: 'terminal:new:profile',
+        category: TERMINAL_CATEGORY,
+        label: 'Create New Integrated Terminal from a Profile'
+    });
+    TerminalCommands.PROFILE_DEFAULT = common_1.Command.toLocalizedCommand({
+        id: 'terminal:profile:default',
+        category: TERMINAL_CATEGORY,
+        label: 'Choose the default Terminal Profile'
     });
     TerminalCommands.NEW_ACTIVE_WORKSPACE = common_1.Command.toDefaultLocalizedCommand({
         id: 'terminal:new:active:workspace',
         category: TERMINAL_CATEGORY,
-        label: 'Create New Integrated Terminal (In Active Workspace)'
+        label: 'Create New Terminal (In Active Workspace)'
     });
     TerminalCommands.TERMINAL_CLEAR = common_1.Command.toDefaultLocalizedCommand({
         id: 'terminal:clear',
@@ -131,6 +145,7 @@ var TerminalCommands;
 })(TerminalCommands = exports.TerminalCommands || (exports.TerminalCommands = {}));
 let TerminalFrontendContribution = class TerminalFrontendContribution {
     constructor() {
+        this.mergePreferencesPromise = Promise.resolve();
         this.onDidCreateTerminalEmitter = new common_1.Emitter();
         this.onDidCreateTerminal = this.onDidCreateTerminalEmitter.event;
         this.onDidChangeCurrentTerminalEmitter = new common_1.Emitter();
@@ -163,6 +178,136 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
             });
         });
     }
+    async onStart(app) {
+        await this.contributeDefaultProfiles();
+        this.terminalPreferences.onPreferenceChanged(e => {
+            if (e.preferenceName.startsWith('terminal.integrated.')) {
+                this.mergePreferencesPromise = this.mergePreferencesPromise.finally(() => this.mergePreferences());
+            }
+        });
+        this.mergePreferencesPromise = this.mergePreferencesPromise.finally(() => this.mergePreferences());
+        this.profileService.onAdded(id => {
+            // extension contributions get read after this point: need to set the default profile if necessary
+            let defaultProfileId;
+            switch (common_1.OS.backend.type()) {
+                case common_1.OS.Type.Windows: {
+                    defaultProfileId = this.terminalPreferences['terminal.integrated.defaultProfile.windows'];
+                    break;
+                }
+                case common_1.OS.Type.Linux: {
+                    defaultProfileId = this.terminalPreferences['terminal.integrated.defaultProfile.linux'];
+                    break;
+                }
+                case common_1.OS.Type.OSX: {
+                    defaultProfileId = this.terminalPreferences['terminal.integrated.defaultProfile.osx'];
+                    break;
+                }
+            }
+            this.profileService.setDefaultProfile(defaultProfileId);
+        });
+    }
+    async contributeDefaultProfiles() {
+        if (common_1.OS.backend.isWindows) {
+            this.contributedProfileStore.registerTerminalProfile('cmd', new shell_terminal_profile_1.ShellTerminalProfile(this, {
+                shellPath: await this.resolveShellPath([
+                    '${env:windir}\\Sysnative\\cmd.exe',
+                    '${env:windir}\\System32\\cmd.exe'
+                ])
+            }));
+        }
+        else {
+            this.contributedProfileStore.registerTerminalProfile('SHELL', new shell_terminal_profile_1.ShellTerminalProfile(this, {
+                shellPath: await this.resolveShellPath('${SHELL}'),
+                shellArgs: ['-l']
+            }));
+        }
+        // contribute default profiles based on legacy preferences
+    }
+    async mergePreferences() {
+        var _a, _b, _c;
+        let profiles;
+        let defaultProfile;
+        let legacyShellPath;
+        let legacyShellArgs;
+        const removed = new Set(this.userProfileStore.all.map(([id, profile]) => id));
+        switch (common_1.OS.backend.type()) {
+            case common_1.OS.Type.Windows: {
+                profiles = this.terminalPreferences['terminal.integrated.profiles.windows'];
+                defaultProfile = this.terminalPreferences['terminal.integrated.defaultProfile.windows'];
+                legacyShellPath = (_a = this.terminalPreferences['terminal.integrated.shell.windows']) !== null && _a !== void 0 ? _a : undefined;
+                legacyShellArgs = this.terminalPreferences['terminal.integrated.shellArgs.windows'];
+                break;
+            }
+            case common_1.OS.Type.Linux: {
+                profiles = this.terminalPreferences['terminal.integrated.profiles.linux'];
+                defaultProfile = this.terminalPreferences['terminal.integrated.defaultProfile.linux'];
+                legacyShellPath = (_b = this.terminalPreferences['terminal.integrated.shell.linux']) !== null && _b !== void 0 ? _b : undefined;
+                legacyShellArgs = this.terminalPreferences['terminal.integrated.shellArgs.linux'];
+                break;
+            }
+            case common_1.OS.Type.OSX: {
+                profiles = this.terminalPreferences['terminal.integrated.profiles.osx'];
+                defaultProfile = this.terminalPreferences['terminal.integrated.defaultProfile.osx'];
+                legacyShellPath = (_c = this.terminalPreferences['terminal.integrated.shell.osx']) !== null && _c !== void 0 ? _c : undefined;
+                legacyShellArgs = this.terminalPreferences['terminal.integrated.shellArgs.osx'];
+                break;
+            }
+        }
+        if (profiles) {
+            for (const id of Object.getOwnPropertyNames(profiles)) {
+                const profile = profiles[id];
+                removed.delete(id);
+                if (profile) {
+                    const shellPath = await this.resolveShellPath(profile.path);
+                    if (shellPath) {
+                        const options = {
+                            shellPath: shellPath,
+                            shellArgs: profile.args ? await this.variableResolver.resolve(profile.args) : undefined,
+                            useServerTitle: profile.overrideName ? false : undefined,
+                            env: profile.env ? await this.variableResolver.resolve(profile.env) : undefined,
+                            title: profile.overrideName ? id : undefined
+                        };
+                        this.userProfileStore.registerTerminalProfile(id, new shell_terminal_profile_1.ShellTerminalProfile(this, options));
+                    }
+                }
+                else {
+                    this.userProfileStore.registerTerminalProfile(id, terminal_profile_service_1.NULL_PROFILE);
+                }
+            }
+        }
+        if (legacyShellPath) {
+            this.userProfileStore.registerTerminalProfile('Legacy Shell Preferences', new shell_terminal_profile_1.ShellTerminalProfile(this, {
+                shellPath: legacyShellPath,
+                shellArgs: legacyShellArgs
+            }));
+            // if no other default is set, use the legacy preferences as default if they exist
+            this.profileService.setDefaultProfile('Legacy Shell Preferences');
+        }
+        if (defaultProfile && this.profileService.getProfile(defaultProfile)) {
+            this.profileService.setDefaultProfile(defaultProfile);
+        }
+        for (const id of removed) {
+            this.userProfileStore.unregisterTerminalProfile(id);
+        }
+    }
+    async resolveShellPath(path) {
+        if (!path) {
+            return undefined;
+        }
+        if (typeof path === 'string') {
+            path = [path];
+        }
+        for (const p of path) {
+            const resolved = await this.variableResolver.resolve(p);
+            if (resolved) {
+                const resolvedURI = uri_1.default.fromFilePath(resolved);
+                if (await this.fileService.exists(resolvedURI)) {
+                    return resolved;
+                }
+            }
+        }
+        return undefined;
+    }
     onWillStop() {
         const preferenceValue = this.terminalPreferences['terminal.integrated.confirmOnExit'];
         if (preferenceValue !== 'never') {
@@ -187,12 +332,12 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     }
     async confirmExitWithActiveTerminals(activeTerminalCount) {
         const msg = activeTerminalCount === 1
-            ? nls_1.nls.localize('theia/terminal/terminateActive', 'Do you want to terminate the active terminal session?')
-            : nls_1.nls.localize('theia/terminal/terminateActiveMultiple', 'Do you want to terminate the {0} active terminal sessions?', activeTerminalCount);
+            ? nls_1.nls.localizeByDefault('Do you want to terminate the active terminal session?')
+            : nls_1.nls.localizeByDefault('Do you want to terminate the {0} active terminal sessions?', activeTerminalCount);
         const safeToExit = await new browser_1.ConfirmDialog({
             title: '',
             msg,
-            ok: nls_1.nls.localize('theia/terminal/terminate', 'Terminate'),
+            ok: nls_1.nls.localizeByDefault('Terminate'),
             cancel: browser_1.Dialog.CANCEL,
         }).open();
         return safeToExit === true;
@@ -274,6 +419,12 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         commands.registerCommand(TerminalCommands.NEW, {
             execute: () => this.openTerminal()
         });
+        commands.registerCommand(TerminalCommands.PROFILE_NEW, {
+            execute: () => this.openTerminalFromProfile()
+        });
+        commands.registerCommand(TerminalCommands.PROFILE_DEFAULT, {
+            execute: () => this.chooseDefaultProfile()
+        });
         commands.registerCommand(TerminalCommands.NEW_ACTIVE_WORKSPACE, {
             execute: () => this.openActiveWorkspaceTerminal()
         });
@@ -404,9 +555,19 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
             order: '0'
         });
         menus.registerMenuAction(TerminalMenus.TERMINAL_NEW, {
-            commandId: TerminalCommands.SPLIT.id,
+            commandId: TerminalCommands.PROFILE_NEW.id,
+            label: nls_1.nls.localize('theia/terminal/profileNew', 'New Terminal (With Profile)...'),
             order: '1'
         });
+        menus.registerMenuAction(TerminalMenus.TERMINAL_NEW, {
+            commandId: TerminalCommands.PROFILE_DEFAULT.id,
+            label: nls_1.nls.localize('theia/terminal/profileDefault', 'Choose Default Profile...'),
+            order: '3'
+        });
+        menus.registerMenuAction(TerminalMenus.TERMINAL_NEW, {
+            commandId: TerminalCommands.SPLIT.id,
+            order: '3'
+        });
         menus.registerMenuAction(TerminalMenus.TERMINAL_NAVIGATOR_CONTEXT_MENU, {
             commandId: TerminalCommands.TERMINAL_CONTEXT.id,
             order: 'z'
@@ -553,14 +714,43 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     }
     // TODO: reuse WidgetOpenHandler.open
     open(widget, options) {
-        const op = Object.assign(Object.assign({ mode: 'activate' }, options), { widgetOptions: Object.assign({ area: 'bottom' }, (options && options.widgetOptions)) });
+        var _a;
+        const area = widget.location === terminal_widget_1.TerminalLocation.Editor ? 'main' : 'bottom';
+        const widgetOptions = Object.assign({ area: area }, options === null || options === void 0 ? void 0 : options.widgetOptions);
+        let preserveFocus = false;
+        if (typeof widget.location === 'object') {
+            if ('parentTerminal' in widget.location) {
+                widgetOptions.ref = this.getById(widget.location.parentTerminal);
+                widgetOptions.mode = 'split-right';
+            }
+            else if ('viewColumn' in widget.location) {
+                preserveFocus = (_a = widget.location.preserveFocus) !== null && _a !== void 0 ? _a : false;
+                switch (widget.location.viewColumn) {
+                    case common_1.ViewColumn.Active:
+                        widgetOptions.ref = this.shell.currentWidget;
+                        widgetOptions.mode = 'tab-after';
+                        break;
+                    case common_1.ViewColumn.Beside:
+                        widgetOptions.ref = this.shell.currentWidget;
+                        widgetOptions.mode = 'split-right';
+                        break;
+                    default:
+                        widgetOptions.area = 'main';
+                        const mainAreaTerminals = this.shell.getWidgets('main').filter(w => w instanceof terminal_widget_1.TerminalWidget && w.isVisible);
+                        const column = Math.min(widget.location.viewColumn, mainAreaTerminals.length);
+                        widgetOptions.mode = widget.location.viewColumn <= mainAreaTerminals.length ? 'split-left' : 'split-right';
+                        widgetOptions.ref = mainAreaTerminals[column - 1];
+                }
+            }
+        }
+        const op = Object.assign(Object.assign({ mode: 'activate' }, options), { widgetOptions: widgetOptions });
         if (!widget.isAttached) {
             this.shell.addWidget(widget, op.widgetOptions);
         }
-        if (op.mode === 'activate') {
+        if (op.mode === 'activate' && !preserveFocus) {
             this.shell.activateWidget(widget.id);
         }
-        else if (op.mode === 'reveal') {
+        else if (op.mode === 'reveal' || preserveFocus) {
             this.shell.revealWidget(widget.id);
         }
     }
@@ -587,6 +777,25 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
             }
         });
     }
+    async selectTerminalProfile(placeholder) {
+        return new Promise(async (resolve) => {
+            var _a;
+            const profiles = this.profileService.all;
+            if (profiles.length === 0) {
+                resolve(undefined);
+            }
+            else {
+                const items = profiles.map(([id, profile]) => ({
+                    label: id,
+                    profile
+                }));
+                const selectedItem = await ((_a = this.quickInputService) === null || _a === void 0 ? void 0 : _a.showQuickPick(items, {
+                    placeholder
+                }));
+                resolve(selectedItem ? [selectedItem.label, selectedItem.profile] : undefined);
+            }
+        });
+    }
     async splitTerminal(widget) {
         const ref = this.getTerminalRef(widget);
         if (ref) {
@@ -599,10 +808,36 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     }
     async openTerminal(options) {
         const cwd = await this.selectTerminalCwd();
-        const termWidget = await this.newTerminal({ cwd });
-        termWidget.start();
+        let profile = this.profileService.defaultProfile;
+        if (!profile) {
+            throw new Error('There are not profiles registered');
+        }
+        if (profile instanceof shell_terminal_profile_1.ShellTerminalProfile) {
+            profile = profile.modify({ rootURI: cwd });
+        }
+        const termWidget = await (profile === null || profile === void 0 ? void 0 : profile.start());
+        this.open(termWidget, { widgetOptions: options });
+    }
+    async openTerminalFromProfile(options) {
+        const result = await this.selectTerminalProfile(nls_1.nls.localize('theia/terminal/selectProfile', 'Select a profile for the new terminal'));
+        if (!result) {
+            return;
+        }
+        let profile = result[1];
+        if (profile instanceof shell_terminal_profile_1.ShellTerminalProfile) {
+            const cwd = await this.selectTerminalCwd();
+            profile = profile.modify({ rootURI: cwd });
+        }
+        const termWidget = await profile.start();
         this.open(termWidget, { widgetOptions: options });
     }
+    async chooseDefaultProfile() {
+        const result = await this.selectTerminalProfile(nls_1.nls.localizeByDefault('Select your default terminal profile'));
+        if (!result) {
+            return;
+        }
+        this.preferenceService.set(`terminal.integrated.defaultProfile.${common_1.OS.backend.type().toLowerCase()}`, result[0], browser_1.PreferenceScope.User);
+    }
     async openActiveWorkspaceTerminal(options) {
         const termWidget = await this.newTerminal({});
         termWidget.start();
@@ -705,14 +940,34 @@ __decorate([
     (0, inversify_1.inject)(browser_2.WorkspaceService),
     __metadata("design:type", browser_2.WorkspaceService)
 ], TerminalFrontendContribution.prototype, "workspaceService", void 0);
+__decorate([
+    (0, inversify_1.inject)(terminal_profile_service_1.TerminalProfileService),
+    __metadata("design:type", Object)
+], TerminalFrontendContribution.prototype, "profileService", void 0);
+__decorate([
+    (0, inversify_1.inject)(terminal_profile_service_1.UserTerminalProfileStore),
+    __metadata("design:type", Object)
+], TerminalFrontendContribution.prototype, "userProfileStore", void 0);
+__decorate([
+    (0, inversify_1.inject)(terminal_profile_service_1.ContributedTerminalProfileStore),
+    __metadata("design:type", Object)
+], TerminalFrontendContribution.prototype, "contributedProfileStore", void 0);
 __decorate([
     (0, inversify_1.inject)(terminal_watcher_1.TerminalWatcher),
     __metadata("design:type", terminal_watcher_1.TerminalWatcher)
 ], TerminalFrontendContribution.prototype, "terminalWatcher", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_3.VariableResolverService),
+    __metadata("design:type", browser_3.VariableResolverService)
+], TerminalFrontendContribution.prototype, "variableResolver", void 0);
 __decorate([
     (0, inversify_1.inject)(browser_1.StorageService),
     __metadata("design:type", Object)
 ], TerminalFrontendContribution.prototype, "storageService", void 0);
+__decorate([
+    (0, inversify_1.inject)(browser_1.PreferenceService),
+    __metadata("design:type", Object)
+], TerminalFrontendContribution.prototype, "preferenceService", void 0);
 __decorate([
     (0, inversify_1.inject)(terminal_preferences_1.TerminalPreferences),
     __metadata("design:type", Object)