linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-27 03:14:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 287fb4fdc6 into 11c1718983

Browse source
This commit is contained in:
Kevin W Matthews 2026-03-26 18:41:32 +01:00 • committed by GitHub
commit 1842b71034
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,18 +37,29 @@ function _vi-mode-set-cursor-shape-for-keymap() {
command) _shape=$VI_MODE_CURSOR_INSERT ;; # read a command name command) _shape=$VI_MODE_CURSOR_INSERT ;; # read a command name
vicmd) _shape=$VI_MODE_CURSOR_NORMAL ;; # vi cmd: block vicmd) _shape=$VI_MODE_CURSOR_NORMAL ;; # vi cmd: block
visual) _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual mode: block visual) _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual mode: block
visual-line) _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual line mode: block
viopp) _shape=$VI_MODE_CURSOR_OPPEND ;; # vi operation pending: blinking block viopp) _shape=$VI_MODE_CURSOR_OPPEND ;; # vi operation pending: blinking block
*) _shape=0 ;; *) _shape=0 ;;
esac esac
printf $'\e[%d q' "${_shape}" printf $'\e[%d q' "${_shape}"
} }
function _visual-mode { function zle-line-pre-redraw() {
if [[ "$REGION_ACTIVE" -eq 0 && ("$VI_KEYMAP" == visual || "$VI_KEYMAP" == visual-line) ]]; then
typeset -g VI_KEYMAP=$KEYMAP
zle reset-prompt
zle -R
elif [[ "$REGION_ACTIVE" -eq 1 && "$VI_KEYMAP" != "visual" ]]; then
typeset -g VI_KEYMAP=visual typeset -g VI_KEYMAP=visual
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP" zle reset-prompt
zle .visual-mode zle -R
elif [[ "$REGION_ACTIVE" -eq 2 && "$VI_KEYMAP" != "visual-line" ]]; then
typeset -g VI_KEYMAP=visual-line
zle reset-prompt
zle -R
fi
} }
zle -N visual-mode _visual-mode zle -N zle-line-pre-redraw
function _vi-mode-should-reset-prompt() { function _vi-mode-should-reset-prompt() {
# If $VI_MODE_RESET_PROMPT_ON_MODE_CHANGE is unset (default), dynamically # If $VI_MODE_RESET_PROMPT_ON_MODE_CHANGE is unset (default), dynamically
@ -163,9 +174,16 @@ fi
# if mode indicator wasn't setup by theme, define default, we'll leave INSERT_MODE_INDICATOR empty by default # if mode indicator wasn't setup by theme, define default, we'll leave INSERT_MODE_INDICATOR empty by default
typeset -g MODE_INDICATOR=${MODE_INDICATOR:='%B%F{red}<%b<<%f'} typeset -g MODE_INDICATOR=${MODE_INDICATOR:='%B%F{red}<%b<<%f'}
typeset -g VISUAL_MODE_INDICATOR=${VISUAL_MODE_INDICATOR:='%B%F{white}<%b<<%f'}
typeset -g VISUAL_LINE_MODE_INDICATOR=${VISUAL_LINE_MODE_INDICATOR:='%B%F{white}<%b<<%f'}
function vi_mode_prompt_info() { function vi_mode_prompt_info() {
echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/$INSERT_MODE_INDICATOR}" case "$VI_KEYMAP" in
vicmd) echo "$MODE_INDICATOR" ;;
visual) echo "$VISUAL_MODE_INDICATOR" ;;
visual-line) echo "$VISUAL_LINE_MODE_INDICATOR" ;;
main|viins) echo "$INSERT_MODE_INDICATOR" ;;
esac
} }
# define right prompt, if it wasn't defined by a theme # define right prompt, if it wasn't defined by a theme