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

fix(zsh): Ensure existing keymap change functions are not overriden (#1826)

This commit is contained in:
Gautham Warrier 2020-10-27 23:31:52 +05:30 committed by GitHub
parent b9c096bd56
commit f0cc2bea79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/init/starship.zsh
View File

@ -54,13 +54,27 @@ if [[ -z ${preexec_function[(re)starship_preexec]} ]]; then
fi 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() { starship_zle-keymap-select() {
starship_render starship_render
zle reset-prompt zle reset-prompt
} }
## Check for existing keymap-select widget.
local existing_keymap_select_fn=$widgets[zle-keymap-select];
# zle-keymap-select is a special widget so it'll be "user:fnName" or nothing. Let's get fnName only.
existing_keymap_select_fn=${existing_keymap_select_fn//user:};
if [[ -z ${existing_keymap_select_fn} ]]; then
zle -N zle-keymap-select starship_zle-keymap-select;
else
# Define a wrapper fn to call the original widget fn and then Starship's.
starship_zle-keymap-select-wrapped() {
${existing_keymap_select_fn} "$@";
starship_zle-keymap-select "$@";
}
zle -N zle-keymap-select starship_zle-keymap-select-wrapped;
fi
STARSHIP_START_TIME=$(::STARSHIP:: time) STARSHIP_START_TIME=$(::STARSHIP:: time)
zle -N zle-keymap-select
export STARSHIP_SHELL="zsh" export STARSHIP_SHELL="zsh"
# Set up the session key that will be used to store logs # Set up the session key that will be used to store logs