From 0987eee19034e36dda27887775fccfe7b8c0157e Mon Sep 17 00:00:00 2001 From: Alex Rosenfeld Date: Tue, 8 Oct 2024 15:44:18 -0400 Subject: [PATCH] fix(poetry-env): only run `deactivate` if needed (#12701) Co-authored-by: Carlo Sala --- plugins/poetry-env/poetry-env.plugin.zsh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/poetry-env/poetry-env.plugin.zsh b/plugins/poetry-env/poetry-env.plugin.zsh index be46717d8..dd52b1655 100644 --- a/plugins/poetry-env/poetry-env.plugin.zsh +++ b/plugins/poetry-env/poetry-env.plugin.zsh @@ -6,10 +6,11 @@ _togglePoetryShell() { fi # Deactivate the current environment if moving out of a Poetry directory or into a different Poetry directory - if [[ $poetry_active -eq 1 ]] && { [[ $in_poetry_dir -eq 0 ]] && [[ "$PWD" != "$poetry_dir"* ]]; }; then + if [[ $poetry_active -eq 1 ]] && [[ $in_poetry_dir -eq 0 ]] \ + && [[ "$PWD" != "$poetry_dir"* ]]; then export poetry_active=0 unset poetry_dir - deactivate + (( $+functions[deactivate] )) && deactivate fi # Activate the environment if in a Poetry directory and no environment is currently active