haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Retain previous command state on zsh keymap select (#958)

This commit is contained in:
Nemo157 2020-06-09 18:52:29 +02:00 committed by GitHub
parent 759eaded73
commit fb121cd62a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/init/starship.zsh
View File

@ -9,23 +9,30 @@
zmodload zsh/parameter # Needed to access jobstates variable for NUM_JOBS zmodload zsh/parameter # Needed to access jobstates variable for NUM_JOBS
starship_render() {
# Use length of jobstates array as number of jobs. Expansion fails inside
# quotes so we set it here and then use the value later on.
NUM_JOBS=$#jobstates
PROMPT="$(::STARSHIP:: prompt --keymap="${KEYMAP-}" --status=$STATUS --cmd-duration=${STARSHIP_DURATION-} --jobs="$NUM_JOBS")"
}
# Will be run before every prompt draw # Will be run before every prompt draw
starship_precmd() { starship_precmd() {
# Save the status, because commands in this pipeline will change $? # Save the status, because commands in this pipeline will change $?
STATUS=$? STATUS=$?
# Use length of jobstates array as number of jobs. Expansion fails inside # Compute cmd_duration, if we have a time to consume, otherwise clear the
# quotes so we set it here and then use the value later on. # previous duration
NUM_JOBS=$#jobstates
# Compute cmd_duration, if we have a time to consume
if [[ -n "${STARSHIP_START_TIME+1}" ]]; then if [[ -n "${STARSHIP_START_TIME+1}" ]]; then
STARSHIP_END_TIME=$(::STARSHIP:: time) STARSHIP_END_TIME=$(::STARSHIP:: time)
STARSHIP_DURATION=$((STARSHIP_END_TIME - STARSHIP_START_TIME)) STARSHIP_DURATION=$((STARSHIP_END_TIME - STARSHIP_START_TIME))
PROMPT="$(::STARSHIP:: prompt --status=$STATUS --cmd-duration=$STARSHIP_DURATION --jobs="$NUM_JOBS")"
unset STARSHIP_START_TIME unset STARSHIP_START_TIME
else else
PROMPT="$(::STARSHIP:: prompt --status=$STATUS --jobs="$NUM_JOBS")" unset STARSHIP_DURATION
fi fi
# Render the updated prompt
starship_render
} }
starship_preexec() { starship_preexec() {
STARSHIP_START_TIME=$(::STARSHIP:: time) STARSHIP_START_TIME=$(::STARSHIP:: time)
@ -48,7 +55,7 @@ fi
# Set up a function to redraw the prompt if the user switches vi modes # Set up a function to redraw the prompt if the user switches vi modes
zle-keymap-select() { zle-keymap-select() {
PROMPT=$(::STARSHIP:: prompt --keymap="$KEYMAP" --jobs="$(jobs | wc -l)") starship_render
zle reset-prompt zle reset-prompt
} }