Skip to content

Commit fb4dd1a

Browse files
committed
Try ONLY applyAtShellintegration
1 parent bcd5920 commit fb4dd1a

File tree

1 file changed

+9
-9
lines changed
  • src/client/terminals/envCollectionActivation

1 file changed

+9
-9
lines changed

src/client/terminals/envCollectionActivation/service.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
246246
if (key === 'PATH') {
247247
// perhaps PATH is getting messed up
248248
const options = {
249-
applyAtShellIntegration: false,
250-
applyAtProcessCreation: true,
249+
applyAtShellIntegration: true,
250+
applyAtProcessCreation: false,
251251
};
252252
if (processEnv.PATH && env.PATH?.endsWith(processEnv.PATH)) {
253253
// Prefer prepending to PATH instead of replacing it, as we do not want to replace any
@@ -279,8 +279,8 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
279279
return;
280280
}
281281
const options = {
282-
applyAtShellIntegration: false,
283-
applyAtProcessCreation: true,
282+
applyAtShellIntegration: true,
283+
applyAtProcessCreation: false,
284284
};
285285
traceLog(
286286
`Setting environment variable ${key} in collection to ${value} ${JSON.stringify(options)}`,
@@ -410,7 +410,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
410410
envVarCollection.replace(
411411
'PATH',
412412
`${path.dirname(interpreter.path)}${path.delimiter}${process.env[pathVarName]}`,
413-
{ applyAtShellIntegration: false, applyAtProcessCreation: true },
413+
{ applyAtShellIntegration: true, applyAtProcessCreation: false },
414414
);
415415
return;
416416
}
@@ -427,12 +427,12 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
427427
// TODO: Stop prepending altogether once https://github.com/microsoft/vscode/issues/145234 is available.
428428
return isActive
429429
? {
430-
applyAtShellIntegration: false,
431-
applyAtProcessCreation: true,
430+
applyAtShellIntegration: true,
431+
applyAtProcessCreation: false,
432432
}
433433
: {
434-
applyAtShellIntegration: false, // Takes care of false negatives in case manual integration is being used.
435-
applyAtProcessCreation: true,
434+
applyAtShellIntegration: true, // Update for consistency with the previous edits
435+
applyAtProcessCreation: false, // Update for consistency with the previous edits
436436
};
437437
}
438438

0 commit comments

Comments
 (0)