@opensumi/ide-terminal-next 3.5.1-next-1733469232.0 → 3.6.1-next-1733711618.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/lib/browser/links/link-manager.d.ts +2 -0
- package/lib/browser/links/link-manager.d.ts.map +1 -1
- package/lib/browser/links/link-manager.js +14 -4
- package/lib/browser/links/link-manager.js.map +1 -1
- package/lib/common/environmentVariable.d.ts +5 -0
- package/lib/common/environmentVariable.d.ts.map +1 -1
- package/lib/common/environmentVariable.js.map +1 -1
- package/lib/common/environmentVariableCollection.d.ts.map +1 -1
- package/lib/common/environmentVariableCollection.js +15 -11
- package/lib/common/environmentVariableCollection.js.map +1 -1
- package/package.json +18 -18
- package/src/browser/links/link-manager.ts +20 -5
- package/src/common/environmentVariable.ts +6 -0
- package/src/common/environmentVariableCollection.ts +14 -11
|
@@ -42,6 +42,7 @@ export declare class TerminalLinkManager extends Disposable {
|
|
|
42
42
|
private _standardLinkProviders;
|
|
43
43
|
private _standardLinkProvidersDisposables;
|
|
44
44
|
private readonly injector;
|
|
45
|
+
private readonly terminalService;
|
|
45
46
|
private readonly _editorService;
|
|
46
47
|
private readonly _openerService;
|
|
47
48
|
private readonly _fileService;
|
|
@@ -51,6 +52,7 @@ export declare class TerminalLinkManager extends Disposable {
|
|
|
51
52
|
private _getHomeDirPromise;
|
|
52
53
|
constructor(_xterm: Terminal, _client: TerminalClient);
|
|
53
54
|
set processCwd(processCwd: string);
|
|
55
|
+
getTerminalCwd(): Promise<string | undefined>;
|
|
54
56
|
private _registerStandardLinkProviders;
|
|
55
57
|
private _tooltipCallback;
|
|
56
58
|
private _showHover;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,cAAc,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIvE,OAAO,EACL,UAAU,EAGV,WAAW,EASZ,MAAM,2BAA2B,CAAC;AAInC,OAAO,
|
|
1
|
+
{"version":3,"file":"link-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,11 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
48
48
|
set processCwd(processCwd) {
|
|
49
49
|
this._processCwd = processCwd;
|
|
50
50
|
}
|
|
51
|
+
// user may change the terminal cwd, so we need to get it from the service
|
|
52
|
+
async getTerminalCwd() {
|
|
53
|
+
const cwd = await this.terminalService.getCwd(this._client.id);
|
|
54
|
+
return cwd || this._processCwd;
|
|
55
|
+
}
|
|
51
56
|
_registerStandardLinkProviders() {
|
|
52
57
|
this._standardLinkProvidersDisposables.dispose();
|
|
53
58
|
this._standardLinkProvidersDisposables = new ide_core_common_1.DisposableCollection();
|
|
@@ -203,14 +208,15 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
203
208
|
link = this.osPath.join(userHome, link.substring(1));
|
|
204
209
|
}
|
|
205
210
|
else if (link.charAt(0) !== '/' && link.charAt(0) !== '~') {
|
|
211
|
+
const cwd = await this.getTerminalCwd();
|
|
206
212
|
// Resolve workspace path . | .. | <relative_path> -> <path>/. | <path>/.. | <path>/<relative_path>
|
|
207
213
|
if (this._client.os === ide_core_common_1.OperatingSystem.Windows) {
|
|
208
214
|
if (!link.match('^' + validated_local_link_provider_1.winDrivePrefix) && !link.startsWith('\\\\?\\')) {
|
|
209
|
-
if (!
|
|
215
|
+
if (!cwd) {
|
|
210
216
|
// Abort if no workspace is open
|
|
211
217
|
return null;
|
|
212
218
|
}
|
|
213
|
-
link = this.osPath.join(
|
|
219
|
+
link = this.osPath.join(cwd, link);
|
|
214
220
|
}
|
|
215
221
|
else {
|
|
216
222
|
// Remove \\?\ from paths so that they share the same underlying
|
|
@@ -219,11 +225,11 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
|
|
|
219
225
|
}
|
|
220
226
|
}
|
|
221
227
|
else {
|
|
222
|
-
if (!
|
|
228
|
+
if (!cwd) {
|
|
223
229
|
// Abort if no workspace is open
|
|
224
230
|
return null;
|
|
225
231
|
}
|
|
226
|
-
link = this.osPath.join(
|
|
232
|
+
link = this.osPath.join(cwd, link);
|
|
227
233
|
}
|
|
228
234
|
}
|
|
229
235
|
link = this.osPath.normalize(link);
|
|
@@ -298,6 +304,10 @@ tslib_1.__decorate([
|
|
|
298
304
|
(0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
|
|
299
305
|
tslib_1.__metadata("design:type", di_1.Injector)
|
|
300
306
|
], TerminalLinkManager.prototype, "injector", void 0);
|
|
307
|
+
tslib_1.__decorate([
|
|
308
|
+
(0, di_1.Autowired)(common_2.ITerminalService),
|
|
309
|
+
tslib_1.__metadata("design:type", Object)
|
|
310
|
+
], TerminalLinkManager.prototype, "terminalService", void 0);
|
|
301
311
|
tslib_1.__decorate([
|
|
302
312
|
(0, di_1.Autowired)(),
|
|
303
313
|
tslib_1.__metadata("design:type", common_1.WorkbenchEditorService)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-manager.js","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":";;;;AAAA,wCAAuE;AAEvE,qCAA+E;AAC/E,iEAA+E;AAC/E,+DAamC;AACnC,4DAAyE;AACzE,iEAAgE;AAEhE,
|
|
1
|
+
{"version":3,"file":"link-manager.js","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,9 +75,13 @@ export declare enum EnvironmentVariableMutatorType {
|
|
|
75
75
|
Append = 2,
|
|
76
76
|
Prepend = 3
|
|
77
77
|
}
|
|
78
|
+
export interface EnvironmentVariableMutatorOptions {
|
|
79
|
+
applyAtProcessCreation?: boolean;
|
|
80
|
+
}
|
|
78
81
|
export interface EnvironmentVariableMutator {
|
|
79
82
|
readonly value: string;
|
|
80
83
|
readonly type: EnvironmentVariableMutatorType;
|
|
84
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
81
85
|
}
|
|
82
86
|
export interface ExtensionOwnedEnvironmentVariableMutator extends EnvironmentVariableMutator {
|
|
83
87
|
readonly extensionIdentifier: string;
|
|
@@ -103,6 +107,7 @@ export type SerializableEnvironmentVariableCollection = [string, EnvironmentVari
|
|
|
103
107
|
export interface IEnvironmentVariableMutator {
|
|
104
108
|
readonly value: string;
|
|
105
109
|
readonly type: EnvironmentVariableMutatorType;
|
|
110
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
106
111
|
}
|
|
107
112
|
/** [variable, mutator] */
|
|
108
113
|
export type ISerializableEnvironmentVariableCollection = [string, IEnvironmentVariableMutator][];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariable.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAExF,eAAO,MAAM,+BAA+B,eAA4C,CAAC;AAOzF;;;;GAIG;AAEH,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,6CAA8C,SAAQ,8BAA8B;IACnG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,yCAA0C,SAAQ,2BAA2B;IAC5F,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,wCAAwC;IACvD,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;IACxE,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;IAC1E,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;CAC3E;AAED;;;GAGG;AACH,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;IAE/E;;;;OAIG;IACH,yBAAyB,CACvB,GAAG,EAAE,mBAAmB,EACxB,EAAE,EAAE,eAAe,EACnB,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,GACtD,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,oCAAoC,GAAG,wCAAwC,GAAG,SAAS,CAAC;CACzG;AAED,MAAM,WAAW,2BAA2B;IAC1C,kCAAkC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;IAE1E;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,EAAE,oCAAoC,GAAG,SAAS,CAAC;IAE5E;;;OAGG;IACH,sBAAsB,EAAE,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAEpE;;OAEG;IACH,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,UAAU,EAAE,8BAA8B,GAAG,IAAI,CAAC;IAEnF;;OAEG;IACH,MAAM,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,4CAA6C,SAAQ,6BAA6B;IACjG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAS9G;AAED,oBAAY,8BAA8B;IACxC,OAAO,IAAI;IACX,MAAM,IAAI;IACV,OAAO,IAAI;CACZ;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"environmentVariable.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariable.js","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":";;;AAkGA,4CASC;
|
|
1
|
+
{"version":3,"file":"environmentVariable.js","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":";;;AAkGA,4CASC;AAmDD,wFAIC;AAED,4FAIC;AAtKY,QAAA,+BAA+B,GAAG,MAAM,CAAC,iCAAiC,CAAC,CAAC;AAgGzF,SAAgB,gBAAgB,CAAC,IAAoC,EAAE,KAAa,EAAE,QAAgB;IACpG,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,8BAA8B,CAAC,OAAO;YACzC,OAAO,GAAG,QAAQ,IAAI,KAAK,UAAU,QAAQ,GAAG,CAAC;QACnD,KAAK,8BAA8B,CAAC,MAAM;YACxC,OAAO,GAAG,QAAQ,WAAW,QAAQ,IAAI,KAAK,EAAE,CAAC;QACnD;YACE,OAAO,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAClC,CAAC;AACH,CAAC;AAED,IAAY,8BAIX;AAJD,WAAY,8BAA8B;IACxC,yFAAW,CAAA;IACX,uFAAU,CAAA;IACV,yFAAW,CAAA;AACb,CAAC,EAJW,8BAA8B,8CAA9B,8BAA8B,QAIzC;AA6CD,SAAgB,sCAAsC,CACpD,UAA4D;IAE5D,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;AACnC,CAAC;AAED,SAAgB,wCAAwC,CACtD,oBAA+D;IAE/D,OAAO,IAAI,GAAG,CAAsC,oBAAoB,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariableCollection.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjF,OAAO,EAEL,8BAA8B,EAC9B,yCAAyC,EACzC,oCAAoC,EACpC,wCAAwC,EACzC,MAAM,uBAAuB,CAAC;AAC/B,qBAAa,mCAAoC,YAAW,oCAAoC;IAC9F,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAa;gBAEvE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"environmentVariableCollection.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjF,OAAO,EAEL,8BAA8B,EAC9B,yCAAyC,EACzC,oCAAoC,EACpC,wCAAwC,EACzC,MAAM,uBAAuB,CAAC;AAC/B,qBAAa,mCAAoC,YAAW,oCAAoC;IAC9F,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAa;gBAEvE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAiC9D,yBAAyB,CAC7B,GAAG,EAAE,mBAAmB,EACxB,EAAE,EAAE,eAAe,EACnB,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAClD,OAAO,CAAC,IAAI,CAAC;IA4BhB,IAAI,CAAC,KAAK,EAAE,oCAAoC,GAAG,wCAAwC,GAAG,SAAS;CAsCxG"}
|
|
@@ -33,6 +33,7 @@ class MergedEnvironmentVariableCollection {
|
|
|
33
33
|
extensionIdentifier,
|
|
34
34
|
value: mutator.value,
|
|
35
35
|
type: mutator.type,
|
|
36
|
+
options: mutator.options,
|
|
36
37
|
});
|
|
37
38
|
next = it.next();
|
|
38
39
|
}
|
|
@@ -47,17 +48,20 @@ class MergedEnvironmentVariableCollection {
|
|
|
47
48
|
this.map.forEach((mutators, variable) => {
|
|
48
49
|
const actualVariable = os === ide_core_common_1.OperatingSystem.Windows ? lowerToActualVariableNames[variable.toLowerCase()] || variable : variable;
|
|
49
50
|
mutators.forEach(async (mutator) => {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
51
|
+
var _a, _b;
|
|
52
|
+
if ((_b = (_a = mutator.options) === null || _a === void 0 ? void 0 : _a.applyAtProcessCreation) !== null && _b !== void 0 ? _b : true) {
|
|
53
|
+
const value = variableResolver ? await variableResolver(mutator.value) : mutator.value;
|
|
54
|
+
switch (mutator.type) {
|
|
55
|
+
case environmentVariable_1.EnvironmentVariableMutatorType.Append:
|
|
56
|
+
env[actualVariable] = (env[actualVariable] || '') + value;
|
|
57
|
+
break;
|
|
58
|
+
case environmentVariable_1.EnvironmentVariableMutatorType.Prepend:
|
|
59
|
+
env[actualVariable] = value + (env[actualVariable] || '');
|
|
60
|
+
break;
|
|
61
|
+
case environmentVariable_1.EnvironmentVariableMutatorType.Replace:
|
|
62
|
+
env[actualVariable] = value;
|
|
63
|
+
break;
|
|
64
|
+
}
|
|
61
65
|
}
|
|
62
66
|
});
|
|
63
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariableCollection.js","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,+JAA+J;AAE/J,+DAAiF;AAEjF,+DAM+B;AAC/B,MAAa,mCAAmC;IAG9C,YAAY,WAAwD;QAF3D,QAAG,GAA6D,IAAI,GAAG,EAAE,CAAC;QAGjF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,mBAAmB,EAAE,EAAE;YACtD,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACnC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,KAAK,GAAG,EAAE,CAAC;oBACX,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBAChC,CAAC;gBAED,mFAAmF;gBACnF,iCAAiC;gBACjC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oDAA8B,CAAC,OAAO,EAAE,CAAC;oBACjF,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;oBACjB,SAAS;gBACX,CAAC;gBAED,kEAAkE;gBAClE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9B,KAAK,CAAC,OAAO,CAAC;oBACZ,mBAAmB;oBACnB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,IAAI,EAAE,OAAO,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"environmentVariableCollection.js","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-terminal-next",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.6.1-next-1733711618.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "3.
|
|
21
|
-
"@opensumi/ide-core-common": "3.
|
|
22
|
-
"@opensumi/ide-core-node": "3.
|
|
23
|
-
"@opensumi/ide-file-service": "3.
|
|
24
|
-
"@opensumi/ide-utils": "3.
|
|
20
|
+
"@opensumi/ide-connection": "3.6.1-next-1733711618.0",
|
|
21
|
+
"@opensumi/ide-core-common": "3.6.1-next-1733711618.0",
|
|
22
|
+
"@opensumi/ide-core-node": "3.6.1-next-1733711618.0",
|
|
23
|
+
"@opensumi/ide-file-service": "3.6.1-next-1733711618.0",
|
|
24
|
+
"@opensumi/ide-utils": "3.6.1-next-1733711618.0",
|
|
25
25
|
"@xterm/addon-canvas": "0.7.0",
|
|
26
26
|
"@xterm/addon-fit": "0.10.0",
|
|
27
27
|
"@xterm/addon-search": "0.15.0",
|
|
@@ -31,19 +31,19 @@
|
|
|
31
31
|
"os-locale": "^4.0.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@opensumi/ide-components": "3.
|
|
35
|
-
"@opensumi/ide-core-browser": "3.
|
|
36
|
-
"@opensumi/ide-dev-tool": "3.
|
|
37
|
-
"@opensumi/ide-editor": "3.
|
|
38
|
-
"@opensumi/ide-main-layout": "3.
|
|
39
|
-
"@opensumi/ide-monaco": "3.
|
|
40
|
-
"@opensumi/ide-overlay": "3.
|
|
41
|
-
"@opensumi/ide-status-bar": "3.
|
|
42
|
-
"@opensumi/ide-theme": "3.
|
|
43
|
-
"@opensumi/ide-variable": "3.
|
|
44
|
-
"@opensumi/ide-workspace": "3.
|
|
34
|
+
"@opensumi/ide-components": "3.6.1-next-1733711618.0",
|
|
35
|
+
"@opensumi/ide-core-browser": "3.6.1-next-1733711618.0",
|
|
36
|
+
"@opensumi/ide-dev-tool": "3.6.1-next-1733711618.0",
|
|
37
|
+
"@opensumi/ide-editor": "3.6.1-next-1733711618.0",
|
|
38
|
+
"@opensumi/ide-main-layout": "3.6.1-next-1733711618.0",
|
|
39
|
+
"@opensumi/ide-monaco": "3.6.1-next-1733711618.0",
|
|
40
|
+
"@opensumi/ide-overlay": "3.6.1-next-1733711618.0",
|
|
41
|
+
"@opensumi/ide-status-bar": "3.6.1-next-1733711618.0",
|
|
42
|
+
"@opensumi/ide-theme": "3.6.1-next-1733711618.0",
|
|
43
|
+
"@opensumi/ide-variable": "3.6.1-next-1733711618.0",
|
|
44
|
+
"@opensumi/ide-workspace": "3.6.1-next-1733711618.0",
|
|
45
45
|
"@types/http-proxy": "^1.17.2",
|
|
46
46
|
"http-proxy": "^1.18.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "4dc6a9f13d56a9e06bd7b97e70127902d485be1a"
|
|
49
49
|
}
|
|
@@ -19,7 +19,12 @@ import {
|
|
|
19
19
|
import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common';
|
|
20
20
|
import { IFileServiceClient } from '@opensumi/ide-file-service';
|
|
21
21
|
|
|
22
|
-
import {
|
|
22
|
+
import {
|
|
23
|
+
ITerminalClient,
|
|
24
|
+
ITerminalExternalLinkProvider,
|
|
25
|
+
ITerminalHoverManagerService,
|
|
26
|
+
ITerminalService,
|
|
27
|
+
} from '../../common';
|
|
23
28
|
import { XTermCore } from '../../common/xterm-private';
|
|
24
29
|
import { TerminalClient } from '../terminal.client';
|
|
25
30
|
|
|
@@ -84,6 +89,9 @@ export class TerminalLinkManager extends Disposable {
|
|
|
84
89
|
@Autowired(INJECTOR_TOKEN)
|
|
85
90
|
private readonly injector: Injector;
|
|
86
91
|
|
|
92
|
+
@Autowired(ITerminalService)
|
|
93
|
+
private readonly terminalService: ITerminalService;
|
|
94
|
+
|
|
87
95
|
@Autowired()
|
|
88
96
|
private readonly _editorService: WorkbenchEditorService;
|
|
89
97
|
|
|
@@ -135,6 +143,12 @@ export class TerminalLinkManager extends Disposable {
|
|
|
135
143
|
this._processCwd = processCwd;
|
|
136
144
|
}
|
|
137
145
|
|
|
146
|
+
// user may change the terminal cwd, so we need to get it from the service
|
|
147
|
+
async getTerminalCwd() {
|
|
148
|
+
const cwd = await this.terminalService.getCwd(this._client.id);
|
|
149
|
+
return cwd || this._processCwd;
|
|
150
|
+
}
|
|
151
|
+
|
|
138
152
|
private _registerStandardLinkProviders(): void {
|
|
139
153
|
this._standardLinkProvidersDisposables.dispose();
|
|
140
154
|
this._standardLinkProvidersDisposables = new DisposableCollection();
|
|
@@ -328,25 +342,26 @@ export class TerminalLinkManager extends Disposable {
|
|
|
328
342
|
}
|
|
329
343
|
link = this.osPath.join(userHome, link.substring(1));
|
|
330
344
|
} else if (link.charAt(0) !== '/' && link.charAt(0) !== '~') {
|
|
345
|
+
const cwd = await this.getTerminalCwd();
|
|
331
346
|
// Resolve workspace path . | .. | <relative_path> -> <path>/. | <path>/.. | <path>/<relative_path>
|
|
332
347
|
if (this._client.os === OperatingSystem.Windows) {
|
|
333
348
|
if (!link.match('^' + winDrivePrefix) && !link.startsWith('\\\\?\\')) {
|
|
334
|
-
if (!
|
|
349
|
+
if (!cwd) {
|
|
335
350
|
// Abort if no workspace is open
|
|
336
351
|
return null;
|
|
337
352
|
}
|
|
338
|
-
link = this.osPath.join(
|
|
353
|
+
link = this.osPath.join(cwd, link);
|
|
339
354
|
} else {
|
|
340
355
|
// Remove \\?\ from paths so that they share the same underlying
|
|
341
356
|
// uri and don't open multiple tabs for the same file
|
|
342
357
|
link = link.replace(/^\\\\\?\\/, '');
|
|
343
358
|
}
|
|
344
359
|
} else {
|
|
345
|
-
if (!
|
|
360
|
+
if (!cwd) {
|
|
346
361
|
// Abort if no workspace is open
|
|
347
362
|
return null;
|
|
348
363
|
}
|
|
349
|
-
link = this.osPath.join(
|
|
364
|
+
link = this.osPath.join(cwd, link);
|
|
350
365
|
}
|
|
351
366
|
}
|
|
352
367
|
link = this.osPath.normalize(link);
|
|
@@ -113,9 +113,14 @@ export enum EnvironmentVariableMutatorType {
|
|
|
113
113
|
Prepend = 3,
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
+
export interface EnvironmentVariableMutatorOptions {
|
|
117
|
+
applyAtProcessCreation?: boolean;
|
|
118
|
+
}
|
|
119
|
+
|
|
116
120
|
export interface EnvironmentVariableMutator {
|
|
117
121
|
readonly value: string;
|
|
118
122
|
readonly type: EnvironmentVariableMutatorType;
|
|
123
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
119
124
|
}
|
|
120
125
|
|
|
121
126
|
export interface ExtensionOwnedEnvironmentVariableMutator extends EnvironmentVariableMutator {
|
|
@@ -145,6 +150,7 @@ export type SerializableEnvironmentVariableCollection = [string, EnvironmentVari
|
|
|
145
150
|
export interface IEnvironmentVariableMutator {
|
|
146
151
|
readonly value: string;
|
|
147
152
|
readonly type: EnvironmentVariableMutatorType;
|
|
153
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
148
154
|
}
|
|
149
155
|
|
|
150
156
|
/** [variable, mutator] */
|
|
@@ -42,6 +42,7 @@ export class MergedEnvironmentVariableCollection implements IMergedEnvironmentVa
|
|
|
42
42
|
extensionIdentifier,
|
|
43
43
|
value: mutator.value,
|
|
44
44
|
type: mutator.type,
|
|
45
|
+
options: mutator.options,
|
|
45
46
|
});
|
|
46
47
|
|
|
47
48
|
next = it.next();
|
|
@@ -63,17 +64,19 @@ export class MergedEnvironmentVariableCollection implements IMergedEnvironmentVa
|
|
|
63
64
|
const actualVariable =
|
|
64
65
|
os === OperatingSystem.Windows ? lowerToActualVariableNames![variable.toLowerCase()] || variable : variable;
|
|
65
66
|
mutators.forEach(async (mutator) => {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
67
|
+
if (mutator.options?.applyAtProcessCreation ?? true) {
|
|
68
|
+
const value = variableResolver ? await variableResolver(mutator.value) : mutator.value;
|
|
69
|
+
switch (mutator.type) {
|
|
70
|
+
case EnvironmentVariableMutatorType.Append:
|
|
71
|
+
env[actualVariable] = (env[actualVariable] || '') + value;
|
|
72
|
+
break;
|
|
73
|
+
case EnvironmentVariableMutatorType.Prepend:
|
|
74
|
+
env[actualVariable] = value + (env[actualVariable] || '');
|
|
75
|
+
break;
|
|
76
|
+
case EnvironmentVariableMutatorType.Replace:
|
|
77
|
+
env[actualVariable] = value;
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
77
80
|
}
|
|
78
81
|
});
|
|
79
82
|
});
|