@codingame/monaco-vscode-xterm-common 32.0.1 → 33.0.9

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.js

@@ -774,13 +774,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
         xtermConstructor = Promises.withAsyncBody(async resolve => {
             const Terminal = (await import('@xterm/xterm')).Terminal;
-            Terminal.strings.promptLabel = ( localize(13869, "Terminal input"));
+            Terminal.strings.promptLabel = ( localize(13999, "Terminal input"));
             Terminal.strings.tooMuchOutput = keybinding ? ( localize(
-                13870,
+                14000,
                 "Use the accessible buffer {0} to manually review output",
                 keybinding.getLabel()
             )) : ( localize(
-                13871,
+                14001,
                 "Use the Terminal: Focus Accessible Buffer command to manually review output"
             ));
             resolve(Terminal);
@@ -842,7 +842,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                         id: TerminalStatus.Bell,
                         severity: Severity.Warning,
                         icon: Codicon.bell,
-                        tooltip: ( localize(13872, "Bell"))
+                        tooltip: ( localize(14002, "Bell"))
                     }, this._terminalConfigurationService.config.bellDuration);
                 }
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalBell);
@@ -920,7 +920,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (!instance.xterm) {
             return;
         }
-        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(13873, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(13874, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(13875, "Injection failed to activate")) : ( localize(13876, "No")));
+        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(14003, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(14004, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(14005, "Injection failed to activate")) : ( localize(14006, "No")));
         const detailedAdditions = [];
         if (instance.shellType) {
             detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
@@ -945,8 +945,8 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         instance.statusList.add({
             id: TerminalStatus.ShellIntegrationInfo,
             severity: Severity.Info,
-            tooltip: `${( localize(13877, "Shell integration"))}: ${cmdDetectionType}`,
-            detailedTooltip: `${( localize(13877, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
+            tooltip: `${( localize(14007, "Shell integration"))}: ${cmdDetectionType}`,
+            detailedTooltip: `${( localize(14007, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
         });
     }
     async runCommand(
@@ -1185,16 +1185,6 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             this._horizontalScrollbar.dispose();
             this._horizontalScrollbar = undefined;
         }
-        try {
-            this.xterm?.dispose();
-        } catch (err) {
-            this._logService.error("Exception occurred during xterm disposal", err);
-        }
-        if (isFirefox) {
-            this.resetFocusContextKey();
-            this._terminalHasTextContextKey.reset();
-            this._onDidBlur.fire(this);
-        }
         if (this._pressAnyKeyToCloseListener) {
             this._pressAnyKeyToCloseListener.dispose();
             this._pressAnyKeyToCloseListener = undefined;
@@ -1205,6 +1195,16 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._processManager.dispose();
         this._onProcessExit(undefined);
         this._onDisposed.fire(this);
+        try {
+            this.xterm?.dispose();
+        } catch (err) {
+            this._logService.error("Exception occurred during xterm disposal", err);
+        }
+        if (isFirefox) {
+            this.resetFocusContextKey();
+            this._terminalHasTextContextKey.reset();
+            this._onDidBlur.fire(this);
+        }
         super.dispose();
     }
     async detachProcessAndDispose(reason) {
@@ -1415,7 +1415,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 id: TerminalStatus.Disconnected,
                 severity: Severity.Error,
                 icon: Codicon.debugDisconnect,
-                tooltip: ( localize(13878, "Lost connection to process"))
+                tooltip: ( localize(14008, "Lost connection to process"))
             });
         }));
         this._register(processManager.onPtyReconnect(() => {
@@ -1431,14 +1431,15 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return;
         }
         const trusted = await this._trust();
-        if (!trusted && !this.remoteAuthority && !this._workbenchEnvironmentService.remoteAuthority) {
+        const isRemoteTerminal = !!this.remoteAuthority;
+        if (!trusted && !(isRemoteTerminal && this._workbenchEnvironmentService.remoteAuthority)) {
             this._onProcessExit({
-                message: ( localize(13879, "Cannot launch a terminal process in an untrusted workspace"))
+                message: ( localize(14009, "Cannot launch a terminal process in an untrusted workspace"))
             });
         } else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && normalizeDriveLetter(this._cwd) !== normalizeDriveLetter(this._userHome)) {
             this._onProcessExit({
                 message: ( localize(
-                    13880,
+                    14010,
                     "Cannot launch a terminal process in an empty workspace with cwd {0} different from userHome {1}",
                     this._cwd,
                     this._userHome
@@ -1524,7 +1525,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         });
     }
     async _onProcessExit(exitCodeOrError) {
-        if (this._isExiting) {
+        if (this._isExiting || this.isDisposed) {
             return;
         }
         const parsedExitResult = parseExitResult(
@@ -1608,10 +1609,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             id: TerminalStatus.ShellIntegrationAttentionNeeded,
             severity: Severity.Warning,
             icon: Codicon.warning,
-            tooltip: `${exitMessage} ` + ( localize(13881, "Disabling shell integration in user settings might help.")),
+            tooltip: `${exitMessage} ` + ( localize(14011, "Disabling shell integration in user settings might help.")),
             hoverActions: [{
                 commandId: TerminalCommandId.ShellIntegrationLearnMore,
-                label: ( localize(13882, "Learn more about shell integration")),
+                label: ( localize(14012, "Learn more about shell integration")),
                 run: () => {
                     this._openerService.open(
                         "https://code.visualstudio.com/docs/editor/integrated-terminal#_shell-integration"
@@ -1619,7 +1620,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 }
             }, {
                 commandId: "workbench.action.openSettings",
-                label: ( localize(13883, "Open user settings")),
+                label: ( localize(14013, "Open user settings")),
                 run: () => {
                     this._commandService.executeCommand(
                         "workbench.action.openSettings",
@@ -1753,7 +1754,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return true;
         }
         const trustRequest = await this._workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(13884, "Creating a terminal process requires executing code"))
+            message: ( localize(14014, "Creating a terminal process requires executing code"))
         });
         return trustRequest === true;
     }
@@ -1881,21 +1882,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const labelParts = [];
         if (xterm && xterm.textarea) {
             if (title && title.length > 0) {
-                labelParts.push(( localize(13885, "Terminal {0}, {1}", terminalId, title)));
+                labelParts.push(( localize(14015, "Terminal {0}, {1}", terminalId, title)));
             } else {
-                labelParts.push(( localize(13886, "Terminal {0}", terminalId)));
+                labelParts.push(( localize(14016, "Terminal {0}", terminalId)));
             }
             const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
             if (!screenReaderOptimized) {
                 labelParts.push(( localize(
-                    13887,
+                    14017,
                     "Run the command: Toggle Screen Reader Accessibility Mode for an optimized screen reader experience"
                 )));
             }
             const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
             if (this._configurationService.getValue(AccessibilityVerbositySettingId.Terminal) && accessibilityHelpKeybinding) {
                 labelParts.push(( localize(
-                    13888,
+                    14018,
                     "Use {0} for terminal accessibility help",
                     accessibilityHelpKeybinding
                 )));
@@ -1949,7 +1950,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async setFixedDimensions() {
         const cols = await this._quickInputService.input({
-            title: ( localize(13889, "Set Fixed Dimensions: Column")),
+            title: ( localize(14019, "Set Fixed Dimensions: Column")),
             placeHolder: "Enter a number of columns or leave empty for automatic width",
             validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
                 content: "Enter a number or leave empty size automatically",
@@ -1963,7 +1964,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._labelComputer?.refreshLabel(this);
         this._terminalHasFixedWidth.set(!!this._fixedCols);
         const rows = await this._quickInputService.input({
-            title: ( localize(13890, "Set Fixed Dimensions: Row")),
+            title: ( localize(14020, "Set Fixed Dimensions: Row")),
             placeHolder: "Enter a number of rows or leave empty for automatic height",
             validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
                 content: "Enter a number or leave empty size automatically",
@@ -2073,7 +2074,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     _onEnvironmentVariableInfoChanged(info) {
         if (info.requiresAction) {
             this.xterm?.raw.textarea?.setAttribute("aria-label", ( localize(
-                13891,
+                14021,
                 "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
                 this._instanceId
             )));
@@ -2229,7 +2230,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         disposables.push(quickPick);
         quickPick.items = items;
         quickPick.matchOnDescription = true;
-        quickPick.placeholder = ( localize(13892, "Select a color for the terminal"));
+        quickPick.placeholder = ( localize(14022, "Select a color for the terminal"));
         quickPick.show();
         const result = await ( new Promise(r => {
             disposables.push(quickPick.onDidHide(() => r(undefined)));
@@ -2566,24 +2567,24 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
             if (processState === ProcessState.KilledDuringLaunch) {
                 if (commandLine) {
                     message = ( localize(
-                        13893,
+                        14023,
                         "The terminal process \"{0}\" failed to launch (exit code: {1}).",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13894, "The terminal process failed to launch (exit code: {0}).", code));
+                    message = ( localize(14024, "The terminal process failed to launch (exit code: {0}).", code));
                 }
             } else {
                 if (commandLine) {
                     message = ( localize(
-                        13895,
+                        14025,
                         "The terminal process \"{0}\" terminated with exit code: {1}.",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13896, "The terminal process terminated with exit code: {0}.", code));
+                    message = ( localize(14026, "The terminal process terminated with exit code: {0}.", code));
                 }
             }
             break;
@@ -2609,7 +2610,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
                     break;
                 }
             }
-            message = ( localize(13897, "The terminal process failed to launch: {0}.", innerMessage));
+            message = ( localize(14027, "The terminal process failed to launch: {0}.", innerMessage));
             break;
         }
     }

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.js

@@ -202,7 +202,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         } catch (e) {
             this._notificationService.notify({
                 message: ( localize(
-                    13928,
+                    14058,
                     "Could not kill process listening on port {0}, command exited with error {1}",
                     port,
                     e
@@ -538,7 +538,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
                     this._onExit(-1);
                 } else {
                     const message = ( localize(
-                        13929,
+                        14059,
                         "Restarting the terminal because the connection to the shell process was lost..."
                     ));
                     let postRestartMessage = "";

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTabsList.js

@@ -435,7 +435,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                     };
                 }
             },
-            ariaLabel: ( localize(13956, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
+            ariaLabel: ( localize(14086, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
             inputBoxStyles: defaultInputBoxStyles
         }));
         inputBox.element.style.height = "22px";
@@ -566,7 +566,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
         this._terminalGroupService = _terminalGroupService;
     }
     getWidgetAriaLabel() {
-        return localize(13957, "Terminal tabs");
+        return localize(14087, "Terminal tabs");
     }
     getAriaLabel(instance) {
         let ariaLabel = "";
@@ -574,7 +574,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
         if (tab && tab.terminalInstances?.length > 1) {
             const terminalIndex = tab.terminalInstances.indexOf(instance);
             ariaLabel = ( localize(
-                13958,
+                14088,
                 "Terminal {0} {1}, split {2} of {3}",
                 instance.instanceId,
                 instance.title,
@@ -582,7 +582,7 @@ let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider
                 tab.terminalInstances.length
             ));
         } else {
-            ariaLabel = ( localize(13959, "Terminal {0} {1}", instance.instanceId, instance.title));
+            ariaLabel = ( localize(14089, "Terminal {0} {1}", instance.instanceId, instance.title));
         }
         return ariaLabel;
     }
@@ -770,7 +770,7 @@ let TabDecorationsProvider = class TabDecorationsProvider extends Disposable {
     constructor(_terminalService) {
         super();
         this._terminalService = _terminalService;
-        this.label = ( localize(13960, "Terminal"));
+        this.label = ( localize(14090, "Terminal"));
         this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._register(

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTooltip.js

@@ -29,7 +29,7 @@ function getInstanceHoverInfo(instance, storageService) {
     }
     actions.push({
         commandId: "toggleDetailedInfo",
-        label: showDetailed ? ( localize(13961, "Hide Details")) : ( localize(13962, "Show Details")),
+        label: showDetailed ? ( localize(14091, "Hide Details")) : ( localize(14092, "Show Details")),
         run() {
             storageService.store(
                 TerminalStorageKeys.TabsShowDetailed,
@@ -51,7 +51,7 @@ function getInstanceHoverInfo(instance, storageService) {
 function getShellProcessTooltip(instance, showDetailed) {
     const lines = [];
     if (instance.processId && instance.processId > 0) {
-        lines.push(( localize(13963, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
+        lines.push(( localize(14093, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
     }
     if (instance.shellLaunchConfig.executable) {
         let commandLine = "";
@@ -67,7 +67,7 @@ function getShellProcessTooltip(instance, showDetailed) {
         if (args) {
             commandLine += ` ${args}`;
         }
-        lines.push(( localize(13964, "Command line: {0}", commandLine)));
+        lines.push(( localize(14094, "Command line: {0}", commandLine)));
     }
     return lines.length ? `\n\n---\n\n${lines.join("\n")}` : "";
 }

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.js

@@ -3,7 +3,7 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { registerColor } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
 
 const terminalStickyScrollBackground = registerColor("terminalStickyScroll.background", null, ( localize(
-    14679,
+    14811,
     "The background color of the sticky scroll overlay in the terminal."
 )));
 const terminalStickyScrollHoverBackground = registerColor("terminalStickyScrollHover.background", {
@@ -12,7 +12,7 @@ const terminalStickyScrollHoverBackground = registerColor("terminalStickyScrollH
     hcDark: "#E48B39",
     hcLight: "#0f4a85"
 }, ( localize(
-    14680,
+    14812,
     "The background color of the sticky scroll overlay in the terminal when hovered."
 )));
 registerColor("terminalStickyScroll.border", {
@@ -20,6 +20,6 @@ registerColor("terminalStickyScroll.border", {
     light: null,
     hcDark: "#6fc3df",
     hcLight: "#0f4a85"
-}, ( localize(14681, "The border of the sticky scroll overlay in the terminal.")));
+}, ( localize(14813, "The border of the sticky scroll overlay in the terminal.")));
 
 export { terminalStickyScrollBackground, terminalStickyScrollHoverBackground };

package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.js

@@ -304,19 +304,19 @@ let TerminalStickyScrollOverlay = class TerminalStickyScrollOverlay extends Disp
         this._element = $(".terminal-sticky-scroll", undefined, hoverOverlay);
         this._xterm.raw.element.parentElement.append(this._element);
         this._register(toDisposable(() => this._element?.remove()));
-        let hoverTitle = ( localize(14682, "Navigate to Command"));
+        let hoverTitle = ( localize(14814, "Navigate to Command"));
         const scrollToPreviousCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToPreviousCommand);
         if (scrollToPreviousCommandKeybinding) {
             const label = scrollToPreviousCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(14683, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
+                hoverTitle += "\n" + ( localize(14815, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
             }
         }
         const scrollToNextCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToNextCommand);
         if (scrollToNextCommandKeybinding) {
             const label = scrollToNextCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(14683, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
+                hoverTitle += "\n" + ( localize(14815, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
             }
         }
         hoverOverlay.title = hoverTitle;