linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 20:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(vi-mode): fix check for prompt redisplay on mode change (#11547)

Browse source
This commit is contained in:
Marc Cornellà 2023-03-31 07:51:10 +02:00 committed by GitHub
parent b9c4e2e823
commit cc99132104
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
plugins/vi-mode/vi-mode.plugin.zsh
View file

@ -43,12 +43,25 @@ function _vi-mode-set-cursor-shape-for-keymap() {
printf $'\e[%d q' "${_shape}" printf $'\e[%d q' "${_shape}"
} }
function _vi-mode-should-reset-prompt() {
# If $VI_MODE_RESET_PROMPT_ON_MODE_CHANGE is unset (default), dynamically
# check whether we're using the prompt to display vi-mode info
if [[ -z "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" ]]; then
[[ "${PS1} ${RPS1}" = *'$(vi_mode_prompt_info)'* ]]
return $?
fi
# If $VI_MODE_RESET_PROMPT_ON_MODE_CHANGE was manually set, let's check
# if it was specifically set to true or it was disabled with any other value
[[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE}" = true ]]
}
# Updates editor information when the keymap changes. # Updates editor information when the keymap changes.
function zle-keymap-select() { function zle-keymap-select() {
# update keymap variable for the prompt # update keymap variable for the prompt
typeset -g VI_KEYMAP=$KEYMAP typeset -g VI_KEYMAP=$KEYMAP
if [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]]; then if _vi-mode-should-reset-prompt; then
zle reset-prompt zle reset-prompt
zle -R zle -R
fi fi
@ -59,10 +72,9 @@ zle -N zle-keymap-select
# These "echoti" statements were originally set in lib/key-bindings.zsh # These "echoti" statements were originally set in lib/key-bindings.zsh
# Not sure the best way to extend without overriding. # Not sure the best way to extend without overriding.
function zle-line-init() { function zle-line-init() {
local prev_vi_keymap local prev_vi_keymap="${VI_KEYMAP:-}"
prev_vi_keymap="${VI_KEYMAP:-}"
typeset -g VI_KEYMAP=main typeset -g VI_KEYMAP=main
[[ "$prev_vi_keymap" != 'main' ]] && [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]] && zle reset-prompt [[ "$prev_vi_keymap" != 'main' ]] && _vi-mode-should-reset-prompt && zle reset-prompt
(( ! ${+terminfo[smkx]} )) || echoti smkx (( ! ${+terminfo[smkx]} )) || echoti smkx
_vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}" _vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}"
} }
@ -138,13 +150,6 @@ if [[ -z "$MODE_INDICATOR" ]]; then
fi fi
function vi_mode_prompt_info() { function vi_mode_prompt_info() {
# If we're using the prompt to display mode info, and we haven't explicitly
# disabled "reset prompt on mode change", then set it here.
#
# We do that here instead of the `if` statement below because the user may
# set RPS1/RPROMPT to something else in their custom config.
: "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:=true}"
echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/$INSERT_MODE_INDICATOR}" echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/$INSERT_MODE_INDICATOR}"
} }