Skip to content

Improvements to pythonTerminalEnvVarActivation experiment #21751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kartik Raj (karrtikr) merged 16 commits into from
Aug 4, 2023
Merged

Improvements to pythonTerminalEnvVarActivation experiment #21751

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9ba5b3d
Revert "Dev Container for VS Code Python Extension (#21435)"
Jul 11, 2023
d39baec
Improve how to get process env variables
Jul 24, 2023
2092cea
Fix activation for powershell
Jul 26, 2023
43e5f6d
Correctly apply PS1
Jul 26, 2023
f6a14bb
Change how we fetch previously set env vars
Aug 3, 2023
6ed78a3
Revert "Revert "Dev Container for VS Code Python Extension (#21435)""
Aug 3, 2023
4600492
Fix
Aug 3, 2023
85c0d32
FIX LINT
Aug 3, 2023
7ceee81
Clear env collection if activate terminal setting is turned off
Aug 3, 2023
43fd79e
Add support for pyenv interpreters
Aug 4, 2023
0fbd547
Add comment
Aug 4, 2023
a006c5e
Fix unit tests
Aug 4, 2023
c035422
Add unit test for PS1
Aug 4, 2023
3d4a77f
yUP
Aug 4, 2023
c8740dc
Do not update engine
Aug 4, 2023
8cc1afe
Fix
Aug 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Clear env collection if activate terminal setting is turned off
  • Loading branch information
Kartik Raj
Kartik Raj committed Aug 3, 2023
commit 7ceee81f8647a3b5992d81a2b56cd240ca3791a6
3 changes: 2 additions & 1 deletion src/client/interpreter/activation/terminalEnvVarCollectionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
public async _applyCollection(resource: Resource, shell = this.applicationEnvironment.shell): Promise<void> {
const workspaceFolder = this.getWorkspaceFolder(resource);
const settings = this.configurationService.getSettings(resource);
const envVarCollection = this.getEnvironmentVariableCollection(workspaceFolder);
if (!settings.terminal.activateEnvironment) {
traceVerbose('Activating environments in terminal is disabled for', resource?.fsPath);
envVarCollection.clear();
return;
}
const env = await this.environmentActivationService.getActivatedEnvironmentVariables(
Expand All @@ -117,7 +119,6 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
undefined,
shell,
);
const envVarCollection = this.getEnvironmentVariableCollection(workspaceFolder);
if (!env) {
const shellType = identifyShellFromShellPath(shell);
const defaultShell = defaultShells[this.platform.osType];
Expand Down