@theia/terminal 1.77.0-next.95 → 1.77.0

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

@@ -1,4 +1,3 @@
-"use strict";
 // *****************************************************************************
 // Copyright (C) 2017 TypeFox and others.
 //
@@ -15,43 +14,41 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 var TerminalWidgetImpl_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TerminalWidgetImpl = exports.TerminalContribution = exports.TERMINAL_WIDGET_FACTORY_ID = void 0;
-exports.nextTerminalCreationToken = nextTerminalCreationToken;
-const tslib_1 = require("tslib");
-const xterm_1 = require("xterm");
-const xterm_addon_fit_1 = require("xterm-addon-fit");
-const xterm_addon_webgl_1 = require("xterm-addon-webgl");
-const inversify_1 = require("@theia/core/shared/inversify");
-const core_1 = require("@theia/core");
-const browser_1 = require("@theia/core/lib/browser");
-const common_1 = require("@theia/core/lib/common");
-const browser_2 = require("@theia/workspace/lib/browser");
-const shell_terminal_protocol_1 = require("../common/shell-terminal-protocol");
-const terminal_protocol_1 = require("../common/terminal-protocol");
-const base_terminal_protocol_1 = require("../common/base-terminal-protocol");
-const terminal_watcher_1 = require("../common/terminal-watcher");
-const terminal_widget_1 = require("./base/terminal-widget");
-const promise_util_1 = require("@theia/core/lib/common/promise-util");
-const terminal_preferences_1 = require("../common/terminal-preferences");
-const uri_1 = tslib_1.__importDefault(require("@theia/core/lib/common/uri"));
-const terminal_service_1 = require("./base/terminal-service");
-const terminal_search_widget_1 = require("./search/terminal-search-widget");
-const terminal_copy_on_selection_handler_1 = require("./terminal-copy-on-selection-handler");
-const terminal_theme_service_1 = require("./terminal-theme-service");
-const shell_command_builder_1 = require("@theia/process/lib/common/shell-command-builder");
-const keys_1 = require("@theia/core/lib/browser/keys");
-const nls_1 = require("@theia/core/lib/common/nls");
-const terminal_frontend_contribution_1 = require("./terminal-frontend-contribution");
-const debounce = require("p-debounce");
-const markdown_string_1 = require("@theia/core/lib/common/markdown-rendering/markdown-string");
-const markdown_renderer_1 = require("@theia/core/lib/browser/markdown-rendering/markdown-renderer");
-const service_connection_provider_1 = require("@theia/core/lib/browser/messaging/service-connection-provider");
-const color_registry_1 = require("@theia/core/lib/browser/color-registry");
-const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
-const shell_type_1 = require("../common/shell-type");
-const terminal_command_history_1 = require("./terminal-command-history");
-exports.TERMINAL_WIDGET_FACTORY_ID = 'terminal';
+import { __decorate } from "tslib";
+// A CommonJS module whose exports cannot be detected statically, so it is imported as a whole.
+import xterm from 'xterm';
+import { FitAddon } from 'xterm-addon-fit';
+import { WebglAddon } from 'xterm-addon-webgl';
+import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
+import { ContributionProvider, Disposable, Emitter, ILogger, DisposableCollection, OS, generateUuid } from '@theia/core';
+import { Widget, isFirefox, MessageLoop, KeyCode, ContextMenuRenderer, DecorationStyle } from '@theia/core/lib/browser';
+import { isOSX } from '@theia/core/lib/common';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
+import { ShellTerminalServerProxy } from '../common/shell-terminal-protocol.js';
+import { terminalsPath } from '../common/terminal-protocol.js';
+import { IBaseTerminalServer, TerminalExitReason } from '../common/base-terminal-protocol.js';
+import { TerminalWatcher } from '../common/terminal-watcher.js';
+import { TerminalWidgetOptions, TerminalWidget, TerminalLocation } from './base/terminal-widget.js';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { TerminalPreferences } from '../common/terminal-preferences.js';
+import URI from '@theia/core/lib/common/uri';
+import { TerminalService } from './base/terminal-service.js';
+import { TerminalSearchWidgetFactory } from './search/terminal-search-widget.js';
+import { TerminalCopyOnSelectionHandler } from './terminal-copy-on-selection-handler.js';
+import { TerminalThemeService } from './terminal-theme-service.js';
+import { ShellCommandBuilder } from '@theia/process/lib/common/shell-command-builder';
+import { Key } from '@theia/core/lib/browser/keys';
+import { nls } from '@theia/core/lib/common/nls';
+import { TerminalMenus } from './terminal-frontend-contribution.js';
+import debounce from 'p-debounce';
+import { MarkdownStringImpl } from '@theia/core/lib/common/markdown-rendering/markdown-string';
+import { MarkdownRendererFactory } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
+import { RemoteConnectionProvider } from '@theia/core/lib/browser/messaging/service-connection-provider';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
+import { cleanTerminalTitle, guessShellTypeFromExecutable } from '../common/shell-type.js';
+import { TerminalCommandHistoryStateFactory } from './terminal-command-history.js';
+export const TERMINAL_WIDGET_FACTORY_ID = 'terminal';
 let terminalCreationCounter = 0;
 /**
  * Produce a token suitable for {@link TerminalWidgetFactoryOptions.created}
@@ -60,10 +57,10 @@ let terminalCreationCounter = 0;
  * accidentally collide even when constructing terminals within the same
  * millisecond.
  */
-function nextTerminalCreationToken() {
+export function nextTerminalCreationToken() {
     return `${Date.now()}-${terminalCreationCounter++}`;
 }
-exports.TerminalContribution = Symbol('TerminalContribution');
+export const TerminalContribution = Symbol('TerminalContribution');
 class TerminalBufferImpl {
     constructor(term) {
         this.term = term;
@@ -89,40 +86,40 @@ class TerminalBufferImpl {
         return result;
     }
 }
-let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.TerminalWidget {
+let TerminalWidgetImpl = class TerminalWidgetImpl extends TerminalWidget {
     constructor() {
         super(...arguments);
         this.isExtractable = true;
         this.terminalKind = 'user';
         this._terminalId = -1;
-        this.onTermDidClose = new core_1.Emitter();
+        this.onTermDidClose = new Emitter();
         this.restored = false;
         this.closeOnDispose = true;
         this.isAttachedCloseListener = false;
         this.shown = false;
-        this.lastCwd = new uri_1.default();
+        this.lastCwd = new URI();
         this.hasUserTitle = false;
-        this.onDidOpenEmitter = new core_1.Emitter();
+        this.onDidOpenEmitter = new Emitter();
         this.onDidOpen = this.onDidOpenEmitter.event;
-        this.onDidOpenFailureEmitter = new core_1.Emitter();
+        this.onDidOpenFailureEmitter = new Emitter();
         this.onDidOpenFailure = this.onDidOpenFailureEmitter.event;
-        this.onSizeChangedEmitter = new core_1.Emitter();
+        this.onSizeChangedEmitter = new Emitter();
         this.onSizeChanged = this.onSizeChangedEmitter.event;
-        this.onDataEmitter = new core_1.Emitter();
+        this.onDataEmitter = new Emitter();
         this.onData = this.onDataEmitter.event;
-        this.onOutputEmitter = new core_1.Emitter();
+        this.onOutputEmitter = new Emitter();
         this.onOutput = this.onOutputEmitter.event;
-        this.onKeyEmitter = new core_1.Emitter();
+        this.onKeyEmitter = new Emitter();
         this.onKey = this.onKeyEmitter.event;
-        this.onMouseEnterLinkHoverEmitter = new core_1.Emitter();
+        this.onMouseEnterLinkHoverEmitter = new Emitter();
         this.onMouseEnterLinkHover = this.onMouseEnterLinkHoverEmitter.event;
-        this.onMouseLeaveLinkHoverEmitter = new core_1.Emitter();
+        this.onMouseLeaveLinkHoverEmitter = new Emitter();
         this.onMouseLeaveLinkHover = this.onMouseLeaveLinkHoverEmitter.event;
-        this.onShellTypeChangedEmiter = new core_1.Emitter();
+        this.onShellTypeChangedEmiter = new Emitter();
         this.onShellTypeChanged = this.onShellTypeChangedEmiter.event;
-        this.toDisposeOnConnect = new core_1.DisposableCollection();
-        this.commandSeparatorDecorations = new core_1.DisposableCollection();
-        this.toDisposeOnCommandHistory = new core_1.DisposableCollection();
+        this.toDisposeOnConnect = new DisposableCollection();
+        this.commandSeparatorDecorations = new DisposableCollection();
+        this.toDisposeOnCommandHistory = new DisposableCollection();
         this.connectionClosed = false;
         this.waitingForConnectionCloseToDispose = false;
         this.needsResize = true;
@@ -134,7 +131,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this.resizeTerminal = debounce(() => this.doResizeTerminal(), 50);
     }
     static { TerminalWidgetImpl_1 = this; }
-    static { this.LABEL = nls_1.nls.localizeByDefault('Terminal'); }
+    static { this.LABEL = nls.localizeByDefault('Terminal'); }
     get markdownRenderer() {
         this._markdownRenderer ||= this.markdownRendererFactory();
         return this._markdownRenderer;
@@ -162,12 +159,12 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
             this.terminalKind = this.options.kind;
         }
         if (this.options.destroyTermOnClose === true) {
-            this.toDispose.push(core_1.Disposable.create(() => this.term.dispose()));
+            this.toDispose.push(Disposable.create(() => this.term.dispose()));
         }
-        this.location = this.options.location || terminal_widget_1.TerminalLocation.Panel;
+        this.location = this.options.location || TerminalLocation.Panel;
         this.title.closable = true;
         this.addClass('terminal-container');
-        this.term = new xterm_1.Terminal({
+        this.term = new xterm.Terminal({
             cursorBlink: this.preferences['terminal.integrated.cursorBlinking'],
             cursorStyle: this.preferences['terminal.integrated.cursorStyle'] === 'line' ? 'bar' : this.preferences['terminal.integrated.cursorStyle'],
             cursorWidth: this.preferences['terminal.integrated.cursorWidth'],
@@ -186,9 +183,9 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         });
         this._buffer = new TerminalBufferImpl(this.term);
         this._currentTerminalOutput = [];
-        this.fitAddon = new xterm_addon_fit_1.FitAddon();
+        this.fitAddon = new FitAddon();
         this.term.loadAddon(this.fitAddon);
-        this.webglAddon = new xterm_addon_webgl_1.WebglAddon();
+        this.webglAddon = new WebglAddon();
         this.term.loadAddon(this.webglAddon);
         this.initializeLinkHover();
         this.toDispose.push(this.preferences.onPreferenceChanged(change => {
@@ -208,10 +205,10 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this.attachCustomKeyEventHandler();
         const titleChangeListenerDispose = this.term.onTitleChange((title) => {
             if (this.options.useServerTitle && !this.hasUserTitle) {
-                const cleaned = (0, shell_type_1.cleanTerminalTitle)(title);
+                const cleaned = cleanTerminalTitle(title);
                 if (cleaned) {
                     // If the command is a known shell, update the tracked shell name
-                    const shellType = (0, shell_type_1.guessShellTypeFromExecutable)(cleaned);
+                    const shellType = guessShellTypeFromExecutable(cleaned);
                     if (shellType) {
                         this._shellName = shellType;
                     }
@@ -228,7 +225,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this.toDispose.push(titleChangeListenerDispose);
         this.toDispose.push(this.terminalWatcher.onTerminalError(({ terminalId, error, attached }) => {
             if (terminalId === this.terminalId) {
-                this.exitStatus = { code: undefined, reason: base_terminal_protocol_1.TerminalExitReason.Process };
+                this.exitStatus = { code: undefined, reason: TerminalExitReason.Process };
                 this.logger.error(`The terminal process terminated. Cause: ${error}`);
                 if (!attached) {
                     this.dispose();
@@ -241,7 +238,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
                     this.exitStatus = { code, reason };
                 }
                 else {
-                    this.exitStatus = { code, reason: base_terminal_protocol_1.TerminalExitReason.Process };
+                    this.exitStatus = { code, reason: TerminalExitReason.Process };
                 }
                 if (!attached) {
                     this.deferredFinalizeCommandHistory();
@@ -284,7 +281,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         const contextMenuListener = (event) => {
             event.preventDefault();
             event.stopPropagation();
-            this.contextMenuRenderer.render({ menuPath: terminal_frontend_contribution_1.TerminalMenus.TERMINAL_CONTEXT_MENU, anchor: event, context: this.node });
+            this.contextMenuRenderer.render({ menuPath: TerminalMenus.TERMINAL_CONTEXT_MENU, anchor: event, context: this.node });
         };
         this.node.addEventListener('contextmenu', contextMenuListener);
         this.onDispose(() => this.node.removeEventListener('contextmenu', contextMenuListener));
@@ -481,8 +478,8 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
                 const iconClasses = [];
                 iconClasses.push(iconClass.id);
                 if (iconClass.color) {
-                    this.styleElement = browser_1.DecorationStyle.createStyleElement(`${this.terminalId}-terminal-style`);
-                    const classId = 'terminal-icon-' + (0, core_1.generateUuid)().replace(/-/g, '');
+                    this.styleElement = DecorationStyle.createStyleElement(`${this.terminalId}-terminal-style`);
+                    const classId = 'terminal-icon-' + generateUuid().replace(/-/g, '');
                     const color = this.colorRegistry.getCurrentColor(iconClass.color.id);
                     this.styleElement.textContent = `
                         .${classId}::before {
@@ -529,15 +526,15 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this.linkHoverButton.textContent = this.linkHoverMessage();
         this.linkHoverButton.style.cursor = 'pointer';
         this.linkHover.appendChild(this.linkHoverButton);
-        const cmdCtrl = common_1.isOSX ? 'cmd' : 'ctrl';
-        const cmdHint = document.createTextNode(` (${nls_1.nls.localizeByDefault(`${cmdCtrl} + click`)})`);
+        const cmdCtrl = isOSX ? 'cmd' : 'ctrl';
+        const cmdHint = document.createTextNode(` (${nls.localizeByDefault(`${cmdCtrl} + click`)})`);
         this.linkHover.appendChild(cmdHint);
         const onMouseEnter = (mouseEvent) => this.onMouseEnterLinkHoverEmitter.fire(mouseEvent);
         this.linkHover.addEventListener('mouseenter', onMouseEnter);
-        this.toDispose.push(core_1.Disposable.create(() => this.linkHover.removeEventListener('mouseenter', onMouseEnter)));
+        this.toDispose.push(Disposable.create(() => this.linkHover.removeEventListener('mouseenter', onMouseEnter)));
         const onMouseLeave = (mouseEvent) => this.onMouseLeaveLinkHoverEmitter.fire(mouseEvent);
         this.linkHover.addEventListener('mouseleave', onMouseLeave);
-        this.toDispose.push(core_1.Disposable.create(() => this.linkHover.removeEventListener('mouseleave', onMouseLeave)));
+        this.toDispose.push(Disposable.create(() => this.linkHover.removeEventListener('mouseleave', onMouseLeave)));
         this.node.appendChild(this.linkHover);
     }
     showLinkHover(invokeAction, x, y, message) {
@@ -550,7 +547,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this.linkHover.style.left = `${mouseX - 60}px`;
     }
     linkHoverMessage(message) {
-        return message ?? nls_1.nls.localizeByDefault('Follow link');
+        return message ?? nls.localizeByDefault('Follow link');
     }
     hideLinkHover() {
         this.linkHover.style.display = 'none';
@@ -564,7 +561,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         return this.searchBox;
     }
     onCloseRequest(msg) {
-        this.exitStatus = { code: undefined, reason: base_terminal_protocol_1.TerminalExitReason.User };
+        this.exitStatus = { code: undefined, reason: TerminalExitReason.User };
         super.onCloseRequest(msg);
     }
     get dimensions() {
@@ -574,32 +571,32 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         };
     }
     get cwd() {
-        if (!base_terminal_protocol_1.IBaseTerminalServer.validateId(this.terminalId)) {
+        if (!IBaseTerminalServer.validateId(this.terminalId)) {
             return Promise.reject(new Error('terminal is not started'));
         }
         if (this.terminalService.getById(this.id)) {
             return this.shellTerminalServer.getCwdURI(this.terminalId)
                 .then(cwdUrl => {
-                this.lastCwd = new uri_1.default(cwdUrl);
+                this.lastCwd = new URI(cwdUrl);
                 return this.lastCwd;
             }).catch(() => this.lastCwd);
         }
-        return Promise.resolve(new uri_1.default());
+        return Promise.resolve(new URI());
     }
     get processId() {
-        if (!base_terminal_protocol_1.IBaseTerminalServer.validateId(this.terminalId)) {
+        if (!IBaseTerminalServer.validateId(this.terminalId)) {
             return Promise.reject(new Error('terminal is not started'));
         }
         return this.shellTerminalServer.getProcessId(this.terminalId);
     }
     get processInfo() {
-        if (!base_terminal_protocol_1.IBaseTerminalServer.validateId(this.terminalId)) {
+        if (!IBaseTerminalServer.validateId(this.terminalId)) {
             return Promise.reject(new Error('terminal is not started'));
         }
         return this.shellTerminalServer.getProcessInfo(this.terminalId);
     }
     get envVarCollectionDescriptionsByExtension() {
-        if (!base_terminal_protocol_1.IBaseTerminalServer.validateId(this.terminalId)) {
+        if (!IBaseTerminalServer.validateId(this.terminalId)) {
             return Promise.reject(new Error('terminal is not started'));
         }
         return this.shellTerminalServer.getEnvVarCollectionDescriptionsByExtension(this.terminalId);
@@ -621,7 +618,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         return !this.preferences['terminal.integrated.enablePersistentSessions'] || !!this.options.isTransient;
     }
     onDispose(onDispose) {
-        this.toDispose.push(core_1.Disposable.create(onDispose));
+        this.toDispose.push(Disposable.create(onDispose));
     }
     clearOutput() {
         this.term.clear();
@@ -673,7 +670,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this._terminalId = typeof id !== 'number' ? await this.createTerminal() : await this.attachTerminal(id);
         this.resizeTerminalProcess();
         this.connectTerminalProcess();
-        if (base_terminal_protocol_1.IBaseTerminalServer.validateId(this.terminalId)) {
+        if (IBaseTerminalServer.validateId(this.terminalId)) {
             this.onDidOpenEmitter.fire(undefined);
             await this.shellTerminalServer.onAttachAttempted(this._terminalId);
             return this.terminalId;
@@ -683,7 +680,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
     }
     async attachTerminal(id) {
         const terminalId = await this.shellTerminalServer.attach(id);
-        if (base_terminal_protocol_1.IBaseTerminalServer.validateId(terminalId)) {
+        if (IBaseTerminalServer.validateId(terminalId)) {
             // reset exit status if a new terminal process is attached
             this.exitStatus = undefined;
             return terminalId;
@@ -704,8 +701,8 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         }
         const { cols, rows } = this.term;
         const terminalId = await this.shellTerminalServer.create({
-            shell: this.options.shellPath || this.shellPreferences.shell[core_1.OS.backend.type()],
-            args: this.options.shellArgs || this.shellPreferences.shellArgs[core_1.OS.backend.type()],
+            shell: this.options.shellPath || this.shellPreferences.shell[OS.backend.type()],
+            args: this.options.shellArgs || this.shellPreferences.shellArgs[OS.backend.type()],
             env: this.options.env,
             strictEnv: this.options.strictEnv,
             isPseudo: this.options.isPseudoTerminal,
@@ -714,9 +711,9 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
             rows,
             enableShellIntegration: this.preferences['terminal.integrated.enableCommandHistory'] ?? false,
         });
-        if (base_terminal_protocol_1.IBaseTerminalServer.validateId(terminalId)) {
+        if (IBaseTerminalServer.validateId(terminalId)) {
             const processInfo = await this.shellTerminalServer.getProcessInfo(terminalId);
-            const shellType = (0, shell_type_1.guessShellTypeFromExecutable)(processInfo.executable);
+            const shellType = guessShellTypeFromExecutable(processInfo.executable);
             if (shellType) {
                 this._shellName = shellType;
                 this.onShellTypeChangedEmiter.fire(shellType);
@@ -741,7 +738,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
     }
     onFitRequest(msg) {
         super.onFitRequest(msg);
-        browser_1.MessageLoop.sendMessage(this, browser_1.Widget.ResizeMessage.UnknownSize);
+        MessageLoop.sendMessage(this, Widget.ResizeMessage.UnknownSize);
     }
     onActivateRequest(msg) {
         super.onActivateRequest(msg);
@@ -753,12 +750,12 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this.shown = true;
     }
     onAfterAttach(msg) {
-        browser_1.Widget.attach(this.searchBox, this.node);
+        Widget.attach(this.searchBox, this.node);
         super.onAfterAttach(msg);
         this.update();
     }
     onBeforeDetach(msg) {
-        browser_1.Widget.detach(this.searchBox);
+        Widget.detach(this.searchBox);
         super.onBeforeDetach(msg);
     }
     onResize(msg) {
@@ -788,8 +785,8 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         this.toDispose.push(this.toDisposeOnConnect);
         this.connectionClosed = false;
         this.waitingForConnectionCloseToDispose = false;
-        const waitForConnection = this.waitForConnection = new promise_util_1.Deferred();
-        this.connectionProvider.listen(`${terminal_protocol_1.terminalsPath}/${this.terminalId}`, (_path, connection) => {
+        const waitForConnection = this.waitForConnection = new Deferred();
+        this.connectionProvider.listen(`${terminalsPath}/${this.terminalId}`, (_path, connection) => {
             connection.onMessage(e => {
                 this.write(e().readString());
             });
@@ -799,7 +796,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
                     connection.getWriteBuffer().writeString(data).commit();
                 }
             };
-            const disposable = new core_1.DisposableCollection();
+            const disposable = new DisposableCollection();
             disposable.push(this.term.onData(sendData));
             disposable.push(this.term.onBinary(sendData));
             connection.onClose(() => {
@@ -830,12 +827,12 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         // Workaround for https://github.com/xtermjs/xterm.js/issues/4775. Can be removed for releases > 5.3.0
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const viewPort = this.term._core.viewport;
-        viewPort.register(core_1.Disposable.create(() => {
+        viewPort.register(Disposable.create(() => {
             if (typeof viewPort._refreshAnimationFrame === 'number') {
                 viewPort._coreBrowserService.window.cancelAnimationFrame(viewPort._refreshAnimationFrame);
             }
         }));
-        if (browser_1.isFirefox) {
+        if (isFirefox) {
             // monkey patching intersection observer handling for secondary window support
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const renderService = this.term._core._renderService;
@@ -881,7 +878,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         }
     }
     async executeCommand(commandOptions) {
-        this.sendText(this.shellCommandBuilder.buildCommand(await this.processInfo, commandOptions) + core_1.OS.backend.EOL);
+        this.sendText(this.shellCommandBuilder.buildCommand(await this.processInfo, commandOptions) + OS.backend.EOL);
         this.resetCommandOutputMarker();
         if (this._commandHistoryState) {
             this._commandHistoryState.clearCommandCollectionState();
@@ -921,7 +918,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
             // a refresh for example won't close it.
             this.shellTerminalServer.close(this.terminalId);
             // Exit status is set when terminal is closed by user or by process, so most likely an extension closed it.
-            this.exitStatus = { code: undefined, reason: base_terminal_protocol_1.TerminalExitReason.Extension };
+            this.exitStatus = { code: undefined, reason: TerminalExitReason.Extension };
         }
         if (this.exitStatus) {
             this.onTermDidClose.fire(this);
@@ -951,7 +948,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         if (this.options.isPseudoTerminal) {
             return;
         }
-        if (!base_terminal_protocol_1.IBaseTerminalServer.validateId(this.terminalId)
+        if (!IBaseTerminalServer.validateId(this.terminalId)
             || this.exitStatus
             || !this.terminalService.getById(this.id)) {
             return;
@@ -980,9 +977,9 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         };
     }
     customKeyHandler(event) {
-        const keyBindings = browser_1.KeyCode.createKeyCode(event).toString();
-        const ctrlCmdCopy = (common_1.isOSX && keyBindings === 'meta+c') || (!common_1.isOSX && keyBindings === 'ctrl+c');
-        const ctrlCmdPaste = (common_1.isOSX && keyBindings === 'meta+v') || (!common_1.isOSX && keyBindings === 'ctrl+v');
+        const keyBindings = KeyCode.createKeyCode(event).toString();
+        const ctrlCmdCopy = (isOSX && keyBindings === 'meta+c') || (!isOSX && keyBindings === 'ctrl+c');
+        const ctrlCmdPaste = (isOSX && keyBindings === 'meta+v') || (!isOSX && keyBindings === 'ctrl+v');
         if (ctrlCmdCopy && this.enableCopy && this.term.hasSelection()) {
             return false;
         }
@@ -1025,7 +1022,7 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
     attachPressEnterKeyToCloseListener(term) {
         if (term.textarea) {
             this.isAttachedCloseListener = true;
-            this.addKeyListener(term.textarea, keys_1.Key.ENTER, (event) => {
+            this.addKeyListener(term.textarea, Key.ENTER, (event) => {
                 this.dispose();
                 this.isAttachedCloseListener = false;
             });
@@ -1044,13 +1041,13 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
             const extensions = values[0];
             const processId = values[1];
             const processInfo = values[2];
-            const markdown = new markdown_string_1.MarkdownStringImpl();
-            markdown.appendMarkdown(nls_1.nls.localizeByDefault('Process ID ({0}): {1}', 'PID', processId) + '\\\n');
-            markdown.appendMarkdown(nls_1.nls.localizeByDefault('Command line: {0}', processInfo.executable +
+            const markdown = new MarkdownStringImpl();
+            markdown.appendMarkdown(nls.localizeByDefault('Process ID ({0}): {1}', 'PID', processId) + '\\\n');
+            markdown.appendMarkdown(nls.localizeByDefault('Command line: {0}', processInfo.executable +
                 ' ' +
                 processInfo.arguments.join(' ') +
                 '\n\n---\n\n'));
-            markdown.appendMarkdown(nls_1.nls.localizeByDefault("The following extensions have contributed to this terminal's environment:") + '\n');
+            markdown.appendMarkdown(nls.localizeByDefault("The following extensions have contributed to this terminal's environment:") + '\n');
             extensions.forEach((arr, key) => {
                 arr.forEach(value => {
                     if (value === undefined) {
@@ -1074,92 +1071,70 @@ let TerminalWidgetImpl = class TerminalWidgetImpl extends terminal_widget_1.Term
         return this.enhancedPreviewNode;
     }
 };
-exports.TerminalWidgetImpl = TerminalWidgetImpl;
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_2.WorkspaceService),
-    tslib_1.__metadata("design:type", browser_2.WorkspaceService)
+__decorate([
+    inject(WorkspaceService)
 ], TerminalWidgetImpl.prototype, "workspaceService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(service_connection_provider_1.RemoteConnectionProvider),
-    tslib_1.__metadata("design:type", service_connection_provider_1.ServiceConnectionProvider)
+__decorate([
+    inject(RemoteConnectionProvider)
 ], TerminalWidgetImpl.prototype, "connectionProvider", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_widget_1.TerminalWidgetOptions),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(TerminalWidgetOptions)
 ], TerminalWidgetImpl.prototype, "options", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(shell_terminal_protocol_1.ShellTerminalServerProxy),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ShellTerminalServerProxy)
 ], TerminalWidgetImpl.prototype, "shellTerminalServer", 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)
 ], TerminalWidgetImpl.prototype, "terminalWatcher", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(core_1.ILogger),
-    (0, inversify_1.named)('terminal:TerminalWidgetImpl'),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ILogger),
+    named('terminal:TerminalWidgetImpl')
 ], TerminalWidgetImpl.prototype, "logger", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)('terminal-dom-id'),
-    tslib_1.__metadata("design:type", String)
+__decorate([
+    inject('terminal-dom-id')
 ], TerminalWidgetImpl.prototype, "_terminalDOMId", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_preferences_1.TerminalPreferences),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(TerminalPreferences)
 ], TerminalWidgetImpl.prototype, "preferences", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(core_1.ContributionProvider),
-    (0, inversify_1.named)(exports.TerminalContribution),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ContributionProvider),
+    named(TerminalContribution)
 ], TerminalWidgetImpl.prototype, "terminalContributionProvider", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_service_1.TerminalService),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(TerminalService)
 ], TerminalWidgetImpl.prototype, "terminalService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_search_widget_1.TerminalSearchWidgetFactory),
-    tslib_1.__metadata("design:type", Function)
+__decorate([
+    inject(TerminalSearchWidgetFactory)
 ], TerminalWidgetImpl.prototype, "terminalSearchBoxFactory", 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)
 ], TerminalWidgetImpl.prototype, "copyOnSelectionHandler", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_theme_service_1.TerminalThemeService),
-    tslib_1.__metadata("design:type", terminal_theme_service_1.TerminalThemeService)
+__decorate([
+    inject(TerminalThemeService)
 ], TerminalWidgetImpl.prototype, "themeService", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(color_registry_1.ColorRegistry),
-    tslib_1.__metadata("design:type", color_registry_1.ColorRegistry)
+__decorate([
+    inject(ColorRegistry)
 ], TerminalWidgetImpl.prototype, "colorRegistry", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(shell_command_builder_1.ShellCommandBuilder),
-    tslib_1.__metadata("design:type", shell_command_builder_1.ShellCommandBuilder)
+__decorate([
+    inject(ShellCommandBuilder)
 ], TerminalWidgetImpl.prototype, "shellCommandBuilder", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(browser_1.ContextMenuRenderer),
-    tslib_1.__metadata("design:type", browser_1.ContextMenuRenderer)
+__decorate([
+    inject(ContextMenuRenderer)
 ], TerminalWidgetImpl.prototype, "contextMenuRenderer", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(markdown_renderer_1.MarkdownRendererFactory),
-    tslib_1.__metadata("design:type", Function)
+__decorate([
+    inject(MarkdownRendererFactory)
 ], TerminalWidgetImpl.prototype, "markdownRendererFactory", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(terminal_command_history_1.TerminalCommandHistoryStateFactory),
-    tslib_1.__metadata("design:type", Function)
+__decorate([
+    inject(TerminalCommandHistoryStateFactory)
 ], TerminalWidgetImpl.prototype, "commandHistoryStateFactory", void 0);
-tslib_1.__decorate([
-    (0, inversify_1.inject)(context_key_service_1.ContextKeyService),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    inject(ContextKeyService)
 ], TerminalWidgetImpl.prototype, "contextKeyService", 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()
 ], TerminalWidgetImpl.prototype, "init", null);
-exports.TerminalWidgetImpl = TerminalWidgetImpl = TerminalWidgetImpl_1 = tslib_1.__decorate([
-    (0, inversify_1.injectable)()
+TerminalWidgetImpl = TerminalWidgetImpl_1 = __decorate([
+    injectable()
 ], TerminalWidgetImpl);
+export { TerminalWidgetImpl };
 //# sourceMappingURL=terminal-widget-impl.js.map