@codingame/monaco-vscode-xterm-common 31.0.1 → 32.0.0

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

@@ -80,7 +80,7 @@ import { getTerminalUri, getTerminalResourcesFromDragEvent } from '@codingame/mo
 import { TerminalWidgetManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/widgets/widgetManager';
 import { LineDataEventAddon } from './xterm/lineDataEventAddon.js';
 import { getXtermScaledDimensions, XtermTerminal } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
-import { ProcessState, TERMINAL_VIEW_ID, TerminalCommandId, DEFAULT_COMMANDS_TO_SKIP_SHELL } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal';
+import { ProcessState, TERMINAL_VIEW_ID, TerminalCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal';
 import { ITerminalProfileResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
 import { TERMINAL_BACKGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
 import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
@@ -453,7 +453,6 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._wrapperElement = createElement("div");
         this._wrapperElement.classList.add("terminal-wrapper");
         this._widgetManager = this._register(instantiationService.createInstance(TerminalWidgetManager));
-        this._skipTerminalCommands = [];
         this._isExiting = false;
         this._hadFocusOnExit = false;
         this._isVisible = false;
@@ -775,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(13555, "Terminal input"));
+            Terminal.strings.promptLabel = ( localize(13844, "Terminal input"));
             Terminal.strings.tooMuchOutput = keybinding ? ( localize(
-                13556,
+                13845,
                 "Use the accessible buffer {0} to manually review output",
                 keybinding.getLabel()
             )) : ( localize(
-                13557,
+                13846,
                 "Use the Terminal: Focus Accessible Buffer command to manually review output"
             ));
             resolve(Terminal);
@@ -804,12 +803,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }, this.onDidExecuteText);
         this.xterm = xterm;
         this._resizeDebouncer = this._register(( new TerminalResizeDebouncer(() => this._isVisible, () => xterm, async (cols, rows) => {
+            if (this.isDisposed) {
+                return;
+            }
             xterm.resize(cols, rows);
             await this._updatePtyDimensions(xterm.raw);
         }, async cols => {
+            if (this.isDisposed) {
+                return;
+            }
             xterm.resize(cols, xterm.raw.rows);
             await this._updatePtyDimensions(xterm.raw);
         }, async rows => {
+            if (this.isDisposed) {
+                return;
+            }
             xterm.resize(xterm.raw.cols, rows);
             await this._updatePtyDimensions(xterm.raw);
         })));
@@ -834,7 +842,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                         id: TerminalStatus.Bell,
                         severity: Severity.Warning,
                         icon: Codicon.bell,
-                        tooltip: ( localize(13558, "Bell"))
+                        tooltip: ( localize(13847, "Bell"))
                     }, this._terminalConfigurationService.config.bellDuration);
                 }
                 this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalBell);
@@ -912,7 +920,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (!instance.xterm) {
             return;
         }
-        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(13559, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(13560, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(13561, "Injection failed to activate")) : ( localize(13562, "No")));
+        const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(13848, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(13849, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(13850, "Injection failed to activate")) : ( localize(13851, "No")));
         const detailedAdditions = [];
         if (instance.shellType) {
             detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
@@ -937,8 +945,8 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         instance.statusList.add({
             id: TerminalStatus.ShellIntegrationInfo,
             severity: Severity.Info,
-            tooltip: `${( localize(13563, "Shell integration"))}: ${cmdDetectionType}`,
-            detailedTooltip: `${( localize(13563, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
+            tooltip: `${( localize(13852, "Shell integration"))}: ${cmdDetectionType}`,
+            detailedTooltip: `${( localize(13852, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
         });
     }
     async runCommand(
@@ -1056,7 +1064,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 event.preventDefault();
                 return false;
             }
-            if (!this._terminalConfigurationService.config.sendKeybindingsToShell && resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && (event.metaKey || ( this._skipTerminalCommands.some(k => k === resolveResult.commandId)))) {
+            if (!this._terminalConfigurationService.config.sendKeybindingsToShell && resolveResult.kind === ResultKind.KbFound && resolveResult.commandId && (event.metaKey || this._terminalConfigurationService.shouldCommandSkipShell(resolveResult.commandId))) {
                 event.preventDefault();
                 return false;
             }
@@ -1407,7 +1415,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 id: TerminalStatus.Disconnected,
                 severity: Severity.Error,
                 icon: Codicon.debugDisconnect,
-                tooltip: ( localize(13564, "Lost connection to process"))
+                tooltip: ( localize(13853, "Lost connection to process"))
             });
         }));
         this._register(processManager.onPtyReconnect(() => {
@@ -1425,12 +1433,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const trusted = await this._trust();
         if (!trusted && !this.remoteAuthority && !this._workbenchEnvironmentService.remoteAuthority) {
             this._onProcessExit({
-                message: ( localize(13565, "Cannot launch a terminal process in an untrusted workspace"))
+                message: ( localize(13854, "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(
-                    13566,
+                    13855,
                     "Cannot launch a terminal process in an empty workspace with cwd {0} different from userHome {1}",
                     this._cwd,
                     this._userHome
@@ -1543,6 +1551,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             "processState",
             this._processManager.processState
         );
+        this._onExit.fire(exitCodeOrError);
         const waitOnExit = this.waitOnExit;
         if (waitOnExit && this._processManager.processState !== ProcessState.KilledByUser) {
             this._xtermReadyPromise.then(xterm => {
@@ -1588,7 +1597,6 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             }
             this.dispose(TerminalExitReason.Process);
         }
-        this._onExit.fire(exitCodeOrError);
         if (this.isDisposed) {
             this._onExit.dispose();
         }
@@ -1600,10 +1608,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             id: TerminalStatus.ShellIntegrationAttentionNeeded,
             severity: Severity.Warning,
             icon: Codicon.warning,
-            tooltip: `${exitMessage} ` + ( localize(13567, "Disabling shell integration in user settings might help.")),
+            tooltip: `${exitMessage} ` + ( localize(13856, "Disabling shell integration in user settings might help.")),
             hoverActions: [{
                 commandId: TerminalCommandId.ShellIntegrationLearnMore,
-                label: ( localize(13568, "Learn more about shell integration")),
+                label: ( localize(13857, "Learn more about shell integration")),
                 run: () => {
                     this._openerService.open(
                         "https://code.visualstudio.com/docs/editor/integrated-terminal#_shell-integration"
@@ -1611,7 +1619,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 }
             }, {
                 commandId: "workbench.action.openSettings",
-                label: ( localize(13569, "Open user settings")),
+                label: ( localize(13858, "Open user settings")),
                 run: () => {
                     this._commandService.executeCommand(
                         "workbench.action.openSettings",
@@ -1745,7 +1753,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             return true;
         }
         const trustRequest = await this._workspaceTrustRequestService.requestWorkspaceTrust({
-            message: ( localize(13570, "Creating a terminal process requires executing code"))
+            message: ( localize(13859, "Creating a terminal process requires executing code"))
         });
         return trustRequest === true;
     }
@@ -1766,7 +1774,6 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
     }
     updateConfig() {
-        this._setCommandsToSkipShell(this._terminalConfigurationService.config.commandsToSkipShell);
         this._refreshEnvironmentVariableInfoWidgetState(this._processManager.environmentVariableInfo);
     }
     async _updateUnicodeVersion() {
@@ -1775,12 +1782,6 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     updateAccessibilitySupport() {
         this.xterm.raw.options.screenReaderMode = this._accessibilityService.isScreenReaderOptimized();
     }
-    _setCommandsToSkipShell(commands) {
-        const excludeCommands = ( commands.filter(command => command[0] === "-").map(command => command.slice(1)));
-        this._skipTerminalCommands = DEFAULT_COMMANDS_TO_SKIP_SHELL.filter(defaultCommand => {
-            return !excludeCommands.includes(defaultCommand);
-        }).concat(commands);
-    }
     layout(dimension) {
         this._lastLayoutDimensions = dimension;
         if (this.disableLayout) {
@@ -1848,6 +1849,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._resizeDebouncer.resize(cols, rows, immediate ?? false);
     }
     async _updatePtyDimensions(rawXterm) {
+        if (this.isDisposed) {
+            return;
+        }
         const pixelWidth = rawXterm.dimensions?.css.canvas.width;
         const pixelHeight = rawXterm.dimensions?.css.canvas.height;
         const roundedPixelWidth = pixelWidth ? Math.round(pixelWidth) : undefined;
@@ -1877,21 +1881,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         const labelParts = [];
         if (xterm && xterm.textarea) {
             if (title && title.length > 0) {
-                labelParts.push(( localize(13571, "Terminal {0}, {1}", terminalId, title)));
+                labelParts.push(( localize(13860, "Terminal {0}, {1}", terminalId, title)));
             } else {
-                labelParts.push(( localize(13572, "Terminal {0}", terminalId)));
+                labelParts.push(( localize(13861, "Terminal {0}", terminalId)));
             }
             const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
             if (!screenReaderOptimized) {
                 labelParts.push(( localize(
-                    13573,
+                    13862,
                     "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(
-                    13574,
+                    13863,
                     "Use {0} for terminal accessibility help",
                     accessibilityHelpKeybinding
                 )));
@@ -1945,7 +1949,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async setFixedDimensions() {
         const cols = await this._quickInputService.input({
-            title: ( localize(13575, "Set Fixed Dimensions: Column")),
+            title: ( localize(13864, "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",
@@ -1959,7 +1963,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         this._labelComputer?.refreshLabel(this);
         this._terminalHasFixedWidth.set(!!this._fixedCols);
         const rows = await this._quickInputService.input({
-            title: ( localize(13576, "Set Fixed Dimensions: Row")),
+            title: ( localize(13865, "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",
@@ -2069,7 +2073,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     _onEnvironmentVariableInfoChanged(info) {
         if (info.requiresAction) {
             this.xterm?.raw.textarea?.setAttribute("aria-label", ( localize(
-                13577,
+                13866,
                 "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
                 this._instanceId
             )));
@@ -2225,7 +2229,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         disposables.push(quickPick);
         quickPick.items = items;
         quickPick.matchOnDescription = true;
-        quickPick.placeholder = ( localize(13578, "Select a color for the terminal"));
+        quickPick.placeholder = ( localize(13867, "Select a color for the terminal"));
         quickPick.show();
         const result = await ( new Promise(r => {
             disposables.push(quickPick.onDidHide(() => r(undefined)));
@@ -2562,24 +2566,24 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
             if (processState === ProcessState.KilledDuringLaunch) {
                 if (commandLine) {
                     message = ( localize(
-                        13579,
+                        13868,
                         "The terminal process \"{0}\" failed to launch (exit code: {1}).",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13580, "The terminal process failed to launch (exit code: {0}).", code));
+                    message = ( localize(13869, "The terminal process failed to launch (exit code: {0}).", code));
                 }
             } else {
                 if (commandLine) {
                     message = ( localize(
-                        13581,
+                        13870,
                         "The terminal process \"{0}\" terminated with exit code: {1}.",
                         commandLine,
                         code
                     ));
                 } else {
-                    message = ( localize(13582, "The terminal process terminated with exit code: {0}.", code));
+                    message = ( localize(13871, "The terminal process terminated with exit code: {0}.", code));
                 }
             }
             break;
@@ -2605,7 +2609,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
                     break;
                 }
             }
-            message = ( localize(13583, "The terminal process failed to launch: {0}.", innerMessage));
+            message = ( localize(13872, "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(
-                    13614,
+                    13903,
                     "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(
-                        13615,
+                        13904,
                         "Restarting the terminal because the connection to the shell process was lost..."
                     ));
                     let postRestartMessage = "";

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

@@ -28,6 +28,9 @@ class TerminalResizeDebouncer extends Disposable {
         this._resizeYJob = this._register(( new MutableDisposable()));
     }
     async resize(cols, rows, immediate) {
+        if (this._store.isDisposed) {
+            return;
+        }
         this._latestX = cols;
         this._latestY = rows;
         if (immediate || this._getXterm().raw.buffer.normal.length < Constants.StartDebouncingThreshold) {
@@ -40,12 +43,18 @@ class TerminalResizeDebouncer extends Disposable {
         if (win && !this._isVisible()) {
             if (!this._resizeXJob.value) {
                 this._resizeXJob.value = runWhenWindowIdle(win, async () => {
+                    if (this._store.isDisposed) {
+                        return;
+                    }
                     this._resizeXCallback(this._latestX);
                     this._resizeXJob.clear();
                 });
             }
             if (!this._resizeYJob.value) {
                 this._resizeYJob.value = runWhenWindowIdle(win, async () => {
+                    if (this._store.isDisposed) {
+                        return;
+                    }
                     this._resizeYCallback(this._latestY);
                     this._resizeYJob.clear();
                 });
@@ -57,6 +66,9 @@ class TerminalResizeDebouncer extends Disposable {
         this._debounceResizeX(cols);
     }
     flush() {
+        if (this._store.isDisposed) {
+            return;
+        }
         if (this._resizeXJob.value || this._resizeYJob.value) {
             this._resizeXJob.clear();
             this._resizeYJob.clear();
@@ -64,6 +76,9 @@ class TerminalResizeDebouncer extends Disposable {
         }
     }
     _debounceResizeX(cols) {
+        if (this._store.isDisposed) {
+            return;
+        }
         this._resizeXCallback(cols);
     }
 }

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

@@ -93,8 +93,10 @@ let TerminalTabList = class TerminalTabList extends WorkbenchList {
             container,
             instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER),
             () => this.getSelectedElements(),
-            () => this.hasText,
-            () => this.hasActionBar
+            {
+                getHasText: () => this.hasText,
+                getHasActionBar: () => this.hasActionBar
+            }
         )], {
             horizontalScrolling: false,
             supportDynamicHeights: false,
@@ -259,8 +261,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
         _container,
         _labels,
         _getSelection,
-        _getHasText,
-        _getHasActionBar,
+        _getVisibilityState,
         _instantiationService,
         _terminalConfigurationService,
         _terminalService,
@@ -276,8 +277,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
     ) {
         this._labels = _labels;
         this._getSelection = _getSelection;
-        this._getHasText = _getHasText;
-        this._getHasActionBar = _getHasActionBar;
+        this._getVisibilityState = _getVisibilityState;
         this._instantiationService = _instantiationService;
         this._terminalConfigurationService = _terminalConfigurationService;
         this._terminalService = _terminalService;
@@ -338,8 +338,8 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
         };
     }
     renderElement(instance, index, template) {
-        const hasText = this._getHasText();
-        const hasActionBar = this._getHasActionBar();
+        const hasText = this._getVisibilityState.getHasText();
+        const hasActionBar = this._getVisibilityState.getHasActionBar();
         const group = this._terminalGroupService.getGroupForInstance(instance);
         if (!group) {
             throw ( new Error(`Could not find group for instance "${instance.instanceId}"`));
@@ -435,7 +435,7 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
                     };
                 }
             },
-            ariaLabel: ( localize(13642, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
+            ariaLabel: ( localize(13931, "Type terminal name. Press Enter to confirm or Escape to cancel.")),
             inputBoxStyles: defaultInputBoxStyles
         }));
         inputBox.element.style.height = "22px";
@@ -560,13 +560,13 @@ let TerminalTabsRenderer = class TerminalTabsRenderer {
         this._listService.lastFocusedList?.focusNext();
     }
 };
-TerminalTabsRenderer = ( __decorate([( __param(5, IInstantiationService)), ( __param(6, ITerminalConfigurationService)), ( __param(7, ITerminalService)), ( __param(8, ITerminalGroupService)), ( __param(9, ITerminalEditingService)), ( __param(10, IHoverService)), ( __param(11, IKeybindingService)), ( __param(12, IListService)), ( __param(13, IStorageService)), ( __param(14, IThemeService)), ( __param(15, IContextViewService)), ( __param(16, ICommandService))], TerminalTabsRenderer));
+TerminalTabsRenderer = ( __decorate([( __param(4, IInstantiationService)), ( __param(5, ITerminalConfigurationService)), ( __param(6, ITerminalService)), ( __param(7, ITerminalGroupService)), ( __param(8, ITerminalEditingService)), ( __param(9, IHoverService)), ( __param(10, IKeybindingService)), ( __param(11, IListService)), ( __param(12, IStorageService)), ( __param(13, IThemeService)), ( __param(14, IContextViewService)), ( __param(15, ICommandService))], TerminalTabsRenderer));
 let TerminalTabsAccessibilityProvider = class TerminalTabsAccessibilityProvider {
     constructor(_terminalGroupService) {
         this._terminalGroupService = _terminalGroupService;
     }
     getWidgetAriaLabel() {
-        return localize(13643, "Terminal tabs");
+        return localize(13932, "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(
-                13644,
+                13933,
                 "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(13645, "Terminal {0} {1}", instance.instanceId, instance.title));
+            ariaLabel = ( localize(13934, "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(13646, "Terminal"));
+        this.label = ( localize(13935, "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(13647, "Hide Details")) : ( localize(13648, "Show Details")),
+        label: showDetailed ? ( localize(13936, "Hide Details")) : ( localize(13937, "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(13649, "Process ID ({0}): {1}", "PID", instance.processId)) + "\n");
+        lines.push(( localize(13938, "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(13650, "Command line: {0}", commandLine)));
+        lines.push(( localize(13939, "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(
-    14349,
+    14654,
     "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(
-    14350,
+    14655,
     "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(14351, "The border of the sticky scroll overlay in the terminal.")));
+}, ( localize(14656, "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(14352, "Navigate to Command"));
+        let hoverTitle = ( localize(14657, "Navigate to Command"));
         const scrollToPreviousCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToPreviousCommand);
         if (scrollToPreviousCommandKeybinding) {
             const label = scrollToPreviousCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(14353, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
+                hoverTitle += "\n" + ( localize(14658, "{0} ({1})", terminalStrings.scrollToPreviousCommand.value, label));
             }
         }
         const scrollToNextCommandKeybinding = this._keybindingService.lookupKeybinding(TerminalCommandId.ScrollToNextCommand);
         if (scrollToNextCommandKeybinding) {
             const label = scrollToNextCommandKeybinding.getLabel();
             if (label) {
-                hoverTitle += "\n" + ( localize(14353, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
+                hoverTitle += "\n" + ( localize(14658, "{0} ({1})", terminalStrings.scrollToNextCommand.value, label));
             }
         }
         hoverOverlay.title = hoverTitle;