@opensumi/ide-terminal-next 3.5.1-next-1732847732.0 → 3.5.1-next-1733450080.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.
Files changed (14) hide show
  1. package/lib/browser/links/link-manager.d.ts +0 -2
  2. package/lib/browser/links/link-manager.d.ts.map +1 -1
  3. package/lib/browser/links/link-manager.js +4 -14
  4. package/lib/browser/links/link-manager.js.map +1 -1
  5. package/lib/common/environmentVariable.d.ts +0 -5
  6. package/lib/common/environmentVariable.d.ts.map +1 -1
  7. package/lib/common/environmentVariable.js.map +1 -1
  8. package/lib/common/environmentVariableCollection.d.ts.map +1 -1
  9. package/lib/common/environmentVariableCollection.js +11 -15
  10. package/lib/common/environmentVariableCollection.js.map +1 -1
  11. package/package.json +18 -18
  12. package/src/browser/links/link-manager.ts +5 -20
  13. package/src/common/environmentVariable.ts +0 -6
  14. package/src/common/environmentVariableCollection.ts +11 -14
package/lib/browser/links/link-manager.d.ts CHANGED
@@ -42,7 +42,6 @@ export declare class TerminalLinkManager extends Disposable {
42
42
  private _standardLinkProviders;
43
43
  private _standardLinkProvidersDisposables;
44
44
  private readonly injector;
45
- private readonly terminalService;
46
45
  private readonly _editorService;
47
46
  private readonly _openerService;
48
47
  private readonly _fileService;
@@ -52,7 +51,6 @@ export declare class TerminalLinkManager extends Disposable {
52
51
  private _getHomeDirPromise;
53
52
  constructor(_xterm: Terminal, _client: TerminalClient);
54
53
  set processCwd(processCwd: string);
55
- getTerminalCwd(): Promise<string | undefined>;
56
54
  private _registerStandardLinkProviders;
57
55
  private _tooltipCallback;
58
56
  private _showHover;
package/lib/browser/links/link-manager.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"link-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"link-manager.d.ts","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
package/lib/browser/links/link-manager.js CHANGED
@@ -48,11 +48,6 @@ 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
- }
56
51
  _registerStandardLinkProviders() {
57
52
  this._standardLinkProvidersDisposables.dispose();
58
53
  this._standardLinkProvidersDisposables = new ide_core_common_1.DisposableCollection();
@@ -208,15 +203,14 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
208
203
  link = this.osPath.join(userHome, link.substring(1));
209
204
  }
210
205
  else if (link.charAt(0) !== '/' && link.charAt(0) !== '~') {
211
- const cwd = await this.getTerminalCwd();
212
206
  // Resolve workspace path . | .. | <relative_path> -> <path>/. | <path>/.. | <path>/<relative_path>
213
207
  if (this._client.os === ide_core_common_1.OperatingSystem.Windows) {
214
208
  if (!link.match('^' + validated_local_link_provider_1.winDrivePrefix) && !link.startsWith('\\\\?\\')) {
215
- if (!cwd) {
209
+ if (!this._processCwd) {
216
210
  // Abort if no workspace is open
217
211
  return null;
218
212
  }
219
- link = this.osPath.join(cwd, link);
213
+ link = this.osPath.join(this._processCwd, link);
220
214
  }
221
215
  else {
222
216
  // Remove \\?\ from paths so that they share the same underlying
@@ -225,11 +219,11 @@ let TerminalLinkManager = class TerminalLinkManager extends ide_core_common_1.Di
225
219
  }
226
220
  }
227
221
  else {
228
- if (!cwd) {
222
+ if (!this._processCwd) {
229
223
  // Abort if no workspace is open
230
224
  return null;
231
225
  }
232
- link = this.osPath.join(cwd, link);
226
+ link = this.osPath.join(this._processCwd, link);
233
227
  }
234
228
  }
235
229
  link = this.osPath.normalize(link);
@@ -304,10 +298,6 @@ tslib_1.__decorate([
304
298
  (0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
305
299
  tslib_1.__metadata("design:type", di_1.Injector)
306
300
  ], 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);
311
301
  tslib_1.__decorate([
312
302
  (0, di_1.Autowired)(),
313
303
  tslib_1.__metadata("design:type", common_1.WorkbenchEditorService)
package/lib/browser/links/link-manager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"link-manager.js","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"link-manager.js","sourceRoot":"","sources":["../../../src/browser/links/link-manager.ts"],"names":[],"mappings":"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"}
package/lib/common/environmentVariable.d.ts CHANGED
@@ -75,13 +75,9 @@ export declare enum EnvironmentVariableMutatorType {
75
75
  Append = 2,
76
76
  Prepend = 3
77
77
  }
78
- export interface EnvironmentVariableMutatorOptions {
79
- applyAtProcessCreation?: boolean;
80
- }
81
78
  export interface EnvironmentVariableMutator {
82
79
  readonly value: string;
83
80
  readonly type: EnvironmentVariableMutatorType;
84
- readonly options: EnvironmentVariableMutatorOptions;
85
81
  }
86
82
  export interface ExtensionOwnedEnvironmentVariableMutator extends EnvironmentVariableMutator {
87
83
  readonly extensionIdentifier: string;
@@ -107,7 +103,6 @@ export type SerializableEnvironmentVariableCollection = [string, EnvironmentVari
107
103
  export interface IEnvironmentVariableMutator {
108
104
  readonly value: string;
109
105
  readonly type: EnvironmentVariableMutatorType;
110
- readonly options: EnvironmentVariableMutatorOptions;
111
106
  }
112
107
  /** [variable, mutator] */
113
108
  export type ISerializableEnvironmentVariableCollection = [string, IEnvironmentVariableMutator][];
package/lib/common/environmentVariable.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"environmentVariable.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"environmentVariable.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":"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"}
package/lib/common/environmentVariable.js.map CHANGED
@@ -1 +1 @@
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
+ {"version":3,"file":"environmentVariable.js","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":";;;AAkGA,4CASC;AA6CD,wFAIC;AAED,4FAIC;AAhKY,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;AAuCD,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"}
package/lib/common/environmentVariableCollection.d.ts.map CHANGED
@@ -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;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"}
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;IAgC9D,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;IA0BhB,IAAI,CAAC,KAAK,EAAE,oCAAoC,GAAG,wCAAwC,GAAG,SAAS;CAsCxG"}
package/lib/common/environmentVariableCollection.js CHANGED
@@ -33,7 +33,6 @@ class MergedEnvironmentVariableCollection {
33
33
  extensionIdentifier,
34
34
  value: mutator.value,
35
35
  type: mutator.type,
36
- options: mutator.options,
37
36
  });
38
37
  next = it.next();
39
38
  }
@@ -48,20 +47,17 @@ class MergedEnvironmentVariableCollection {
48
47
  this.map.forEach((mutators, variable) => {
49
48
  const actualVariable = os === ide_core_common_1.OperatingSystem.Windows ? lowerToActualVariableNames[variable.toLowerCase()] || variable : variable;
50
49
  mutators.forEach(async (mutator) => {
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
- }
50
+ const value = variableResolver ? await variableResolver(mutator.value) : mutator.value;
51
+ switch (mutator.type) {
52
+ case environmentVariable_1.EnvironmentVariableMutatorType.Append:
53
+ env[actualVariable] = (env[actualVariable] || '') + value;
54
+ break;
55
+ case environmentVariable_1.EnvironmentVariableMutatorType.Prepend:
56
+ env[actualVariable] = value + (env[actualVariable] || '');
57
+ break;
58
+ case environmentVariable_1.EnvironmentVariableMutatorType.Replace:
59
+ env[actualVariable] = value;
60
+ break;
65
61
  }
66
62
  });
67
63
  });
package/lib/common/environmentVariableCollection.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"environmentVariableCollection.js","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":"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"}
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.5.1-next-1732847732.0",
3
+ "version": "3.5.1-next-1733450080.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.5.1-next-1732847732.0",
21
- "@opensumi/ide-core-common": "3.5.1-next-1732847732.0",
22
- "@opensumi/ide-core-node": "3.5.1-next-1732847732.0",
23
- "@opensumi/ide-file-service": "3.5.1-next-1732847732.0",
24
- "@opensumi/ide-utils": "3.5.1-next-1732847732.0",
20
+ "@opensumi/ide-connection": "3.5.1-next-1733450080.0",
21
+ "@opensumi/ide-core-common": "3.5.1-next-1733450080.0",
22
+ "@opensumi/ide-core-node": "3.5.1-next-1733450080.0",
23
+ "@opensumi/ide-file-service": "3.5.1-next-1733450080.0",
24
+ "@opensumi/ide-utils": "3.5.1-next-1733450080.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.5.1-next-1732847732.0",
35
- "@opensumi/ide-core-browser": "3.5.1-next-1732847732.0",
36
- "@opensumi/ide-dev-tool": "3.5.1-next-1732847732.0",
37
- "@opensumi/ide-editor": "3.5.1-next-1732847732.0",
38
- "@opensumi/ide-main-layout": "3.5.1-next-1732847732.0",
39
- "@opensumi/ide-monaco": "3.5.1-next-1732847732.0",
40
- "@opensumi/ide-overlay": "3.5.1-next-1732847732.0",
41
- "@opensumi/ide-status-bar": "3.5.1-next-1732847732.0",
42
- "@opensumi/ide-theme": "3.5.1-next-1732847732.0",
43
- "@opensumi/ide-variable": "3.5.1-next-1732847732.0",
44
- "@opensumi/ide-workspace": "3.5.1-next-1732847732.0",
34
+ "@opensumi/ide-components": "3.5.1-next-1733450080.0",
35
+ "@opensumi/ide-core-browser": "3.5.1-next-1733450080.0",
36
+ "@opensumi/ide-dev-tool": "3.5.1-next-1733450080.0",
37
+ "@opensumi/ide-editor": "3.5.1-next-1733450080.0",
38
+ "@opensumi/ide-main-layout": "3.5.1-next-1733450080.0",
39
+ "@opensumi/ide-monaco": "3.5.1-next-1733450080.0",
40
+ "@opensumi/ide-overlay": "3.5.1-next-1733450080.0",
41
+ "@opensumi/ide-status-bar": "3.5.1-next-1733450080.0",
42
+ "@opensumi/ide-theme": "3.5.1-next-1733450080.0",
43
+ "@opensumi/ide-variable": "3.5.1-next-1733450080.0",
44
+ "@opensumi/ide-workspace": "3.5.1-next-1733450080.0",
45
45
  "@types/http-proxy": "^1.17.2",
46
46
  "http-proxy": "^1.18.0"
47
47
  },
48
- "gitHead": "fc4ad0d13ee8e3b0553fff08c7831719e88003b2"
48
+ "gitHead": "2bb6c3cd531bf64c59eb296c7f265a740d56d943"
49
49
  }
package/src/browser/links/link-manager.ts CHANGED
@@ -19,12 +19,7 @@ import {
19
19
  import { WorkbenchEditorService } from '@opensumi/ide-editor/lib/common';
20
20
  import { IFileServiceClient } from '@opensumi/ide-file-service';
21
21
 
22
- import {
23
- ITerminalClient,
24
- ITerminalExternalLinkProvider,
25
- ITerminalHoverManagerService,
26
- ITerminalService,
27
- } from '../../common';
22
+ import { ITerminalClient, ITerminalExternalLinkProvider, ITerminalHoverManagerService } from '../../common';
28
23
  import { XTermCore } from '../../common/xterm-private';
29
24
  import { TerminalClient } from '../terminal.client';
30
25
 
@@ -89,9 +84,6 @@ export class TerminalLinkManager extends Disposable {
89
84
  @Autowired(INJECTOR_TOKEN)
90
85
  private readonly injector: Injector;
91
86
 
92
- @Autowired(ITerminalService)
93
- private readonly terminalService: ITerminalService;
94
-
95
87
  @Autowired()
96
88
  private readonly _editorService: WorkbenchEditorService;
97
89
 
@@ -143,12 +135,6 @@ export class TerminalLinkManager extends Disposable {
143
135
  this._processCwd = processCwd;
144
136
  }
145
137
 
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
-
152
138
  private _registerStandardLinkProviders(): void {
153
139
  this._standardLinkProvidersDisposables.dispose();
154
140
  this._standardLinkProvidersDisposables = new DisposableCollection();
@@ -342,26 +328,25 @@ export class TerminalLinkManager extends Disposable {
342
328
  }
343
329
  link = this.osPath.join(userHome, link.substring(1));
344
330
  } else if (link.charAt(0) !== '/' && link.charAt(0) !== '~') {
345
- const cwd = await this.getTerminalCwd();
346
331
  // Resolve workspace path . | .. | <relative_path> -> <path>/. | <path>/.. | <path>/<relative_path>
347
332
  if (this._client.os === OperatingSystem.Windows) {
348
333
  if (!link.match('^' + winDrivePrefix) && !link.startsWith('\\\\?\\')) {
349
- if (!cwd) {
334
+ if (!this._processCwd) {
350
335
  // Abort if no workspace is open
351
336
  return null;
352
337
  }
353
- link = this.osPath.join(cwd, link);
338
+ link = this.osPath.join(this._processCwd, link);
354
339
  } else {
355
340
  // Remove \\?\ from paths so that they share the same underlying
356
341
  // uri and don't open multiple tabs for the same file
357
342
  link = link.replace(/^\\\\\?\\/, '');
358
343
  }
359
344
  } else {
360
- if (!cwd) {
345
+ if (!this._processCwd) {
361
346
  // Abort if no workspace is open
362
347
  return null;
363
348
  }
364
- link = this.osPath.join(cwd, link);
349
+ link = this.osPath.join(this._processCwd, link);
365
350
  }
366
351
  }
367
352
  link = this.osPath.normalize(link);
package/src/common/environmentVariable.ts CHANGED
@@ -113,14 +113,9 @@ export enum EnvironmentVariableMutatorType {
113
113
  Prepend = 3,
114
114
  }
115
115
 
116
- export interface EnvironmentVariableMutatorOptions {
117
- applyAtProcessCreation?: boolean;
118
- }
119
-
120
116
  export interface EnvironmentVariableMutator {
121
117
  readonly value: string;
122
118
  readonly type: EnvironmentVariableMutatorType;
123
- readonly options: EnvironmentVariableMutatorOptions;
124
119
  }
125
120
 
126
121
  export interface ExtensionOwnedEnvironmentVariableMutator extends EnvironmentVariableMutator {
@@ -150,7 +145,6 @@ export type SerializableEnvironmentVariableCollection = [string, EnvironmentVari
150
145
  export interface IEnvironmentVariableMutator {
151
146
  readonly value: string;
152
147
  readonly type: EnvironmentVariableMutatorType;
153
- readonly options: EnvironmentVariableMutatorOptions;
154
148
  }
155
149
 
156
150
  /** [variable, mutator] */
package/src/common/environmentVariableCollection.ts CHANGED
@@ -42,7 +42,6 @@ export class MergedEnvironmentVariableCollection implements IMergedEnvironmentVa
42
42
  extensionIdentifier,
43
43
  value: mutator.value,
44
44
  type: mutator.type,
45
- options: mutator.options,
46
45
  });
47
46
 
48
47
  next = it.next();
@@ -64,19 +63,17 @@ export class MergedEnvironmentVariableCollection implements IMergedEnvironmentVa
64
63
  const actualVariable =
65
64
  os === OperatingSystem.Windows ? lowerToActualVariableNames![variable.toLowerCase()] || variable : variable;
66
65
  mutators.forEach(async (mutator) => {
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
- }
66
+ const value = variableResolver ? await variableResolver(mutator.value) : mutator.value;
67
+ switch (mutator.type) {
68
+ case EnvironmentVariableMutatorType.Append:
69
+ env[actualVariable] = (env[actualVariable] || '') + value;
70
+ break;
71
+ case EnvironmentVariableMutatorType.Prepend:
72
+ env[actualVariable] = value + (env[actualVariable] || '');
73
+ break;
74
+ case EnvironmentVariableMutatorType.Replace:
75
+ env[actualVariable] = value;
76
+ break;
80
77
  }
81
78
  });
82
79
  });