Skip to content

Fix "reactivating terminals..." for global interpreters #22096

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
karrtikr merged 1 commit into from
Sep 26, 2023
Merged

Fix "reactivating terminals..." for global interpreters #22096

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/client/interpreter/activation/terminalEnvVarCollectionService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,13 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
}
}

public async _applyCollection(resource: Resource, shell = this.applicationEnvironment.shell): Promise<void> {
public async _applyCollection(resource: Resource, shell?: string): Promise<void> {
this.showProgress();
await this._applyCollectionImpl(resource, shell);
this.hideProgress();
}

private async _applyCollectionImpl(resource: Resource, shell = this.applicationEnvironment.shell): Promise<void> {
const workspaceFolder = this.getWorkspaceFolder(resource);
const settings = this.configurationService.getSettings(resource);
const envVarCollection = this.getEnvironmentVariableCollection({ workspaceFolder });
Expand Down Expand Up @@ -221,7 +226,6 @@ export class TerminalEnvVarCollectionService implements IExtensionActivationServ
const displayPath = this.pathUtils.getDisplayName(settings.pythonPath, workspaceFolder?.uri.fsPath);
const description = new MarkdownString(`${Interpreters.activateTerminalDescription} \`${displayPath}\``);
envVarCollection.description = description;
this.hideProgress();

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