Skip to content

Commit 65812c9

Browse files
committed
disable applyAtShellIntegration entirely
1 parent 738dece commit 65812c9

File tree

1 file changed

+6
-5
lines changed
  • src/client/terminals/envCollectionActivation

1 file changed

+6
-5
lines changed

src/client/terminals/envCollectionActivation/service.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,9 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
244244
return;
245245
}
246246
if (key === 'PATH') {
247+
// perhaps PATH is getting messed up
247248
const options = {
248-
applyAtShellIntegration: true,
249+
applyAtShellIntegration: false,
249250
applyAtProcessCreation: true,
250251
};
251252
if (processEnv.PATH && env.PATH?.endsWith(processEnv.PATH)) {
@@ -278,7 +279,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
278279
return;
279280
}
280281
const options = {
281-
applyAtShellIntegration: true,
282+
applyAtShellIntegration: false,
282283
applyAtProcessCreation: true,
283284
};
284285
traceLog(
@@ -409,7 +410,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
409410
envVarCollection.replace(
410411
'PATH',
411412
`${path.dirname(interpreter.path)}${path.delimiter}${process.env[pathVarName]}`,
412-
{ applyAtShellIntegration: true, applyAtProcessCreation: true },
413+
{ applyAtShellIntegration: false, applyAtProcessCreation: true },
413414
);
414415
return;
415416
}
@@ -426,11 +427,11 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
426427
// TODO: Stop prepending altogether once https://github.com/microsoft/vscode/issues/145234 is available.
427428
return isActive
428429
? {
429-
applyAtShellIntegration: true,
430+
applyAtShellIntegration: false,
430431
applyAtProcessCreation: false,
431432
}
432433
: {
433-
applyAtShellIntegration: true, // Takes care of false negatives in case manual integration is being used.
434+
applyAtShellIntegration: false, // Takes care of false negatives in case manual integration is being used.
434435
applyAtProcessCreation: true,
435436
};
436437
}

0 commit comments

Comments
 (0)