From 89ce75724d4f8d72000a1842099cdf71b218194f Mon Sep 17 00:00:00 2001
From: Ajeet D'Souza <98ajeet@gmail.com>
Date: Sat, 4 Sep 2021 15:33:07 +0530
Subject: [PATCH] Reimplement __zoxide_hooked using SHLVL

---
 templates/elvish.txt | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/templates/elvish.txt b/templates/elvish.txt
index 7929b24..67866f5 100644
--- a/templates/elvish.txt
+++ b/templates/elvish.txt
@@ -21,20 +21,25 @@ fn __zoxide_cd [path]{
 #
 
 # Initialize hook to track previous directory.
-__zoxide_oldpwd = $pwd
-before-chdir = [$@before-chdir [_]{ edit:add-var __zoxide_oldpwd $pwd }]
-
-{#- __zoxide_hooked requires https://github.com/elves/elvish/issues/1395 #}
+var oldpwd = $builtin:pwd
+set builtin:before-chdir = [$@builtin:before-chdir [_]{ edit:add-var oldpwd $builtin:pwd }]
 
 # Initialize hook to add directories to zoxide.
+var shlvl = $E:SHLVL
+if (builtin:eq $shlvl "") {
+    set shlvl = 0
+}
+if (builtin:not (builtin:eq $E:__zoxide_hooked_elvish $shlvl)) {
+    set E:__zoxide_hooked_elvish = $shlvl
 {%- match hook %}
 {%- when InitHook::None %}
-{{ not_configured }}
+    {{ not_configured }}
 {%- when InitHook::Prompt %}
-edit:before-readline = [$@edit:before-readline []{ zoxide add -- $pwd }]
+    set edit:before-readline = [$@edit:before-readline []{ zoxide add -- $pwd }]
 {%- when InitHook::Pwd %}
-after-chdir = [$@after-chdir [_]{ zoxide add -- $pwd }]
+    set builtin:after-chdir = [$@builtin:after-chdir [_]{ zoxide add -- $pwd }]
 {%- endmatch %}
+}
 
 {{ section }}
 # When using zoxide with --no-aliases, alias these internal functions as
@@ -46,13 +51,13 @@ fn __zoxide_z [@rest]{
     if (builtin:eq [] $rest) {
         __zoxide_cd ~
     } elif (builtin:eq [-] $rest) {
-        __zoxide_cd $__zoxide_oldpwd
+        __zoxide_cd $oldpwd
     } elif (and ('builtin:==' (builtin:count $rest) 1) (path:is-dir &follow-symlink=$true $rest[0])) {
         __zoxide_cd $rest[0]
     } else {
         var path
         try {
-            path = (zoxide query --exclude $pwd -- $@rest)
+            set path = (zoxide query --exclude $pwd -- $@rest)
         } except {
         } else {
             __zoxide_cd $path
@@ -65,7 +70,7 @@ edit:add-var __zoxide_z~ $__zoxide_z~
 fn __zoxide_zi [@rest]{
     var path
     try {
-        path = (zoxide query -i -- $@rest)
+        set path = (zoxide query -i -- $@rest)
     } except {
     } else {
         __zoxide_cd $path
@@ -86,19 +91,19 @@ edit:add-var {{cmd}}i~ $__zoxide_zi~
 # Load completions.
 {# zoxide-based completions are currently not possible, because Elvish only
  # prints a completion if the current token is a prefix of it. -#}
-fn __zoxide_z_complete [@args]{
-    if (!= (count $args) 2) {
-        return
+fn __zoxide_z_complete [@rest]{
+    if (!= (builtin:count $rest) 2) {
+        builtin:return
     }
-    edit:complete-filename $args[1] |
-        each [c]{
-            dir = $c[stem]
+    edit:complete-filename $rest[1] |
+        builtin:each [completion]{
+            var dir = $completion[stem]
             if (path:is-dir $dir) {
-                put $dir
+                builtin:put $dir
             }
         }
 }
-edit:completion:arg-completer[{{cmd}}] = $__zoxide_z_complete~
+set edit:completion:arg-completer[{{cmd}}] = $__zoxide_z_complete~
 
 {%- when None %}