@theia/terminal 1.77.0-next.0 → 1.77.0-next.101

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

@@ -1,4 +1,3 @@
-"use strict";
 // *****************************************************************************
 // Copyright (C) 2017 TypeFox and others.
 //
@@ -14,34 +13,32 @@
 //
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminalFrontendContribution = exports.TerminalCommands = exports.TerminalMenus = void 0;
-const tslib_1 = require("tslib");
-const inversify_1 = require("@theia/core/shared/inversify");
-const common_1 = require("@theia/core/lib/common");
-const browser_1 = require("@theia/core/lib/browser");
-const clipboard_service_1 = require("@theia/core/lib/browser/clipboard-service");
-const terminal_widget_impl_1 = require("./terminal-widget-impl");
-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 browser_2 = require("@theia/workspace/lib/browser");
-const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
-const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
-const terminal_copy_on_selection_handler_1 = require("./terminal-copy-on-selection-handler");
-const terminal_watcher_1 = require("../common/terminal-watcher");
-const nls_1 = require("@theia/core/lib/common/nls");
-const terminal_preferences_1 = require("../common/terminal-preferences");
-const shell_terminal_profile_1 = require("./shell-terminal-profile");
-const browser_3 = require("@theia/variable-resolver/lib/browser");
-const color_1 = require("@theia/core/lib/common/color");
-const core_1 = require("@theia/core");
-const terminal_creation_handler_1 = require("./terminal-creation-handler");
-var TerminalMenus;
+import { __decorate } from "tslib";
+import { inject, injectable, named, optional, postConstruct } from '@theia/core/shared/inversify';
+import { Command, DisposableCollection, isOSX, SelectionService, Emitter, OS, MAIN_MENU_BAR, PreferenceService, PreferenceScope } from '@theia/core/lib/common';
+import { ApplicationShell, KeyCode, Key, WidgetManager, KeybindingRegistry, LabelProvider, StorageService, QuickInputService, codicon, CommonCommands, Dialog, ConfirmDialog, SHELL_TABBAR_CONTEXT_MENU } from '@theia/core/lib/browser';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
+import { TERMINAL_WIDGET_FACTORY_ID, TerminalWidgetImpl, nextTerminalCreationToken } from './terminal-widget-impl.js';
+import { TerminalWidget } from './base/terminal-widget.js';
+import { ContributedTerminalProfileStore, NULL_PROFILE, TerminalProfileService, UserTerminalProfileStore } from './terminal-profile-service.js';
+import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
+import { ShellTerminalServerProxy } from '../common/shell-terminal-protocol.js';
+import URI from '@theia/core/lib/common/uri';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler.js';
+import { TerminalWatcher } from '../common/terminal-watcher.js';
+import { nls } from '@theia/core/lib/common/nls';
+import { terminalAnsiColorMap, TerminalPreferences } from '../common/terminal-preferences.js';
+import { ShellTerminalProfile } from './shell-terminal-profile.js';
+import { VariableResolverService } from '@theia/variable-resolver/lib/browser';
+import { Color } from '@theia/core/lib/common/color';
+import { ContributionProvider, ILogger } from '@theia/core';
+import { TerminalCreationHandler } from './terminal-creation-handler.js';
+export var TerminalMenus;
 (function (TerminalMenus) {
-    TerminalMenus.TERMINAL = [...common_1.MAIN_MENU_BAR, '7_terminal'];
+    TerminalMenus.TERMINAL = [...MAIN_MENU_BAR, '7_terminal'];
     TerminalMenus.TERMINAL_NEW = [...TerminalMenus.TERMINAL, '1_terminal'];
     TerminalMenus.TERMINAL_TASKS = [...TerminalMenus.TERMINAL, '2_terminal'];
     TerminalMenus.TERMINAL_TASKS_INFO = [...TerminalMenus.TERMINAL_TASKS, '3_terminal'];
@@ -50,103 +47,103 @@ var TerminalMenus;
     TerminalMenus.TERMINAL_OPEN_EDITORS_CONTEXT_MENU = ['open-editors-context-menu', 'navigation'];
     TerminalMenus.TERMINAL_CONTEXT_MENU = ['terminal-context-menu'];
     TerminalMenus.TERMINAL_CONTRIBUTIONS = [...TerminalMenus.TERMINAL_CONTEXT_MENU, '5_terminal_contributions'];
-    TerminalMenus.TERMINAL_TITLE_CONTRIBUTIONS = [...browser_1.SHELL_TABBAR_CONTEXT_MENU, 'terminal_title_contributions'];
-})(TerminalMenus || (exports.TerminalMenus = TerminalMenus = {}));
-var TerminalCommands;
+    TerminalMenus.TERMINAL_TITLE_CONTRIBUTIONS = [...SHELL_TABBAR_CONTEXT_MENU, 'terminal_title_contributions'];
+})(TerminalMenus || (TerminalMenus = {}));
+export var TerminalCommands;
 (function (TerminalCommands) {
     TerminalCommands.TERMINAL_CATEGORY = 'Terminal';
-    TerminalCommands.TERMINAL_CATEGORY_KEY = nls_1.nls.getDefaultKey(TerminalCommands.TERMINAL_CATEGORY);
-    TerminalCommands.NEW = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.TERMINAL_CATEGORY_KEY = nls.getDefaultKey(TerminalCommands.TERMINAL_CATEGORY);
+    TerminalCommands.NEW = Command.toDefaultLocalizedCommand({
         id: 'terminal:new',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Create New Terminal'
     });
-    TerminalCommands.PROFILE_NEW = common_1.Command.toLocalizedCommand({
+    TerminalCommands.PROFILE_NEW = Command.toLocalizedCommand({
         id: 'terminal:new:profile',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Create New Integrated Terminal from a Profile'
     }, undefined, TerminalCommands.TERMINAL_CATEGORY_KEY);
-    TerminalCommands.PROFILE_DEFAULT = common_1.Command.toLocalizedCommand({
+    TerminalCommands.PROFILE_DEFAULT = Command.toLocalizedCommand({
         id: 'terminal:profile:default',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Choose the default Terminal Profile'
     }, undefined, TerminalCommands.TERMINAL_CATEGORY_KEY);
-    TerminalCommands.NEW_ACTIVE_WORKSPACE = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.NEW_ACTIVE_WORKSPACE = Command.toDefaultLocalizedCommand({
         id: 'terminal:new:active:workspace',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Create New Terminal (In Active Workspace)'
     });
-    TerminalCommands.TERMINAL_CLEAR = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.TERMINAL_CLEAR = Command.toDefaultLocalizedCommand({
         id: 'terminal:clear',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Clear'
     });
-    TerminalCommands.TERMINAL_CONTEXT = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.TERMINAL_CONTEXT = Command.toDefaultLocalizedCommand({
         id: 'terminal:context',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Open in Integrated Terminal'
     });
-    TerminalCommands.SPLIT = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SPLIT = Command.toDefaultLocalizedCommand({
         id: 'terminal:split',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Split Terminal'
     });
-    TerminalCommands.TERMINAL_FIND_TEXT = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.TERMINAL_FIND_TEXT = Command.toDefaultLocalizedCommand({
         id: 'terminal:find',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Find'
     });
-    TerminalCommands.TERMINAL_FIND_TEXT_CANCEL = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.TERMINAL_FIND_TEXT_CANCEL = Command.toDefaultLocalizedCommand({
         id: 'terminal:find:cancel',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Hide Find'
     });
-    TerminalCommands.SCROLL_LINE_UP = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SCROLL_LINE_UP = Command.toDefaultLocalizedCommand({
         id: 'terminal:scroll:line:up',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Scroll Up (Line)'
     });
-    TerminalCommands.SCROLL_LINE_DOWN = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SCROLL_LINE_DOWN = Command.toDefaultLocalizedCommand({
         id: 'terminal:scroll:line:down',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Scroll Down (Line)'
     });
-    TerminalCommands.SCROLL_TO_TOP = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SCROLL_TO_TOP = Command.toDefaultLocalizedCommand({
         id: 'terminal:scroll:top',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Scroll to Top'
     });
-    TerminalCommands.SCROLL_PAGE_UP = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SCROLL_PAGE_UP = Command.toDefaultLocalizedCommand({
         id: 'terminal:scroll:page:up',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Scroll Up (Page)'
     });
-    TerminalCommands.SCROLL_PAGE_DOWN = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SCROLL_PAGE_DOWN = Command.toDefaultLocalizedCommand({
         id: 'terminal:scroll:page:down',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Scroll Down (Page)'
     });
-    TerminalCommands.TOGGLE_TERMINAL = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.TOGGLE_TERMINAL = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.terminal.toggleTerminal',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Toggle Terminal'
     });
-    TerminalCommands.KILL_TERMINAL = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.KILL_TERMINAL = Command.toDefaultLocalizedCommand({
         id: 'terminal:kill',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Kill Terminal'
     });
-    TerminalCommands.SELECT_ALL = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SELECT_ALL = Command.toDefaultLocalizedCommand({
         id: 'terminal:select:all',
         label: 'Select All',
         category: TerminalCommands.TERMINAL_CATEGORY,
     });
-    TerminalCommands.PASTE_TERMINAL = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.PASTE_TERMINAL = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.terminal.paste',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Paste into Active Terminal'
     });
-    TerminalCommands.COPY_TERMINAL_SELECTION = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.COPY_TERMINAL_SELECTION = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.terminal.copySelection',
         category: TerminalCommands.TERMINAL_CATEGORY,
         label: 'Copy Selection'
@@ -154,19 +151,19 @@ var TerminalCommands;
     /**
      * Command that displays all terminals that are currently opened
      */
-    TerminalCommands.SHOW_ALL_OPENED_TERMINALS = common_1.Command.toDefaultLocalizedCommand({
+    TerminalCommands.SHOW_ALL_OPENED_TERMINALS = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.showAllTerminals',
-        category: browser_1.CommonCommands.VIEW_CATEGORY,
+        category: CommonCommands.VIEW_CATEGORY,
         label: 'Show All Opened Terminals'
     });
-})(TerminalCommands || (exports.TerminalCommands = TerminalCommands = {}));
+})(TerminalCommands || (TerminalCommands = {}));
 const ENVIRONMENT_VARIABLE_COLLECTIONS_KEY = 'terminal.integrated.environmentVariableCollections';
 let TerminalFrontendContribution = class TerminalFrontendContribution {
     constructor() {
         this.mergePreferencesPromise = Promise.resolve();
-        this.onDidCreateTerminalEmitter = new common_1.Emitter();
+        this.onDidCreateTerminalEmitter = new Emitter();
         this.onDidCreateTerminal = this.onDidCreateTerminalEmitter.event;
-        this.onDidChangeCurrentTerminalEmitter = new common_1.Emitter();
+        this.onDidChangeCurrentTerminalEmitter = new Emitter();
         this.onDidChangeCurrentTerminal = this.onDidChangeCurrentTerminalEmitter.event;
         // IDs of the most recently used terminals
         this.mostRecentlyUsedTerminalEntries = [];
@@ -174,7 +171,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     init() {
         this.shell.onDidChangeCurrentWidget(() => this.updateCurrentTerminal());
         this.widgetManager.onDidCreateWidget(({ widget }) => {
-            if (widget instanceof terminal_widget_1.TerminalWidget) {
+            if (widget instanceof TerminalWidget) {
                 this.updateCurrentTerminal();
                 this.onDidCreateTerminalEmitter.fire(widget);
                 this.setLastUsedTerminal(widget);
@@ -183,7 +180,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         const terminalFocusKey = this.contextKeyService.createKey('terminalFocus', false);
         const terminalSearchToggle = this.contextKeyService.createKey('terminalHideSearch', false);
         const updateFocusKey = () => {
-            terminalFocusKey.set(this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget);
+            terminalFocusKey.set(this.shell.activeWidget instanceof TerminalWidget);
             terminalSearchToggle.set(this.terminalHideSearch);
         };
         updateFocusKey();
@@ -200,7 +197,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         });
     }
     get terminalHideSearch() {
-        if (!(this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget)) {
+        if (!(this.shell.activeWidget instanceof TerminalWidget)) {
             return false;
         }
         const searchWidget = this.shell.activeWidget.getSearchBox();
@@ -217,16 +214,16 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         // extension contributions get read after this point: need to set the default profile if necessary
         this.profileService.onAdded(id => {
             let defaultProfileId;
-            switch (common_1.OS.backend.type()) {
-                case common_1.OS.Type.Windows: {
+            switch (OS.backend.type()) {
+                case OS.Type.Windows: {
                     defaultProfileId = this.terminalPreferences['terminal.integrated.defaultProfile.windows'];
                     break;
                 }
-                case common_1.OS.Type.Linux: {
+                case OS.Type.Linux: {
                     defaultProfileId = this.terminalPreferences['terminal.integrated.defaultProfile.linux'];
                     break;
                 }
-                case common_1.OS.Type.OSX: {
+                case OS.Type.OSX: {
                     defaultProfileId = this.terminalPreferences['terminal.integrated.defaultProfile.osx'];
                     break;
                 }
@@ -257,8 +254,8 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         }
     }
     async contributeDefaultProfiles() {
-        if (common_1.OS.backend.isWindows) {
-            this.contributedProfileStore.registerTerminalProfile('cmd', new shell_terminal_profile_1.ShellTerminalProfile(this, {
+        if (OS.backend.isWindows) {
+            this.contributedProfileStore.registerTerminalProfile('cmd', new ShellTerminalProfile(this, {
                 shellPath: await this.resolveShellPath([
                     '${env:windir}\\Sysnative\\cmd.exe',
                     '${env:windir}\\System32\\cmd.exe'
@@ -266,7 +263,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
             }));
         }
         else {
-            this.contributedProfileStore.registerTerminalProfile('SHELL', new shell_terminal_profile_1.ShellTerminalProfile(this, {
+            this.contributedProfileStore.registerTerminalProfile('SHELL', new ShellTerminalProfile(this, {
                 shellPath: await this.resolveShellPath('${SHELL}'),
                 shellArgs: ['-l'],
                 iconClass: 'codicon codicon-terminal'
@@ -280,22 +277,22 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         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: {
+        switch (OS.backend.type()) {
+            case OS.Type.Windows: {
                 profiles = this.terminalPreferences['terminal.integrated.profiles.windows'];
                 defaultProfile = this.terminalPreferences['terminal.integrated.defaultProfile.windows'];
                 legacyShellPath = this.terminalPreferences['terminal.integrated.shell.windows'] ?? undefined;
                 legacyShellArgs = this.terminalPreferences['terminal.integrated.shellArgs.windows'];
                 break;
             }
-            case common_1.OS.Type.Linux: {
+            case OS.Type.Linux: {
                 profiles = this.terminalPreferences['terminal.integrated.profiles.linux'];
                 defaultProfile = this.terminalPreferences['terminal.integrated.defaultProfile.linux'];
                 legacyShellPath = this.terminalPreferences['terminal.integrated.shell.linux'] ?? undefined;
                 legacyShellArgs = this.terminalPreferences['terminal.integrated.shellArgs.linux'];
                 break;
             }
-            case common_1.OS.Type.OSX: {
+            case OS.Type.OSX: {
                 profiles = this.terminalPreferences['terminal.integrated.profiles.osx'];
                 defaultProfile = this.terminalPreferences['terminal.integrated.defaultProfile.osx'];
                 legacyShellPath = this.terminalPreferences['terminal.integrated.shell.osx'] ?? undefined;
@@ -317,16 +314,16 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                             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));
+                        this.userProfileStore.registerTerminalProfile(id, new ShellTerminalProfile(this, options));
                     }
                 }
                 else {
-                    this.userProfileStore.registerTerminalProfile(id, terminal_profile_service_1.NULL_PROFILE);
+                    this.userProfileStore.registerTerminalProfile(id, NULL_PROFILE);
                 }
             }
         }
         if (legacyShellPath) {
-            this.userProfileStore.registerTerminalProfile('Legacy Shell Preferences', new shell_terminal_profile_1.ShellTerminalProfile(this, {
+            this.userProfileStore.registerTerminalProfile('Legacy Shell Preferences', new ShellTerminalProfile(this, {
                 shellPath: legacyShellPath,
                 shellArgs: legacyShellArgs
             }));
@@ -350,7 +347,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         for (const p of path) {
             const resolved = await this.variableResolver.resolve(p);
             if (resolved) {
-                const resolvedURI = uri_1.default.fromFilePath(resolved);
+                const resolvedURI = URI.fromFilePath(resolved);
                 if (await this.fileService.exists(resolvedURI)) {
                     return resolved;
                 }
@@ -361,7 +358,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     onWillStop() {
         const preferenceValue = this.terminalPreferences['terminal.integrated.confirmOnExit'];
         if (preferenceValue !== 'never') {
-            const allTerminals = this.widgetManager.getWidgets(terminal_widget_impl_1.TERMINAL_WIDGET_FACTORY_ID);
+            const allTerminals = this.widgetManager.getWidgets(TERMINAL_WIDGET_FACTORY_ID);
             if (allTerminals.length) {
                 return {
                     prepare: async () => {
@@ -382,13 +379,13 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     }
     async confirmExitWithActiveTerminals(activeTerminalCount) {
         const msg = activeTerminalCount === 1
-            ? 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({
+            ? nls.localizeByDefault('Do you want to terminate the active terminal session?')
+            : nls.localizeByDefault('Do you want to terminate the {0} active terminal sessions?', activeTerminalCount);
+        const safeToExit = await new ConfirmDialog({
             title: '',
             msg,
-            ok: nls_1.nls.localizeByDefault('Terminate'),
-            cancel: browser_1.Dialog.CANCEL,
+            ok: nls.localizeByDefault('Terminate'),
+            cancel: Dialog.CANCEL,
         }).open();
         return safeToExit === true;
     }
@@ -403,7 +400,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     }
     updateCurrentTerminal() {
         const widget = this.shell.currentWidget;
-        if (widget instanceof terminal_widget_1.TerminalWidget) {
+        if (widget instanceof TerminalWidget) {
             this.setCurrentTerminal(widget);
         }
         else if (!this._currentTerminal || !this._currentTerminal.isVisible) {
@@ -431,7 +428,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
             this.mostRecentlyUsedTerminalEntries.splice(entryIndex, 1);
         }
         else {
-            toDispose = new common_1.DisposableCollection();
+            toDispose = new DisposableCollection();
             toDispose.push(lastUsedTerminal.onDidChangeVisibility((isVisible) => {
                 if (isVisible) {
                     this.setLastUsedTerminal(lastUsedTerminal);
@@ -454,7 +451,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         }
     }
     get all() {
-        return this.widgetManager.getWidgets(terminal_widget_impl_1.TERMINAL_WIDGET_FACTORY_ID);
+        return this.widgetManager.getWidgets(TERMINAL_WIDGET_FACTORY_ID);
     }
     getById(id) {
         return this.all.find(terminal => terminal.id === id);
@@ -476,7 +473,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         });
         commands.registerCommand(TerminalCommands.PROFILE_NEW, {
             execute: async () => {
-                const profile = await this.selectTerminalProfile(nls_1.nls.localize('theia/terminal/selectProfile', 'Select a profile for the new terminal'));
+                const profile = await this.selectTerminalProfile(nls.localize('theia/terminal/selectProfile', 'Select a profile for the new terminal'));
                 if (!profile) {
                     return;
                 }
@@ -498,13 +495,13 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         commands.registerHandler(TerminalCommands.TERMINAL_CLEAR.id, {
             execute: () => this.currentTerminal?.clearOutput()
         });
-        commands.registerCommand(TerminalCommands.TERMINAL_CONTEXT, uri_command_handler_1.UriAwareCommandHandler.MonoSelect(this.selectionService, {
+        commands.registerCommand(TerminalCommands.TERMINAL_CONTEXT, UriAwareCommandHandler.MonoSelect(this.selectionService, {
             execute: uri => this.openInTerminal(uri)
         }));
         commands.registerCommand(TerminalCommands.TERMINAL_FIND_TEXT);
         commands.registerHandler(TerminalCommands.TERMINAL_FIND_TEXT.id, {
             isEnabled: () => {
-                if (this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget) {
+                if (this.shell.activeWidget instanceof TerminalWidget) {
                     return !this.shell.activeWidget.getSearchBox().isVisible;
                 }
                 return false;
@@ -518,7 +515,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         commands.registerCommand(TerminalCommands.TERMINAL_FIND_TEXT_CANCEL);
         commands.registerHandler(TerminalCommands.TERMINAL_FIND_TEXT_CANCEL.id, {
             isEnabled: () => {
-                if (this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget) {
+                if (this.shell.activeWidget instanceof TerminalWidget) {
                     return this.shell.activeWidget.getSearchBox().isVisible;
                 }
                 return false;
@@ -530,35 +527,35 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
             }
         });
         commands.registerCommand(TerminalCommands.SCROLL_LINE_UP, {
-            isEnabled: () => this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget,
+            isEnabled: () => this.shell.activeWidget instanceof TerminalWidget,
             isVisible: () => false,
             execute: () => {
                 this.shell.activeWidget.scrollLineUp();
             }
         });
         commands.registerCommand(TerminalCommands.SCROLL_LINE_DOWN, {
-            isEnabled: () => this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget,
+            isEnabled: () => this.shell.activeWidget instanceof TerminalWidget,
             isVisible: () => false,
             execute: () => {
                 this.shell.activeWidget.scrollLineDown();
             }
         });
         commands.registerCommand(TerminalCommands.SCROLL_TO_TOP, {
-            isEnabled: () => this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget,
+            isEnabled: () => this.shell.activeWidget instanceof TerminalWidget,
             isVisible: () => false,
             execute: () => {
                 this.shell.activeWidget.scrollToTop();
             }
         });
         commands.registerCommand(TerminalCommands.SCROLL_PAGE_UP, {
-            isEnabled: () => this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget,
+            isEnabled: () => this.shell.activeWidget instanceof TerminalWidget,
             isVisible: () => false,
             execute: () => {
                 this.shell.activeWidget.scrollPageUp();
             }
         });
         commands.registerCommand(TerminalCommands.SCROLL_PAGE_DOWN, {
-            isEnabled: () => this.shell.activeWidget instanceof terminal_widget_1.TerminalWidget,
+            isEnabled: () => this.shell.activeWidget instanceof TerminalWidget,
             isVisible: () => false,
             execute: () => {
                 this.shell.activeWidget.scrollPageDown();
@@ -601,20 +598,20 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
     }
     getPasteTargetTerminal() {
         const terminal = this.shell.activeWidget;
-        if (terminal instanceof terminal_widget_1.TerminalWidget && this.terminalPreferences['terminal.enablePaste']) {
+        if (terminal instanceof TerminalWidget && this.terminalPreferences['terminal.enablePaste']) {
             return terminal;
         }
         return undefined;
     }
     getCopySourceTerminal() {
         const terminal = this.shell.activeWidget;
-        if (terminal instanceof terminal_widget_1.TerminalWidget && terminal.hasSelection() && this.terminalPreferences['terminal.enableCopy']) {
+        if (terminal instanceof TerminalWidget && terminal.hasSelection() && this.terminalPreferences['terminal.enableCopy']) {
             return terminal;
         }
         return undefined;
     }
     toggleTerminal() {
-        const terminals = this.shell.getWidgets('bottom').filter(w => w instanceof terminal_widget_1.TerminalWidget);
+        const terminals = this.shell.getWidgets('bottom').filter(w => w instanceof TerminalWidget);
         if (terminals.length === 0) {
             this.openTerminal();
             return;
@@ -653,20 +650,20 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         this.open(termWidget);
     }
     registerMenus(menus) {
-        menus.registerSubmenu(TerminalMenus.TERMINAL, terminal_widget_impl_1.TerminalWidgetImpl.LABEL);
+        menus.registerSubmenu(TerminalMenus.TERMINAL, TerminalWidgetImpl.LABEL);
         menus.registerMenuAction(TerminalMenus.TERMINAL_NEW, {
             commandId: TerminalCommands.NEW.id,
-            label: nls_1.nls.localizeByDefault('New Terminal'),
+            label: nls.localizeByDefault('New Terminal'),
             order: '0'
         });
         menus.registerMenuAction(TerminalMenus.TERMINAL_NEW, {
             commandId: TerminalCommands.PROFILE_NEW.id,
-            label: nls_1.nls.localize('theia/terminal/profileNew', 'New Terminal (With Profile)...'),
+            label: 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...'),
+            label: nls.localize('theia/terminal/profileDefault', 'Choose Default Profile...'),
             order: '3'
         });
         menus.registerMenuAction(TerminalMenus.TERMINAL_NEW, {
@@ -683,18 +680,18 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         });
         menus.registerMenuAction([...TerminalMenus.TERMINAL_CONTEXT_MENU, '_1'], {
             commandId: TerminalCommands.NEW_ACTIVE_WORKSPACE.id,
-            label: nls_1.nls.localizeByDefault('New Terminal')
+            label: nls.localizeByDefault('New Terminal')
         });
         menus.registerMenuAction([...TerminalMenus.TERMINAL_CONTEXT_MENU, '_1'], {
             commandId: TerminalCommands.SPLIT.id
         });
         menus.registerMenuAction([...TerminalMenus.TERMINAL_CONTEXT_MENU, '_2'], {
             commandId: TerminalCommands.COPY_TERMINAL_SELECTION.id,
-            label: nls_1.nls.localizeByDefault('Copy')
+            label: nls.localizeByDefault('Copy')
         });
         menus.registerMenuAction([...TerminalMenus.TERMINAL_CONTEXT_MENU, '_2'], {
             commandId: TerminalCommands.PASTE_TERMINAL.id,
-            label: nls_1.nls.localizeByDefault('Paste')
+            label: nls.localizeByDefault('Paste')
         });
         menus.registerMenuAction([...TerminalMenus.TERMINAL_CONTEXT_MENU, '_2'], {
             commandId: TerminalCommands.SELECT_ALL.id
@@ -712,14 +709,14 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         toolbar.registerItem({
             id: TerminalCommands.NEW.id,
             command: TerminalCommands.NEW.id,
-            icon: (0, browser_1.codicon)('add'),
+            icon: codicon('add'),
             tooltip: TerminalCommands.NEW.label,
             isVisible: w => this.withWidget(w, () => true),
         });
         toolbar.registerItem({
             id: TerminalCommands.SPLIT.id,
             command: TerminalCommands.SPLIT.id,
-            icon: (0, browser_1.codicon)('split-horizontal'),
+            icon: codicon('split-horizontal'),
             tooltip: TerminalCommands.SPLIT.label
         });
     }
@@ -731,8 +728,8 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
            context of the terminal.  */
         const regCtrl = (k) => {
             keybindings.registerKeybinding({
-                command: browser_1.KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
-                keybinding: browser_1.KeyCode.createKeyCode({ key: k, ctrl: true }).toString(),
+                command: KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
+                keybinding: KeyCode.createKeyCode({ key: k, ctrl: true }).toString(),
                 when: 'terminalFocus',
             });
         };
@@ -740,55 +737,55 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
            context of the terminal.  */
         const regAlt = (k) => {
             keybindings.registerKeybinding({
-                command: browser_1.KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
-                keybinding: browser_1.KeyCode.createKeyCode({ key: k, alt: true }).toString(),
+                command: KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
+                keybinding: KeyCode.createKeyCode({ key: k, alt: true }).toString(),
                 when: 'terminalFocus'
             });
         };
         /* ctrl-space (000 - NUL).  */
-        regCtrl(browser_1.Key.SPACE);
+        regCtrl(Key.SPACE);
         /* ctrl-A (001/1/0x1) through ctrl-Z (032/26/0x1A).  */
         for (let i = 0; i < 26; i++) {
             regCtrl({
-                keyCode: browser_1.Key.KEY_A.keyCode + i,
+                keyCode: Key.KEY_A.keyCode + i,
                 code: 'Key' + String.fromCharCode('A'.charCodeAt(0) + i)
             });
         }
         /* ctrl-[ or ctrl-3 (033/27/0x1B - ESC).  */
-        regCtrl(browser_1.Key.BRACKET_LEFT);
-        regCtrl(browser_1.Key.DIGIT3);
+        regCtrl(Key.BRACKET_LEFT);
+        regCtrl(Key.DIGIT3);
         /* ctrl-\ or ctrl-4 (034/28/0x1C - FS).  */
-        regCtrl(browser_1.Key.BACKSLASH);
-        regCtrl(browser_1.Key.DIGIT4);
+        regCtrl(Key.BACKSLASH);
+        regCtrl(Key.DIGIT4);
         /* ctrl-] or ctrl-5 (035/29/0x1D - GS).  */
-        regCtrl(browser_1.Key.BRACKET_RIGHT);
-        regCtrl(browser_1.Key.DIGIT5);
+        regCtrl(Key.BRACKET_RIGHT);
+        regCtrl(Key.DIGIT5);
         /* ctrl-6 (036/30/0x1E - RS).  */
-        regCtrl(browser_1.Key.DIGIT6);
+        regCtrl(Key.DIGIT6);
         /* ctrl-7 (037/31/0x1F - US).  */
-        regCtrl(browser_1.Key.DIGIT7);
+        regCtrl(Key.DIGIT7);
         /* ctrl-8 (177/127/0x7F - DEL).  */
-        regCtrl(browser_1.Key.DIGIT8);
+        regCtrl(Key.DIGIT8);
         /* alt-A (0x1B 0x62) through alt-Z (0x1B 0x7A).  */
         for (let i = 0; i < 26; i++) {
             regAlt({
-                keyCode: browser_1.Key.KEY_A.keyCode + i,
+                keyCode: Key.KEY_A.keyCode + i,
                 code: 'Key' + String.fromCharCode('A'.charCodeAt(0) + i)
             });
         }
         /* alt-` (0x1B 0x60).  */
-        regAlt(browser_1.Key.BACKQUOTE);
+        regAlt(Key.BACKQUOTE);
         /* alt-0 (0x1B 0x30) through alt-9 (0x1B 0x39).  */
         for (let i = 0; i < 10; i++) {
             regAlt({
-                keyCode: browser_1.Key.DIGIT0.keyCode + i,
+                keyCode: Key.DIGIT0.keyCode + i,
                 code: 'Digit' + String.fromCharCode('0'.charCodeAt(0) + i)
             });
         }
-        if (common_1.isOSX) {
+        if (isOSX) {
             // selectAll on OSX
             keybindings.registerKeybinding({
-                command: browser_1.KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
+                command: KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
                 keybinding: 'ctrlcmd+a',
                 when: 'terminalFocus'
             });
@@ -811,10 +808,12 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         // letting the keystroke reach xterm's native paste event. That avoids the permission-gated
         // Clipboard API (navigator.clipboard.readText) that the PASTE_TERMINAL command requires, while
         // preserving bracketed paste. terminal.enablePaste is enforced in TerminalWidgetImpl.customKeyHandler.
+        // displayFor still shows the key as the accelerator of the Paste context menu item.
         keybindings.registerKeybinding({
-            command: browser_1.KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
+            command: KeybindingRegistry.PASSTHROUGH_PSEUDO_COMMAND,
             keybinding: 'ctrlcmd+v',
-            when: 'terminalFocus'
+            when: 'terminalFocus',
+            displayFor: TerminalCommands.PASTE_TERMINAL.id
         });
         keybindings.registerKeybinding({
             command: TerminalCommands.COPY_TERMINAL_SELECTION.id,
@@ -867,8 +866,8 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         });
     }
     async newTerminal(options) {
-        const widget = await this.widgetManager.getOrCreateWidget(terminal_widget_impl_1.TERMINAL_WIDGET_FACTORY_ID, {
-            created: (0, terminal_widget_impl_1.nextTerminalCreationToken)(),
+        const widget = await this.widgetManager.getOrCreateWidget(TERMINAL_WIDGET_FACTORY_ID, {
+            created: nextTerminalCreationToken(),
             ...options
         });
         return widget;
@@ -898,7 +897,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                     resource
                 }));
                 const selectedItem = await this.quickInputService?.showQuickPick(items, {
-                    placeholder: nls_1.nls.localizeByDefault('Select current working directory for new terminal')
+                    placeholder: nls.localizeByDefault('Select current working directory for new terminal')
                 });
                 resolve(selectedItem?.resource?.toString());
             }
@@ -936,7 +935,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                 throw new Error('There are no profiles registered');
             }
         }
-        if (profile instanceof shell_terminal_profile_1.ShellTerminalProfile) {
+        if (profile instanceof ShellTerminalProfile) {
             if (this.workspaceService.workspace) {
                 const cwd = await this.selectTerminalCwd();
                 if (!cwd) {
@@ -951,11 +950,11 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         }
     }
     async chooseDefaultProfile() {
-        const result = await this.selectTerminalProfile(nls_1.nls.localizeByDefault('Select your default terminal profile'));
+        const result = await this.selectTerminalProfile(nls.localizeByDefault('Select your default terminal profile'));
         if (!result) {
             return;
         }
-        this.preferenceService.set(`terminal.integrated.defaultProfile.${common_1.OS.backend.type().toLowerCase()}`, result[0], common_1.PreferenceScope.User);
+        this.preferenceService.set(`terminal.integrated.defaultProfile.${OS.backend.type().toLowerCase()}`, result[0], PreferenceScope.User);
     }
     async openActiveWorkspaceTerminal(options) {
         const termWidget = await this.newTerminal({});
@@ -963,7 +962,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
         this.open(termWidget, { widgetOptions: options });
     }
     withWidget(widget, fn) {
-        if (widget instanceof terminal_widget_1.TerminalWidget) {
+        if (widget instanceof TerminalWidget) {
             return fn(widget);
         }
         return false;
@@ -980,7 +979,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                 hcDark: 'panel.background',
                 hcLight: 'panel.background'
             },
-            description: nls_1.nls.localizeByDefault('The background color of the terminal, this allows coloring the terminal differently to the panel.')
+            description: nls.localizeByDefault('The background color of the terminal, this allows coloring the terminal differently to the panel.')
         });
         colors.register({
             id: 'terminal.foreground',
@@ -990,15 +989,15 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                 hcDark: '#FFFFFF',
                 hcLight: '#292929'
             },
-            description: nls_1.nls.localizeByDefault('The foreground color of the terminal.')
+            description: nls.localizeByDefault('The foreground color of the terminal.')
         });
         colors.register({
             id: 'terminalCursor.foreground',
-            description: nls_1.nls.localizeByDefault('The foreground color of the terminal cursor.')
+            description: nls.localizeByDefault('The foreground color of the terminal cursor.')
         });
         colors.register({
             id: 'terminalCursor.background',
-            description: nls_1.nls.localizeByDefault('The background color of the terminal cursor. Allows customizing the color of a character overlapped by a block cursor.')
+            description: nls.localizeByDefault('The background color of the terminal cursor. Allows customizing the color of a character overlapped by a block cursor.')
         });
         colors.register({
             id: 'terminal.selectionBackground',
@@ -1008,17 +1007,17 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                 hcDark: 'editor.selectionBackground',
                 hcLight: 'editor.selectionBackground'
             },
-            description: nls_1.nls.localizeByDefault('The selection background color of the terminal.')
+            description: nls.localizeByDefault('The selection background color of the terminal.')
         });
         colors.register({
             id: 'terminal.inactiveSelectionBackground',
             defaults: {
-                light: color_1.Color.transparent('terminal.selectionBackground', 0.5),
-                dark: color_1.Color.transparent('terminal.selectionBackground', 0.5),
-                hcDark: color_1.Color.transparent('terminal.selectionBackground', 0.7),
-                hcLight: color_1.Color.transparent('terminal.selectionBackground', 0.5),
+                light: Color.transparent('terminal.selectionBackground', 0.5),
+                dark: Color.transparent('terminal.selectionBackground', 0.5),
+                hcDark: Color.transparent('terminal.selectionBackground', 0.7),
+                hcLight: Color.transparent('terminal.selectionBackground', 0.5),
             },
-            description: nls_1.nls.localizeByDefault('The selection background color of the terminal when it does not have focus.')
+            description: nls.localizeByDefault('The selection background color of the terminal when it does not have focus.')
         });
         colors.register({
             id: 'terminal.selectionForeground',
@@ -1029,7 +1028,7 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                 hcLight: '#ffffff'
             },
             // eslint-disable-next-line max-len
-            description: nls_1.nls.localizeByDefault('The selection foreground color of the terminal. When this is null the selection foreground will be retained and have the minimum contrast ratio feature applied.')
+            description: nls.localizeByDefault('The selection foreground color of the terminal. When this is null the selection foreground will be retained and have the minimum contrast ratio feature applied.')
         });
         colors.register({
             id: 'terminal.border',
@@ -1039,115 +1038,91 @@ let TerminalFrontendContribution = class TerminalFrontendContribution {
                 hcDark: 'panel.border',
                 hcLight: 'panel.border'
             },
-            description: nls_1.nls.localizeByDefault('The color of the border that separates split panes within the terminal. This defaults to panel.border.')
+            description: nls.localizeByDefault('The color of the border that separates split panes within the terminal. This defaults to panel.border.')
         });
         // eslint-disable-next-line guard-for-in
-        for (const id in terminal_preferences_1.terminalAnsiColorMap) {
-            const entry = terminal_preferences_1.terminalAnsiColorMap[id];
+        for (const id in terminalAnsiColorMap) {
+            const entry = terminalAnsiColorMap[id];
             const colorName = id.substring(13);
             colors.register({
                 id,
                 defaults: entry.defaults,
-                description: nls_1.nls.localizeByDefault("'{0}' ANSI color in the terminal.", colorName)
+                description: nls.localizeByDefault("'{0}' ANSI color in the terminal.", colorName)
             });
         }
     }
 };
-exports.TerminalFrontendContribution = TerminalFrontendContribution;
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.ApplicationShell),
-    tslib_1.__metadata("design:type", browser_1.ApplicationShell)
+__decorate([
+    inject(ApplicationShell)
 ], TerminalFrontendContribution.prototype, "shell", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(shell_terminal_protocol_1.ShellTerminalServerProxy),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ShellTerminalServerProxy)
 ], TerminalFrontendContribution.prototype, "shellTerminalServer", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.WidgetManager),
-    tslib_1.__metadata("design:type", browser_1.WidgetManager)
+__decorate([
+    inject(WidgetManager)
 ], TerminalFrontendContribution.prototype, "widgetManager", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(file_service_1.FileService),
-    tslib_1.__metadata("design:type", file_service_1.FileService)
+__decorate([
+    inject(FileService)
 ], TerminalFrontendContribution.prototype, "fileService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(common_1.SelectionService),
-    tslib_1.__metadata("design:type", common_1.SelectionService)
+__decorate([
+    inject(SelectionService)
 ], TerminalFrontendContribution.prototype, "selectionService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.LabelProvider),
-    tslib_1.__metadata("design:type", browser_1.LabelProvider)
+__decorate([
+    inject(LabelProvider)
 ], TerminalFrontendContribution.prototype, "labelProvider", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.QuickInputService),
-    (0, inversify_1.optional)(),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(QuickInputService),
+    optional()
 ], TerminalFrontendContribution.prototype, "quickInputService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_2.WorkspaceService),
-    tslib_1.__metadata("design:type", browser_2.WorkspaceService)
+__decorate([
+    inject(WorkspaceService)
 ], TerminalFrontendContribution.prototype, "workspaceService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_profile_service_1.TerminalProfileService),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(TerminalProfileService)
 ], TerminalFrontendContribution.prototype, "profileService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_profile_service_1.UserTerminalProfileStore),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(UserTerminalProfileStore)
 ], TerminalFrontendContribution.prototype, "userProfileStore", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_profile_service_1.ContributedTerminalProfileStore),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ContributedTerminalProfileStore)
 ], TerminalFrontendContribution.prototype, "contributedProfileStore", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_watcher_1.TerminalWatcher),
-    tslib_1.__metadata("design:type", terminal_watcher_1.TerminalWatcher)
+__decorate([
+    inject(TerminalWatcher)
 ], TerminalFrontendContribution.prototype, "terminalWatcher", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_3.VariableResolverService),
-    tslib_1.__metadata("design:type", browser_3.VariableResolverService)
+__decorate([
+    inject(VariableResolverService)
 ], TerminalFrontendContribution.prototype, "variableResolver", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.StorageService),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(StorageService)
 ], TerminalFrontendContribution.prototype, "storageService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(common_1.PreferenceService),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(PreferenceService)
 ], TerminalFrontendContribution.prototype, "preferenceService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_preferences_1.TerminalPreferences),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(TerminalPreferences)
 ], TerminalFrontendContribution.prototype, "terminalPreferences", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_copy_on_selection_handler_1.TerminalCopyOnSelectionHandler),
-    tslib_1.__metadata("design:type", terminal_copy_on_selection_handler_1.TerminalCopyOnSelectionHandler)
+__decorate([
+    inject(TerminalCopyOnSelectionHandler)
 ], TerminalFrontendContribution.prototype, "copyHandler", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(clipboard_service_1.ClipboardService),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ClipboardService)
 ], TerminalFrontendContribution.prototype, "clipboardService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(context_key_service_1.ContextKeyService),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ContextKeyService)
 ], TerminalFrontendContribution.prototype, "contextKeyService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(core_1.ContributionProvider),
-    (0, inversify_1.named)(terminal_creation_handler_1.TerminalCreationHandler),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ContributionProvider),
+    named(TerminalCreationHandler)
 ], TerminalFrontendContribution.prototype, "terminalCreationHandlers", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(core_1.ILogger),
-    (0, inversify_1.named)('terminal:TerminalFrontendContribution'),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ILogger),
+    named('terminal:TerminalFrontendContribution')
 ], TerminalFrontendContribution.prototype, "logger", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.postConstruct)(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+__decorate([
+    postConstruct()
 ], TerminalFrontendContribution.prototype, "init", null);
-exports.TerminalFrontendContribution = TerminalFrontendContribution = tslib_1.__decorate([
-    (0, inversify_1.injectable)()
+TerminalFrontendContribution = __decorate([
+    injectable()
 ], TerminalFrontendContribution);
+export { TerminalFrontendContribution };
 //# sourceMappingURL=terminal-frontend-contribution.js.map