Skip to content

Fix activation icon state when using shellStartup #837

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix activation icon state when using shellStartup #837

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
6 changes: 6 additions & 0 deletions src/features/terminal/terminalManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,12 @@ export class TerminalManagerImpl implements TerminalManager {
traceInfo(
`"python-envs.terminal.autoActivationType" is set to "${actType}", terminal should be activated by shell startup script`,
);
// If the shell is already set up (shellSetup.get(...) === true) then we can safely mark it activated so
// that the UI button shows the correct Deactivate option.
let isSetup = this.shellSetup.get(shellType);
if (isSetup && isActivatableEnvironment(environment) && !this.isActivated(terminal, environment)) {
this.ta.updateActivationState(terminal, environment, true);
}
}
}

Expand Down
Loading