@codingame/monaco-vscode-xterm-common 32.0.2 → 34.0.0

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

@@ -84,7 +84,7 @@ import { ProcessState, TERMINAL_VIEW_ID, TerminalCommandId } from '@codingame/mo
 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';
-import { getShellIntegrationTimeout, preparePathForShell, getUriLabelForShell, getWorkspaceForTerminal } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
+import { getShellIntegrationTimeout, preparePathForShell, getUriLabelForShell, getWorkspaceForTerminal } from '../common/terminalEnvironment.js';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
@@ -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(14188, "Terminal input"));
             Terminal.strings.tooMuchOutput = keybinding ? ( localize(
-                13870,
+                14189,
                 "Use the accessible buffer {0} to manually review output",
                 keybinding.getLabel()
             )) : ( localize(
-                13871,
+                14190,
                 "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(14191, "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(14192, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(14193, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(14194, "Injection failed to activate")) : ( localize(14195, "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(14196, "Shell integration"))}: ${cmdDetectionType}`,
+            detailedTooltip: `${( localize(14196, "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;
@@ -1202,9 +1192,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         if (this._exitReason === undefined) {
             this._exitReason = reason ?? TerminalExitReason.Unknown;
         }
+        this._resizeDebouncer?.dispose();
+        this._resizeDebouncer = undefined;
         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 +1417,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(14197, "Lost connection to process"))
             });
         }));
         this._register(processManager.onPtyReconnect(() => {
@@ -1431,14 +1433,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(14198, "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,
+                    14199,
                     "Cannot launch a terminal process in an empty workspace with cwd {0} different from userHome {1}",
                     this._cwd,
                     this._userHome
@@ -1524,7 +1527,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         });
     }
     async _onProcessExit(exitCodeOrError) {
-        if (this._isExiting) {
+        if (this._isExiting || this.isDisposed) {
             return;
         }
         const parsedExitResult = parseExitResult(
@@ -1552,6 +1555,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             this._processManager.processState
         );
         this._onExit.fire(exitCodeOrError);
+        if (this.isDisposed) {
+            return;
+        }
         const waitOnExit = this.waitOnExit;
         if (waitOnExit && this._processManager.processState !== ProcessState.KilledByUser) {
             this._xtermReadyPromise.then(xterm => {
@@ -1608,10 +1614,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(14200, "Disabling shell integration in user settings might help.")),
             hoverActions: [{
                 commandId: TerminalCommandId.ShellIntegrationLearnMore,
-                label: ( localize(13882, "Learn more about shell integration")),
+                label: ( localize(14201, "Learn more about shell integration")),
                 run: () => {
                     this._openerService.open(
                         "https://code.visualstudio.com/docs/editor/integrated-terminal#_shell-integration"
@@ -1619,7 +1625,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
                 }
             }, {
                 commandId: "workbench.action.openSettings",
-                label: ( localize(13883, "Open user settings")),
+                label: ( localize(14202, "Open user settings")),
                 run: () => {
                     this._commandService.executeCommand(
                         "workbench.action.openSettings",
@@ -1753,7 +1759,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(14203, "Creating a terminal process requires executing code"))
         });
         return trustRequest === true;
     }
@@ -1811,7 +1817,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
     }
     async _resize(immediate) {
-        if (!this.xterm) {
+        if (!this.xterm || !this._resizeDebouncer) {
             return;
         }
         let cols = this.cols;
@@ -1846,7 +1852,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
             cols,
             rows
         };
-        this._resizeDebouncer.resize(cols, rows, immediate ?? false);
+        this._resizeDebouncer?.resize(cols, rows, immediate ?? false);
     }
     async _updatePtyDimensions(rawXterm) {
         if (this.isDisposed) {
@@ -1881,21 +1887,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(14204, "Terminal {0}, {1}", terminalId, title)));
             } else {
-                labelParts.push(( localize(13886, "Terminal {0}", terminalId)));
+                labelParts.push(( localize(14205, "Terminal {0}", terminalId)));
             }
             const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
             if (!screenReaderOptimized) {
                 labelParts.push(( localize(
-                    13887,
+                    14206,
                     "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,
+                    14207,
                     "Use {0} for terminal accessibility help",
                     accessibilityHelpKeybinding
                 )));
@@ -1904,7 +1910,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         }
     }
     _updateTitleProperties(title, eventSource) {
-        if (!title) {
+        if (title === undefined) {
             return this._processName;
         }
         switch (eventSource) {
@@ -1949,7 +1955,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     }
     async setFixedDimensions() {
         const cols = await this._quickInputService.input({
-            title: ( localize(13889, "Set Fixed Dimensions: Column")),
+            title: ( localize(14208, "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 +1969,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(14209, "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 +2079,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
     _onEnvironmentVariableInfoChanged(info) {
         if (info.requiresAction) {
             this.xterm?.raw.textarea?.setAttribute("aria-label", ( localize(
-                13891,
+                14210,
                 "Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
                 this._instanceId
             )));
@@ -2131,6 +2137,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         } else {
             resource = URI.file(cwd);
         }
+        if (!(await this._fileService.canHandleResource(resource))) {
+            return undefined;
+        }
         if (await this._fileService.exists(resource)) {
             return resource;
         }
@@ -2144,6 +2153,9 @@ let TerminalInstance = class TerminalInstance extends Disposable {
         return this._processManager.updateProperty(type, value);
     }
     async rename(title, source) {
+        if (title !== undefined && !title) {
+            title = undefined;
+        }
         this._setTitle(title, source ?? TitleEventSource.Api);
     }
     _setTitle(title, eventSource) {
@@ -2229,7 +2241,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(14211, "Select a color for the terminal"));
         quickPick.show();
         const result = await ( new Promise(r => {
             disposables.push(quickPick.onDidHide(() => r(undefined)));
@@ -2566,24 +2578,24 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
             if (processState === ProcessState.KilledDuringLaunch) {
                 if (commandLine) {
                     message = ( localize(
-                        13893,
+                        14212,
                         "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(14213, "The terminal process failed to launch (exit code: {0}).", code));
                 }
             } else {
                 if (commandLine) {
                     message = ( localize(
-                        13895,
+                        14214,
                         "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(14215, "The terminal process terminated with exit code: {0}.", code));
                 }
             }
             break;
@@ -2609,7 +2621,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
                     break;
                 }
             }
-            message = ( localize(13897, "The terminal process failed to launch: {0}.", innerMessage));
+            message = ( localize(14216, "The terminal process failed to launch: {0}.", innerMessage));
             break;
         }
     }

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

@@ -25,7 +25,7 @@ import { MergedEnvironmentVariableCollection } from '../../../../platform/termin
 import { serializeEnvironmentVariableCollections } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/environmentVariableShared';
 import { ProcessState } 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 { getWorkspaceForTerminal, mergeEnvironments, createVariableResolver, createTerminalEnvironment, getCwd } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
+import { getWorkspaceForTerminal, mergeEnvironments, createVariableResolver, createTerminalEnvironment, getCwd } from '../common/terminalEnvironment.js';
 import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
@@ -202,7 +202,7 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
         } catch (e) {
             this._notificationService.notify({
                 message: ( localize(
-                    13928,
+                    14247,
                     "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,
+                        14248,
                         "Restarting the terminal because the connection to the shell process was lost..."
                     ));
                     let postRestartMessage = "";
@@ -582,6 +582,12 @@ let TerminalProcessManager = class TerminalProcessManager extends Disposable {
             this._resize(cols, rows, pixelWidth, pixelHeight);
             return;
         }
+        if (this._store.isDisposed) {
+            return Promise.resolve();
+        }
+        if (!this.ptyProcessReady) {
+            throw ( new Error("TerminalProcessManager.setDimensions called before initialization"));
+        }
         return this.ptyProcessReady.then(() => this._resize(cols, rows, pixelWidth, pixelHeight));
     }
     async setUnicodeVersion(version) {

package/vscode/src/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer.d.ts

@@ -10,8 +10,8 @@ export declare class TerminalResizeDebouncer extends Disposable {
     private _latestY;
     private readonly _resizeXJob;
     private readonly _resizeYJob;
+    private readonly _debounceResizeXScheduler;
     constructor(_isVisible: () => boolean, _getXterm: () => XtermTerminal | undefined, _resizeBothCallback: (cols: number, rows: number) => void, _resizeXCallback: (cols: number) => void, _resizeYCallback: (rows: number) => void);
     resize(cols: number, rows: number, immediate: boolean): Promise<void>;
     flush(): void;
-    private _debounceResizeX;
 }

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

@@ -1,12 +1,12 @@
 
-import { __decorate } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { getWindow, runWhenWindowIdle } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { debounce } from '@codingame/monaco-vscode-api/vscode/vs/base/common/decorators';
+import { RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 
 var Constants;
 (function(Constants) {
     Constants[Constants["StartDebouncingThreshold"] = 200] = "StartDebouncingThreshold";
+    Constants[Constants["DebounceResizeXDelay"] = 100] = "DebounceResizeXDelay";
 })(Constants || (Constants = {}));
 class TerminalResizeDebouncer extends Disposable {
     constructor(
@@ -26,6 +26,7 @@ class TerminalResizeDebouncer extends Disposable {
         this._latestY = 0;
         this._resizeXJob = this._register(( new MutableDisposable()));
         this._resizeYJob = this._register(( new MutableDisposable()));
+        this._debounceResizeXScheduler = this._register(( new RunOnceScheduler(() => this._resizeXCallback(this._latestX), Constants.DebounceResizeXDelay)));
     }
     async resize(cols, rows, immediate) {
         if (this._store.isDisposed) {
@@ -36,6 +37,7 @@ class TerminalResizeDebouncer extends Disposable {
         if (immediate || this._getXterm().raw.buffer.normal.length < Constants.StartDebouncingThreshold) {
             this._resizeXJob.clear();
             this._resizeYJob.clear();
+            this._debounceResizeXScheduler.cancel();
             this._resizeBothCallback(cols, rows);
             return;
         }
@@ -63,30 +65,19 @@ class TerminalResizeDebouncer extends Disposable {
         }
         this._resizeYCallback(rows);
         this._latestX = cols;
-        this._debounceResizeX(cols);
+        this._debounceResizeXScheduler.schedule();
     }
     flush() {
         if (this._store.isDisposed) {
             return;
         }
-        if (this._resizeXJob.value || this._resizeYJob.value) {
+        if (this._resizeXJob.value || this._resizeYJob.value || this._debounceResizeXScheduler.isScheduled()) {
             this._resizeXJob.clear();
             this._resizeYJob.clear();
+            this._debounceResizeXScheduler.cancel();
             this._resizeBothCallback(this._latestX, this._latestY);
         }
     }
-    _debounceResizeX(cols) {
-        if (this._store.isDisposed) {
-            return;
-        }
-        this._resizeXCallback(cols);
-    }
 }
-TerminalResizeDebouncer.__decorator = ( __decorate(
-    [debounce(100)],
-    TerminalResizeDebouncer.prototype,
-    "_debounceResizeX",
-    null
-));
 
 export { TerminalResizeDebouncer };

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(14275, "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(14276, "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,
+                14277,
                 "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(14278, "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(14279, "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(14280, "Hide Details")) : ( localize(14281, "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(14282, "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(14283, "Command line: {0}", commandLine)));
     }
     return lines.length ? `\n\n---\n\n${lines.join("\n")}` : "";
 }

package/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.d.ts

@@ -0,0 +1,38 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IWorkspaceFolder } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
+import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
+import { IConfigurationResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service";
+import { IShellLaunchConfig, ITerminalBackend, ITerminalEnvironment, TerminalShellType } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
+import { IProcessEnvironment, OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
+import { IHistoryService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service";
+import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+export declare function mergeEnvironments(parent: IProcessEnvironment, other: ITerminalEnvironment | undefined): void;
+export declare function addTerminalEnvironmentKeys(env: IProcessEnvironment, version: string | undefined, locale: string | undefined, detectLocale: "auto" | "off" | "on"): void;
+export declare function shouldSetLangEnvVariable(env: IProcessEnvironment, detectLocale: "auto" | "off" | "on"): boolean;
+export declare function getLangEnvVariable(locale?: string): string;
+export declare function getCwd(shell: IShellLaunchConfig, userHome: string | undefined, variableResolver: VariableResolver | undefined, root: URI | undefined, customCwd: string | undefined, logService?: ILogService): Promise<string>;
+export type VariableResolver = (str: string) => Promise<string>;
+export declare function createVariableResolver(lastActiveWorkspace: IWorkspaceFolder | undefined, env: IProcessEnvironment, configurationResolverService: IConfigurationResolverService | undefined): VariableResolver | undefined;
+export declare function createTerminalEnvironment(shellLaunchConfig: IShellLaunchConfig, envFromConfig: ITerminalEnvironment | undefined, variableResolver: VariableResolver | undefined, version: string | undefined, detectLocale: "auto" | "off" | "on", baseEnv: IProcessEnvironment): Promise<IProcessEnvironment>;
+/**
+ * Takes a path and returns the properly escaped path to send to a given shell. On Windows, this
+ * included trying to prepare the path for WSL if needed.
+ *
+ * @param originalPath The path to be escaped and formatted.
+ * @param executable The executable off the shellLaunchConfig.
+ * @param title The terminal's title.
+ * @param shellType The type of shell the path is being sent to.
+ * @param backend The backend for the terminal.
+ * @param isWindowsFrontend Whether the frontend is Windows, this is only exposed for injection via
+ * tests.
+ * @returns An escaped version of the path to be executed in the terminal.
+ */
+export declare function preparePathForShell(resource: string | URI, executable: string | undefined, title: string, shellType: TerminalShellType | undefined, backend: Pick<ITerminalBackend, "getWslPath"> | undefined, os: OperatingSystem | undefined, isWindowsFrontend?: boolean): Promise<string>;
+export declare function getWorkspaceForTerminal(cwd: URI | string | undefined, workspaceContextService: IWorkspaceContextService, historyService: IHistoryService): IWorkspaceFolder | undefined;
+export declare function getUriLabelForShell(uri: URI | string, backend: Pick<ITerminalBackend, "getWslPath">, shellType?: TerminalShellType, os?: OperatingSystem, isWindowsFrontend?: boolean): Promise<string>;
+/**
+ * Gets the unified duration to wait for shell integration after the terminal launches before
+ * declaring the terminal lacks shell integration.
+ */
+export declare function getShellIntegrationTimeout(configurationService: IConfigurationService, siInjectionEnabled: boolean, isRemote: boolean, processReadyTimestamp?: number): number;