Revert "perf(shell/zsh.rs): avoid hook-env execution on Enter without…

… command (#2861)" This reverts commit a1cdc4b.
jdx · Nov 6, 2024 · 7e19251 · 7e19251
1 parent acc674b
commit 7e19251
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/src/cli/snapshots/mise__cli__deactivate__tests__deactivate-2.snap b/src/cli/snapshots/mise__cli__deactivate__tests__deactivate-2.snap
@@ -1,12 +1,10 @@
 ---
 source: src/cli/deactivate.rs
 expression: output
-snapshot_kind: text
 ---
 export PATH='$PATH'
-precmd_functions=( ${precmd_functions:#_mise_hook_cmd} )
+precmd_functions=( ${precmd_functions:#_mise_hook} )
 chpwd_functions=( ${chpwd_functions:#_mise_hook} )
-unset -f _mise_hook_cmd
 unset -f _mise_hook
 unset -f mise
 unset MISE_SHELL
diff --git a/src/shell/snapshots/mise__shell__zsh__tests__activate.snap b/src/shell/snapshots/mise__shell__zsh__tests__activate.snap
@@ -1,7 +1,6 @@
 ---
 source: src/shell/zsh.rs
 expression: "zsh.activate(exe, \" --status\".into())"
-snapshot_kind: text
 ---
 export MISE_SHELL=zsh
 export __MISE_ORIG_PATH="$PATH"
@@ -30,14 +29,9 @@ mise() {
 _mise_hook() {
   eval "$(/some/dir/mise hook-env --status -s zsh)";
 }
-_mise_hook_cmd() {
-  if [[ -n "$ZLAST_COMMANDS" ]]; then
-    _mise_hook;
-  fi
-}
 typeset -ag precmd_functions;
-if [[ -z "${precmd_functions[(r)_mise_hook_cmd]+1}" ]]; then
-  precmd_functions=( _mise_hook_cmd ${precmd_functions[@]} )
+if [[ -z "${precmd_functions[(r)_mise_hook]+1}" ]]; then
+  precmd_functions=( _mise_hook ${precmd_functions[@]} )
 fi
 typeset -ag chpwd_functions;
 if [[ -z "${chpwd_functions[(r)_mise_hook]+1}" ]]; then

diff --git a/src/shell/snapshots/mise__shell__zsh__tests__deactivate.snap b/src/shell/snapshots/mise__shell__zsh__tests__deactivate.snap
@@ -1,11 +1,9 @@
 ---
 source: src/shell/zsh.rs
 expression: replace_path(&deactivate)
-snapshot_kind: text
 ---
-precmd_functions=( ${precmd_functions:#_mise_hook_cmd} )
+precmd_functions=( ${precmd_functions:#_mise_hook} )
 chpwd_functions=( ${chpwd_functions:#_mise_hook} )
-unset -f _mise_hook_cmd
 unset -f _mise_hook
 unset -f mise
 unset MISE_SHELL
diff --git a/src/shell/zsh.rs b/src/shell/zsh.rs
@@ -44,14 +44,9 @@ impl Shell for Zsh {
             _mise_hook() {{
               eval "$({exe} hook-env{flags} -s zsh)";
             }}
-            _mise_hook_cmd() {{
-              if [[ -n "$ZLAST_COMMANDS" ]]; then
-                _mise_hook;
-              fi
-            }}
             typeset -ag precmd_functions;
-            if [[ -z "${{precmd_functions[(r)_mise_hook_cmd]+1}}" ]]; then
-              precmd_functions=( _mise_hook_cmd ${{precmd_functions[@]}} )
+            if [[ -z "${{precmd_functions[(r)_mise_hook]+1}}" ]]; then
+              precmd_functions=( _mise_hook ${{precmd_functions[@]}} )
             fi
             typeset -ag chpwd_functions;
             if [[ -z "${{chpwd_functions[(r)_mise_hook]+1}}" ]]; then
@@ -85,9 +80,8 @@ impl Shell for Zsh {
 
     fn deactivate(&self) -> String {
         formatdoc! {r#"
-        precmd_functions=( ${{precmd_functions:#_mise_hook_cmd}} )
+        precmd_functions=( ${{precmd_functions:#_mise_hook}} )
         chpwd_functions=( ${{chpwd_functions:#_mise_hook}} )
-        unset -f _mise_hook_cmd
         unset -f _mise_hook
         unset -f mise
         unset MISE_SHELL