@codingame/monaco-vscode-xterm-common 37.1.0 → 37.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.d.ts +3 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.js +39 -39
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.js +3 -3
- package/vscode/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.d.ts +0 -11
- package/vscode/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.js +0 -26
- package/vscode/src/vs/platform/terminal/common/environmentVariable.d.ts +0 -86
- package/vscode/src/vs/platform/terminal/common/environmentVariable.js +0 -10
- package/vscode/src/vs/platform/terminal/common/environmentVariableCollection.d.ts +0 -17
- package/vscode/src/vs/platform/terminal/common/environmentVariableCollection.js +0 -218
- package/vscode/src/vs/platform/terminal/common/terminalRecorder.d.ts +0 -14
- package/vscode/src/vs/platform/terminal/common/terminalRecorder.js +0 -84
- package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostOutputChannel.d.ts +0 -22
- package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostOutputChannel.js +0 -48
- package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostPty.d.ts +0 -129
- package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostPty.js +0 -439
- package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostTerminalService.d.ts +0 -77
- package/vscode/src/vs/workbench/contrib/terminal/browser/agentHostTerminalService.js +0 -345
- package/vscode/src/vs/workbench/contrib/terminal/browser/ahpTerminalCommandSource.d.ts +0 -111
- package/vscode/src/vs/workbench/contrib/terminal/browser/ahpTerminalCommandSource.js +0 -138
- package/vscode/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.d.ts +0 -28
- package/vscode/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.js +0 -119
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalActions.d.ts +0 -104
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalActions.js +0 -1643
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.d.ts +0 -19
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.js +0 -54
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.d.ts +0 -12
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.js +0 -78
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.d.ts +0 -144
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.js +0 -806
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer.d.ts +0 -17
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer.js +0 -83
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalStatusList.d.ts +0 -57
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalStatusList.js +0 -139
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTabsList.d.ts +0 -45
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTabsList.js +0 -804
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTooltip.d.ts +0 -9
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalTooltip.js +0 -75
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.d.ts +0 -17
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.js +0 -61
- package/vscode/src/vs/workbench/contrib/terminal/common/basePty.d.ts +0 -38
- package/vscode/src/vs/workbench/contrib/terminal/common/basePty.js +0 -127
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.d.ts +0 -38
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.js +0 -321
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.d.ts +0 -12
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStorageKeys.js +0 -17
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css +0 -49
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.d.ts +0 -2
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.js +0 -25
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.d.ts +0 -58
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.js +0 -462
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-xterm-common",
|
|
3
|
-
"version": "37.
|
|
3
|
+
"version": "37.3.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - common package depending on xterm",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-api": "37.
|
|
19
|
-
"@codingame/monaco-vscode-xterm-addons-common": "37.
|
|
18
|
+
"@codingame/monaco-vscode-api": "37.3.0",
|
|
19
|
+
"@codingame/monaco-vscode-xterm-addons-common": "37.3.0",
|
|
20
20
|
"@xterm/xterm": "6.1.0-beta.304"
|
|
21
21
|
},
|
|
22
22
|
"exports": {
|
|
@@ -20,7 +20,7 @@ import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform
|
|
|
20
20
|
import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
|
|
21
21
|
import { IMarkProperties } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
|
|
22
22
|
import { TerminalCapabilityStoreMultiplexer } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/terminalCapabilityStore";
|
|
23
|
-
import { IMergedEnvironmentVariableCollection } from "
|
|
23
|
+
import { IMergedEnvironmentVariableCollection } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/environmentVariable";
|
|
24
24
|
import { GeneralShellType, IReconnectionProperties, IShellLaunchConfig, ITerminalDimensionsOverride, ITerminalLaunchError, TerminalExitReason, TerminalIcon, TerminalLocation, TerminalShellType, TitleEventSource, type ShellIntegrationInjectionFailureReason } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
|
|
25
25
|
import { ITerminalLogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal.service";
|
|
26
26
|
import { IColorTheme } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService";
|
|
@@ -32,8 +32,8 @@ import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/w
|
|
|
32
32
|
import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
|
|
33
33
|
import { IRequestAddInstanceToGroupEvent, ITerminalContribution, ITerminalInstance, IXtermColorProvider } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal";
|
|
34
34
|
import { ITerminalConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service";
|
|
35
|
-
import { TerminalProcessManager } from "
|
|
36
|
-
import { ITerminalStatusList } from "
|
|
35
|
+
import { TerminalProcessManager } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalProcessManager";
|
|
36
|
+
import { ITerminalStatusList } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalStatusList";
|
|
37
37
|
import { XtermTerminal } from "@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal";
|
|
38
38
|
import { ProcessState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal";
|
|
39
39
|
import { ITerminalProfileResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service";
|
|
@@ -70,21 +70,21 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
|
|
|
70
70
|
import { AccessibilityVerbositySettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration';
|
|
71
71
|
import { TerminalDataTransfers } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal';
|
|
72
72
|
import { ITerminalConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminal.service';
|
|
73
|
-
import { TerminalLaunchHelpAction } from '
|
|
73
|
+
import { TerminalLaunchHelpAction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalActions';
|
|
74
74
|
import { TerminalEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
|
|
75
75
|
import { TerminalExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalExtensions';
|
|
76
76
|
import { getStandardColors, createColorStyleElement, getColorClass } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalIcon';
|
|
77
|
-
import { TerminalProcessManager } from '
|
|
78
|
-
import { TerminalStatusList, TerminalStatus } from '
|
|
79
|
-
import { getTerminalUri, getTerminalResourcesFromDragEvent } from '@codingame/monaco-vscode-
|
|
77
|
+
import { TerminalProcessManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalProcessManager';
|
|
78
|
+
import { TerminalStatusList, TerminalStatus } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalStatusList';
|
|
79
|
+
import { getTerminalUri, getTerminalResourcesFromDragEvent } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalUri';
|
|
80
80
|
import { TerminalWidgetManager } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/widgets/widgetManager';
|
|
81
|
-
import { LineDataEventAddon } from '
|
|
81
|
+
import { LineDataEventAddon } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon';
|
|
82
82
|
import { getXtermScaledDimensions, XtermTerminal } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal';
|
|
83
83
|
import { ProcessState, TERMINAL_VIEW_ID, TerminalCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal';
|
|
84
84
|
import { ITerminalProfileResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminal.service';
|
|
85
85
|
import { TERMINAL_BACKGROUND_COLOR } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalColorRegistry';
|
|
86
86
|
import { TerminalContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalContextKey';
|
|
87
|
-
import { getShellIntegrationTimeout, preparePathForShell, getUriLabelForShell, getWorkspaceForTerminal } from '
|
|
87
|
+
import { getShellIntegrationTimeout, preparePathForShell, getUriLabelForShell, getWorkspaceForTerminal } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalEnvironment';
|
|
88
88
|
import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
|
|
89
89
|
import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
|
|
90
90
|
import { IHistoryService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/history/common/history.service';
|
|
@@ -94,9 +94,9 @@ import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
|
|
|
94
94
|
import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
|
|
95
95
|
import { AccessibilityCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/accessibility/common/accessibilityCommands';
|
|
96
96
|
import { terminalStrings } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/common/terminalStrings';
|
|
97
|
-
import { TerminalIconPicker } from '
|
|
98
|
-
import { TerminalResizeDebouncer } from '
|
|
99
|
-
import { openContextMenu } from '
|
|
97
|
+
import { TerminalIconPicker } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalIconPicker';
|
|
98
|
+
import { TerminalResizeDebouncer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer';
|
|
99
|
+
import { openContextMenu } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/browser/terminalContextMenu';
|
|
100
100
|
import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
|
|
101
101
|
import { TerminalContribCommandId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminal/terminalContribExports';
|
|
102
102
|
import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
|
|
@@ -780,13 +780,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
780
780
|
}
|
|
781
781
|
xtermConstructor = Promises.withAsyncBody(async resolve => {
|
|
782
782
|
const Terminal = (await import('@xterm/xterm')).Terminal;
|
|
783
|
-
Terminal.strings.promptLabel = ( localize(
|
|
783
|
+
Terminal.strings.promptLabel = ( localize(19039, "Terminal input"));
|
|
784
784
|
Terminal.strings.tooMuchOutput = keybinding ? ( localize(
|
|
785
|
-
|
|
785
|
+
19040,
|
|
786
786
|
"Use the accessible buffer {0} to manually review output",
|
|
787
787
|
keybinding.getLabel()
|
|
788
788
|
)) : ( localize(
|
|
789
|
-
|
|
789
|
+
19041,
|
|
790
790
|
"Use the Terminal: Focus Accessible Buffer command to manually review output"
|
|
791
791
|
));
|
|
792
792
|
resolve(Terminal);
|
|
@@ -848,7 +848,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
848
848
|
id: TerminalStatus.Bell,
|
|
849
849
|
severity: Severity.Warning,
|
|
850
850
|
icon: Codicon.bell,
|
|
851
|
-
tooltip: ( localize(
|
|
851
|
+
tooltip: ( localize(19042, "Bell"))
|
|
852
852
|
}, this._terminalConfigurationService.config.bellDuration);
|
|
853
853
|
}
|
|
854
854
|
this._accessibilitySignalService.playSignal(AccessibilitySignal.terminalBell);
|
|
@@ -926,7 +926,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
926
926
|
if (!instance.xterm) {
|
|
927
927
|
return;
|
|
928
928
|
}
|
|
929
|
-
const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(
|
|
929
|
+
const cmdDetectionType = (instance.capabilities.get(TerminalCapability.CommandDetection)?.hasRichCommandDetection ? ( localize(19043, "Rich")) : ( instance.capabilities.has(TerminalCapability.CommandDetection)) ? ( localize(19044, "Basic")) : instance.usedShellIntegrationInjection ? ( localize(19045, "Injection failed to activate")) : ( localize(19046, "No")));
|
|
930
930
|
const detailedAdditions = [];
|
|
931
931
|
if (instance.shellType) {
|
|
932
932
|
detailedAdditions.push(`Shell type: \`${instance.shellType}\``);
|
|
@@ -937,7 +937,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
937
937
|
}
|
|
938
938
|
const seenSequences = Array.from(instance.xterm.shellIntegration.seenSequences);
|
|
939
939
|
if (seenSequences.length > 0) {
|
|
940
|
-
detailedAdditions.push(`Seen sequences: ${
|
|
940
|
+
detailedAdditions.push(`Seen sequences: ${seenSequences.map(e => `\`${e}\``).join(", ")}`);
|
|
941
941
|
}
|
|
942
942
|
const promptType = instance.capabilities.get(TerminalCapability.PromptTypeDetection)?.promptType;
|
|
943
943
|
if (promptType) {
|
|
@@ -947,12 +947,12 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
947
947
|
if (combinedString !== undefined) {
|
|
948
948
|
detailedAdditions.push(`Prompt input: \`\`\`${combinedString}\`\`\``);
|
|
949
949
|
}
|
|
950
|
-
const detailedAdditionsString = detailedAdditions.length > 0 ? "\n\n" +
|
|
950
|
+
const detailedAdditionsString = detailedAdditions.length > 0 ? "\n\n" + detailedAdditions.map(e => `- ${e}`).join("\n") : "";
|
|
951
951
|
instance.statusList.add({
|
|
952
952
|
id: TerminalStatus.ShellIntegrationInfo,
|
|
953
953
|
severity: Severity.Info,
|
|
954
|
-
tooltip: `${( localize(
|
|
955
|
-
detailedTooltip: `${( localize(
|
|
954
|
+
tooltip: `${( localize(19047, "Shell integration"))}: ${cmdDetectionType}`,
|
|
955
|
+
detailedTooltip: `${( localize(19047, "Shell integration"))}: ${cmdDetectionType}${detailedAdditionsString}`
|
|
956
956
|
});
|
|
957
957
|
}
|
|
958
958
|
async runCommand(
|
|
@@ -1430,7 +1430,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1430
1430
|
id: TerminalStatus.Disconnected,
|
|
1431
1431
|
severity: Severity.Error,
|
|
1432
1432
|
icon: Codicon.debugDisconnect,
|
|
1433
|
-
tooltip: ( localize(
|
|
1433
|
+
tooltip: ( localize(19048, "Lost connection to process"))
|
|
1434
1434
|
});
|
|
1435
1435
|
}));
|
|
1436
1436
|
this._register(processManager.onPtyReconnect(() => {
|
|
@@ -1449,13 +1449,13 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1449
1449
|
const isRemoteTerminal = !!this.remoteAuthority;
|
|
1450
1450
|
if (!trusted && !(isRemoteTerminal && this._workbenchEnvironmentService.remoteAuthority)) {
|
|
1451
1451
|
this._onProcessExit({
|
|
1452
|
-
message: ( localize(
|
|
1452
|
+
message: ( localize(19049, "Cannot launch a terminal process in an untrusted workspace"))
|
|
1453
1453
|
});
|
|
1454
1454
|
return;
|
|
1455
1455
|
} else if (this._workspaceContextService.getWorkspace().folders.length === 0 && this._cwd && this._userHome && normalizeDriveLetter(this._cwd) !== normalizeDriveLetter(this._userHome)) {
|
|
1456
1456
|
this._onProcessExit({
|
|
1457
1457
|
message: ( localize(
|
|
1458
|
-
|
|
1458
|
+
19050,
|
|
1459
1459
|
"Cannot launch a terminal process in an empty workspace with cwd {0} different from userHome {1}",
|
|
1460
1460
|
this._cwd,
|
|
1461
1461
|
this._userHome
|
|
@@ -1629,10 +1629,10 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1629
1629
|
id: TerminalStatus.ShellIntegrationAttentionNeeded,
|
|
1630
1630
|
severity: Severity.Warning,
|
|
1631
1631
|
icon: Codicon.warning,
|
|
1632
|
-
tooltip: `${exitMessage} ` + ( localize(
|
|
1632
|
+
tooltip: `${exitMessage} ` + ( localize(19051, "Disabling shell integration in user settings might help.")),
|
|
1633
1633
|
hoverActions: [{
|
|
1634
1634
|
commandId: TerminalCommandId.ShellIntegrationLearnMore,
|
|
1635
|
-
label: ( localize(
|
|
1635
|
+
label: ( localize(19052, "Learn more about shell integration")),
|
|
1636
1636
|
run: () => {
|
|
1637
1637
|
this._openerService.open(
|
|
1638
1638
|
"https://code.visualstudio.com/docs/terminal/shell-integration?referrer=in-product"
|
|
@@ -1640,7 +1640,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1640
1640
|
}
|
|
1641
1641
|
}, {
|
|
1642
1642
|
commandId: "workbench.action.openSettings",
|
|
1643
|
-
label: ( localize(
|
|
1643
|
+
label: ( localize(19053, "Open user settings")),
|
|
1644
1644
|
run: () => {
|
|
1645
1645
|
this._commandService.executeCommand(
|
|
1646
1646
|
"workbench.action.openSettings",
|
|
@@ -1774,7 +1774,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1774
1774
|
return true;
|
|
1775
1775
|
}
|
|
1776
1776
|
const trustRequest = await this._workspaceTrustRequestService.requestWorkspaceTrust({
|
|
1777
|
-
message: ( localize(
|
|
1777
|
+
message: ( localize(19054, "Creating a terminal process requires executing code"))
|
|
1778
1778
|
});
|
|
1779
1779
|
return trustRequest === true;
|
|
1780
1780
|
}
|
|
@@ -1902,21 +1902,21 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1902
1902
|
const labelParts = [];
|
|
1903
1903
|
if (xterm && xterm.textarea) {
|
|
1904
1904
|
if (title && title.length > 0) {
|
|
1905
|
-
labelParts.push(( localize(
|
|
1905
|
+
labelParts.push(( localize(19055, "Terminal {0}, {1}", terminalId, title)));
|
|
1906
1906
|
} else {
|
|
1907
|
-
labelParts.push(( localize(
|
|
1907
|
+
labelParts.push(( localize(19056, "Terminal {0}", terminalId)));
|
|
1908
1908
|
}
|
|
1909
1909
|
const screenReaderOptimized = this._accessibilityService.isScreenReaderOptimized();
|
|
1910
1910
|
if (!screenReaderOptimized) {
|
|
1911
1911
|
labelParts.push(( localize(
|
|
1912
|
-
|
|
1912
|
+
19057,
|
|
1913
1913
|
"Run the command: Toggle Screen Reader Accessibility Mode for an optimized screen reader experience"
|
|
1914
1914
|
)));
|
|
1915
1915
|
}
|
|
1916
1916
|
const accessibilityHelpKeybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getLabel();
|
|
1917
1917
|
if (this._configurationService.getValue(AccessibilityVerbositySettingId.Terminal) && accessibilityHelpKeybinding) {
|
|
1918
1918
|
labelParts.push(( localize(
|
|
1919
|
-
|
|
1919
|
+
19058,
|
|
1920
1920
|
"Use {0} for terminal accessibility help",
|
|
1921
1921
|
accessibilityHelpKeybinding
|
|
1922
1922
|
)));
|
|
@@ -1970,7 +1970,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1970
1970
|
}
|
|
1971
1971
|
async setFixedDimensions() {
|
|
1972
1972
|
const cols = await this._quickInputService.input({
|
|
1973
|
-
title: ( localize(
|
|
1973
|
+
title: ( localize(19059, "Set Fixed Dimensions: Column")),
|
|
1974
1974
|
placeHolder: "Enter a number of columns or leave empty for automatic width",
|
|
1975
1975
|
validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
|
|
1976
1976
|
content: "Enter a number or leave empty size automatically",
|
|
@@ -1984,7 +1984,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
1984
1984
|
this._labelComputer?.refreshLabel(this);
|
|
1985
1985
|
this._terminalHasFixedWidth.set(!!this._fixedCols);
|
|
1986
1986
|
const rows = await this._quickInputService.input({
|
|
1987
|
-
title: ( localize(
|
|
1987
|
+
title: ( localize(19060, "Set Fixed Dimensions: Row")),
|
|
1988
1988
|
placeHolder: "Enter a number of rows or leave empty for automatic height",
|
|
1989
1989
|
validateInput: async text => text.length > 0 && !text.match(/^\d+$/) ? {
|
|
1990
1990
|
content: "Enter a number or leave empty size automatically",
|
|
@@ -2094,7 +2094,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
2094
2094
|
_onEnvironmentVariableInfoChanged(info) {
|
|
2095
2095
|
if (info.requiresAction) {
|
|
2096
2096
|
this.xterm?.raw.textarea?.setAttribute("aria-label", ( localize(
|
|
2097
|
-
|
|
2097
|
+
19061,
|
|
2098
2098
|
"Terminal {0} environment is stale, run the 'Show Environment Information' command for more information",
|
|
2099
2099
|
this._instanceId
|
|
2100
2100
|
)));
|
|
@@ -2256,7 +2256,7 @@ let TerminalInstance = class TerminalInstance extends Disposable {
|
|
|
2256
2256
|
disposables.push(quickPick);
|
|
2257
2257
|
quickPick.items = items;
|
|
2258
2258
|
quickPick.matchOnDescription = true;
|
|
2259
|
-
quickPick.placeholder = ( localize(
|
|
2259
|
+
quickPick.placeholder = ( localize(19062, "Select a color for the terminal"));
|
|
2260
2260
|
quickPick.show();
|
|
2261
2261
|
const result = await ( new Promise(r => {
|
|
2262
2262
|
disposables.push(quickPick.onDidHide(() => r(undefined)));
|
|
@@ -2594,30 +2594,30 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
|
|
|
2594
2594
|
if (isString(shellLaunchConfig.args)) {
|
|
2595
2595
|
commandLine += ` ${shellLaunchConfig.args}`;
|
|
2596
2596
|
} else if (shellLaunchConfig.args && shellLaunchConfig.args.length) {
|
|
2597
|
-
commandLine +=
|
|
2597
|
+
commandLine += shellLaunchConfig.args.map(a => ` '${a}'`).join();
|
|
2598
2598
|
}
|
|
2599
2599
|
}
|
|
2600
2600
|
if (processState === ProcessState.KilledDuringLaunch) {
|
|
2601
2601
|
if (commandLine) {
|
|
2602
2602
|
message = ( localize(
|
|
2603
|
-
|
|
2603
|
+
19063,
|
|
2604
2604
|
"The terminal process \"{0}\" failed to launch (exit code: {1}).",
|
|
2605
2605
|
commandLine,
|
|
2606
2606
|
code
|
|
2607
2607
|
));
|
|
2608
2608
|
} else {
|
|
2609
|
-
message = ( localize(
|
|
2609
|
+
message = ( localize(19064, "The terminal process failed to launch (exit code: {0}).", code));
|
|
2610
2610
|
}
|
|
2611
2611
|
} else {
|
|
2612
2612
|
if (commandLine) {
|
|
2613
2613
|
message = ( localize(
|
|
2614
|
-
|
|
2614
|
+
19065,
|
|
2615
2615
|
"The terminal process \"{0}\" terminated with exit code: {1}.",
|
|
2616
2616
|
commandLine,
|
|
2617
2617
|
code
|
|
2618
2618
|
));
|
|
2619
2619
|
} else {
|
|
2620
|
-
message = ( localize(
|
|
2620
|
+
message = ( localize(19066, "The terminal process terminated with exit code: {0}.", code));
|
|
2621
2621
|
}
|
|
2622
2622
|
}
|
|
2623
2623
|
break;
|
|
@@ -2643,7 +2643,7 @@ function parseExitResult(exitCodeOrError, shellLaunchConfig, processState, initi
|
|
|
2643
2643
|
break;
|
|
2644
2644
|
}
|
|
2645
2645
|
}
|
|
2646
|
-
message = ( localize(
|
|
2646
|
+
message = ( localize(19067, "The terminal process failed to launch: {0}.", innerMessage));
|
|
2647
2647
|
break;
|
|
2648
2648
|
}
|
|
2649
2649
|
}
|
|
@@ -10,11 +10,11 @@ import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platf
|
|
|
10
10
|
import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
|
|
11
11
|
import { TerminalInstance, TerminalInstanceColorProvider } from '../../../terminal/browser/terminalInstance.js';
|
|
12
12
|
import { TerminalStickyScrollSettingId } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration';
|
|
13
|
-
import * as stickyScroll from '
|
|
14
|
-
import { TerminalStickyScrollOverlay } from '
|
|
13
|
+
import * as stickyScroll from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css';
|
|
14
|
+
import { TerminalStickyScrollOverlay } from '@codingame/monaco-vscode-xterm-addons-common/vscode/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay';
|
|
15
15
|
|
|
16
16
|
var TerminalStickyScrollContribution_1;
|
|
17
|
-
registerCss(stickyScroll);
|
|
17
|
+
registerCss(stickyScroll, 1);
|
|
18
18
|
let TerminalStickyScrollContribution = class TerminalStickyScrollContribution extends Disposable {
|
|
19
19
|
static {
|
|
20
20
|
TerminalStickyScrollContribution_1 = this;
|
package/vscode/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.d.ts
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { ITerminalChildProcess } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/terminal";
|
|
2
|
-
import { TerminalCapability, INaiveCwdDetectionCapability } from "@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities";
|
|
3
|
-
export declare class NaiveCwdDetectionCapability implements INaiveCwdDetectionCapability {
|
|
4
|
-
private readonly _process;
|
|
5
|
-
constructor(_process: ITerminalChildProcess);
|
|
6
|
-
readonly type = TerminalCapability.NaiveCwdDetection;
|
|
7
|
-
private _cwd;
|
|
8
|
-
private readonly _onDidChangeCwd;
|
|
9
|
-
readonly onDidChangeCwd: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<string>;
|
|
10
|
-
getCwd(): Promise<string>;
|
|
11
|
-
}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
|
3
|
-
import { TerminalCapability } from '@codingame/monaco-vscode-api/vscode/vs/platform/terminal/common/capabilities/capabilities';
|
|
4
|
-
|
|
5
|
-
class NaiveCwdDetectionCapability {
|
|
6
|
-
constructor(_process) {
|
|
7
|
-
this._process = _process;
|
|
8
|
-
this.type = TerminalCapability.NaiveCwdDetection;
|
|
9
|
-
this._cwd = "";
|
|
10
|
-
this._onDidChangeCwd = ( new Emitter());
|
|
11
|
-
this.onDidChangeCwd = this._onDidChangeCwd.event;
|
|
12
|
-
}
|
|
13
|
-
async getCwd() {
|
|
14
|
-
if (!this._process) {
|
|
15
|
-
return Promise.resolve("");
|
|
16
|
-
}
|
|
17
|
-
const newCwd = await this._process.getCwd();
|
|
18
|
-
if (newCwd !== this._cwd) {
|
|
19
|
-
this._onDidChangeCwd.fire(newCwd);
|
|
20
|
-
}
|
|
21
|
-
this._cwd = newCwd;
|
|
22
|
-
return this._cwd;
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export { NaiveCwdDetectionCapability };
|
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
import { IProcessEnvironment } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
|
|
2
|
-
import { IWorkspaceFolderData } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
|
|
3
|
-
export declare enum EnvironmentVariableMutatorType {
|
|
4
|
-
Replace = 1,
|
|
5
|
-
Append = 2,
|
|
6
|
-
Prepend = 3
|
|
7
|
-
}
|
|
8
|
-
export interface IEnvironmentVariableMutator {
|
|
9
|
-
readonly variable: string;
|
|
10
|
-
readonly value: string;
|
|
11
|
-
readonly type: EnvironmentVariableMutatorType;
|
|
12
|
-
readonly scope?: EnvironmentVariableScope;
|
|
13
|
-
readonly options?: IEnvironmentVariableMutatorOptions;
|
|
14
|
-
}
|
|
15
|
-
export interface IEnvironmentVariableCollectionDescription {
|
|
16
|
-
readonly description: string | undefined;
|
|
17
|
-
readonly scope?: EnvironmentVariableScope;
|
|
18
|
-
}
|
|
19
|
-
export interface IEnvironmentVariableMutatorOptions {
|
|
20
|
-
applyAtProcessCreation?: boolean;
|
|
21
|
-
applyAtShellIntegration?: boolean;
|
|
22
|
-
}
|
|
23
|
-
export type EnvironmentVariableScope = {
|
|
24
|
-
workspaceFolder?: IWorkspaceFolderData;
|
|
25
|
-
};
|
|
26
|
-
export interface IEnvironmentVariableCollection {
|
|
27
|
-
readonly map: ReadonlyMap<string, IEnvironmentVariableMutator>;
|
|
28
|
-
readonly descriptionMap?: ReadonlyMap<string, IEnvironmentVariableCollectionDescription>;
|
|
29
|
-
}
|
|
30
|
-
/** [variable, mutator] */
|
|
31
|
-
export type ISerializableEnvironmentVariableCollection = [
|
|
32
|
-
string,
|
|
33
|
-
IEnvironmentVariableMutator
|
|
34
|
-
][];
|
|
35
|
-
export type ISerializableEnvironmentDescriptionMap = [
|
|
36
|
-
string,
|
|
37
|
-
IEnvironmentVariableCollectionDescription
|
|
38
|
-
][];
|
|
39
|
-
export interface IExtensionOwnedEnvironmentDescriptionMutator extends IEnvironmentVariableCollectionDescription {
|
|
40
|
-
readonly extensionIdentifier: string;
|
|
41
|
-
}
|
|
42
|
-
/** [extension, collection, description] */
|
|
43
|
-
export type ISerializableEnvironmentVariableCollections = [
|
|
44
|
-
string,
|
|
45
|
-
ISerializableEnvironmentVariableCollection,
|
|
46
|
-
ISerializableEnvironmentDescriptionMap
|
|
47
|
-
][];
|
|
48
|
-
export interface IExtensionOwnedEnvironmentVariableMutator extends IEnvironmentVariableMutator {
|
|
49
|
-
readonly extensionIdentifier: string;
|
|
50
|
-
}
|
|
51
|
-
export interface IMergedEnvironmentVariableCollectionDiff {
|
|
52
|
-
added: ReadonlyMap<string, IExtensionOwnedEnvironmentVariableMutator[]>;
|
|
53
|
-
changed: ReadonlyMap<string, IExtensionOwnedEnvironmentVariableMutator[]>;
|
|
54
|
-
removed: ReadonlyMap<string, IExtensionOwnedEnvironmentVariableMutator[]>;
|
|
55
|
-
}
|
|
56
|
-
type VariableResolver = (str: string) => Promise<string>;
|
|
57
|
-
/**
|
|
58
|
-
* Represents an environment variable collection that results from merging several collections
|
|
59
|
-
* together.
|
|
60
|
-
*/
|
|
61
|
-
export interface IMergedEnvironmentVariableCollection {
|
|
62
|
-
readonly collections: ReadonlyMap<string, IEnvironmentVariableCollection>;
|
|
63
|
-
/**
|
|
64
|
-
* Gets the variable map for a given scope.
|
|
65
|
-
* @param scope The scope to get the variable map for. If undefined, the global scope is used.
|
|
66
|
-
*/
|
|
67
|
-
getVariableMap(scope: EnvironmentVariableScope | undefined): Map<string, IExtensionOwnedEnvironmentVariableMutator[]>;
|
|
68
|
-
/**
|
|
69
|
-
* Gets the description map for a given scope.
|
|
70
|
-
* @param scope The scope to get the description map for. If undefined, description map for the
|
|
71
|
-
* global scope is returned.
|
|
72
|
-
*/
|
|
73
|
-
getDescriptionMap(scope: EnvironmentVariableScope | undefined): Map<string, string | undefined>;
|
|
74
|
-
/**
|
|
75
|
-
* Applies this collection to a process environment.
|
|
76
|
-
* @param variableResolver An optional function to use to resolve variables within the
|
|
77
|
-
* environment values.
|
|
78
|
-
*/
|
|
79
|
-
applyToProcessEnvironment(env: IProcessEnvironment, scope: EnvironmentVariableScope | undefined, variableResolver?: VariableResolver): Promise<void>;
|
|
80
|
-
/**
|
|
81
|
-
* Generates a diff of this collection against another. Returns undefined if the collections are
|
|
82
|
-
* the same.
|
|
83
|
-
*/
|
|
84
|
-
diff(other: IMergedEnvironmentVariableCollection, scope: EnvironmentVariableScope | undefined): IMergedEnvironmentVariableCollectionDiff | undefined;
|
|
85
|
-
}
|
|
86
|
-
export {};
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var EnvironmentVariableMutatorType;
|
|
4
|
-
(function (EnvironmentVariableMutatorType) {
|
|
5
|
-
EnvironmentVariableMutatorType[EnvironmentVariableMutatorType["Replace"] = 1] = "Replace";
|
|
6
|
-
EnvironmentVariableMutatorType[EnvironmentVariableMutatorType["Append"] = 2] = "Append";
|
|
7
|
-
EnvironmentVariableMutatorType[EnvironmentVariableMutatorType["Prepend"] = 3] = "Prepend";
|
|
8
|
-
})(EnvironmentVariableMutatorType || (EnvironmentVariableMutatorType = {}));
|
|
9
|
-
|
|
10
|
-
export { EnvironmentVariableMutatorType };
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import { IProcessEnvironment } from "@codingame/monaco-vscode-api/vscode/vs/base/common/platform";
|
|
2
|
-
import { EnvironmentVariableScope, IEnvironmentVariableCollection, IExtensionOwnedEnvironmentVariableMutator, IMergedEnvironmentVariableCollection, IMergedEnvironmentVariableCollectionDiff } from "./environmentVariable.js";
|
|
3
|
-
type VariableResolver = (str: string) => Promise<string>;
|
|
4
|
-
export declare class MergedEnvironmentVariableCollection implements IMergedEnvironmentVariableCollection {
|
|
5
|
-
readonly collections: ReadonlyMap<string, IEnvironmentVariableCollection>;
|
|
6
|
-
private readonly map;
|
|
7
|
-
private readonly descriptionMap;
|
|
8
|
-
constructor(collections: ReadonlyMap<string, IEnvironmentVariableCollection>);
|
|
9
|
-
applyToProcessEnvironment(env: IProcessEnvironment, scope: EnvironmentVariableScope | undefined, variableResolver?: VariableResolver): Promise<void>;
|
|
10
|
-
private _encodeColons;
|
|
11
|
-
private blockPythonActivationVar;
|
|
12
|
-
diff(other: IMergedEnvironmentVariableCollection, scope: EnvironmentVariableScope | undefined): IMergedEnvironmentVariableCollectionDiff | undefined;
|
|
13
|
-
getVariableMap(scope: EnvironmentVariableScope | undefined): Map<string, IExtensionOwnedEnvironmentVariableMutator[]>;
|
|
14
|
-
getDescriptionMap(scope: EnvironmentVariableScope | undefined): Map<string, string | undefined>;
|
|
15
|
-
private populateDescriptionMap;
|
|
16
|
-
}
|
|
17
|
-
export {};
|