feat(elvish): last command status (#3403)

1 files changed, 22 insertions, 6 deletions

diff --git a/src/init/starship.elv b/src/init/starship.elv
index d9552be84..3b0234878 100644
--- a/src/init/starship.elv
+++ b/src/init/starship.elv
@@ -1,17 +1,33 @@
 set-env STARSHIP_SHELL "elvish"
 set-env STARSHIP_SESSION_KEY (::STARSHIP:: session)
 
+# Define Hooks
+var cmd-status-code = 0
+
+fn starship-after-command-hook {|m|
+    var error = $m[error]
+    if (is $error $nil) {
+        set cmd-status-code = 0
+    } else {
+        try {
+            set cmd-status-code = $error[reason][exit-status]
+        } except {
+            # The error is from the built-in commands and they have no status code.
+            set cmd-status-code = 1
+        }
+    }
+}
+
+# Install Hooks
+set edit:after-command = [ $@edit:after-command $starship-after-command-hook~ ]
+
 # Install starship
 set edit:prompt = {
-    # Note:
-    # Elvish does not appear to support exit status codes (--status)
     var cmd-duration = (printf "%.0f" (* $edit:command-duration 1000))
-    ::STARSHIP:: prompt --jobs=$num-bg-jobs --cmd-duration=$cmd-duration
+    ::STARSHIP:: prompt --jobs=$num-bg-jobs --cmd-duration=$cmd-duration --status $cmd-status-code
 }
 
 set edit:rprompt = {
-    # Note:
-    # Elvish does not appear to support exit status codes (--status)
     var cmd-duration = (printf "%.0f" (* $edit:command-duration 1000))
-    ::STARSHIP:: prompt --right --jobs=$num-bg-jobs --cmd-duration=$cmd-duration
+    ::STARSHIP:: prompt --right --jobs=$num-bg-jobs --cmd-duration=$cmd-duration --status $cmd-status-code
 }