Skip to content

Show notification reaffirming Python extension still handles activation when in pythonTerminalEnvVarActivation experiment #21802

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 18 commits into from
Aug 15, 2023
Merged

Show notification reaffirming Python extension still handles activation when in pythonTerminalEnvVarActivation experiment #21802

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
885cc76
Show prompt when opening a new terminal
Aug 11, 2023
6c5bd76
Try to track which termianls are correctly showing prompt
Aug 11, 2023
6c20ea9
Fix prompt is shown when acceptable
Aug 11, 2023
617014c
Disable experiment on multiroot workspace in remote termianls
Aug 11, 2023
2262aed
Fix unit tests
Aug 11, 2023
6466c3b
Rename
Aug 11, 2023
b5dbceb
Lint
Aug 11, 2023
1d4c777
Add tests
Aug 11, 2023
0c39aaf
Rename
Aug 11, 2023
0c51834
Amend comment
Aug 11, 2023
bb823c4
More
Aug 11, 2023
2c56c42
Be explicit about microvenv
Aug 11, 2023
fda6265
Add tests
Aug 14, 2023
443487f
Rename
Aug 14, 2023
c7da071
Rename
Aug 14, 2023
b3300fa
Ouch
Aug 14, 2023
47d7981
Add test for setting toggle
Aug 14, 2023
93d7c46
Ameednc comemt
Aug 14, 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
Rename
  • Loading branch information
Kartik Raj
Kartik Raj committed Aug 14, 2023
commit 443487f25b39cdf25ae5db7d82cc0de4fc95816c
16 changes: 8 additions & 8 deletions src/client/interpreter/activation/terminalEnvVarCollectionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
await this._applyCollection(resource, defaultShell?.shell);
return;
}
await this.trackTerminalPromptStatus(shell, resource, env);
await this.trackTerminalPrompt(shell, resource, env);
this.processEnvVars = undefined;
return;
}
Expand Down Expand Up @@ -170,7 +170,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
const description = new MarkdownString(`${Interpreters.activateTerminalDescription} \`${displayPath}\``);
envVarCollection.description = description;

await this.trackTerminalPromptStatus(shell, resource, env);
await this.trackTerminalPrompt(shell, resource, env);
}

private isPromptSet = new Map<number | undefined, boolean>();
Expand All @@ -184,23 +184,23 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
/**
* Call this once we know terminal prompt is set correctly for terminal owned by this resource.
*/
private setTerminalPromptStatus(resource: Resource) {
private terminalPromptIsCorrect(resource: Resource) {
const key = this.getWorkspaceFolder(resource)?.index;
this.isPromptSet.set(key, true);
}

private clearTerminalPromptStatus(resource: Resource) {
private terminalPromptIsNotCorrect(resource: Resource) {
const key = this.getWorkspaceFolder(resource)?.index;
this.isPromptSet.delete(key);
}

/**
* Tracks whether prompt for terminal was correctly set.
*/
private async trackTerminalPromptStatus(shell: string, resource: Resource, env: EnvironmentVariables | undefined) {
this.clearTerminalPromptStatus(resource);
private async trackTerminalPrompt(shell: string, resource: Resource, env: EnvironmentVariables | undefined) {
this.terminalPromptIsNotCorrect(resource); // Assume terminal prompt is not correct to begin with.
if (!env) {
this.setTerminalPromptStatus(resource);
this.terminalPromptIsCorrect(resource);
return;
}
// Prompts for these shells cannot be set reliably using variables
Expand All @@ -223,7 +223,7 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
return;
}
}
this.setTerminalPromptStatus(resource);
this.terminalPromptIsCorrect(resource);
}

private async handleMicroVenv(resource: Resource) {
Expand Down