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

Merge 169e9c87ff into 11c1718983

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

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

@ -31,24 +31,32 @@ function _vi-mode-set-cursor-shape-for-keymap() {
# https://vt100.net/docs/vt510-rm/DECSCUSR # https://vt100.net/docs/vt510-rm/DECSCUSR
local _shape=0 local _shape=0
case "${1:-${VI_KEYMAP:-main}}" in case "${1:-${VI_KEYMAP:-main}}" in
main) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line main) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
viins) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line viins) _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
isearch) _shape=$VI_MODE_CURSOR_INSERT ;; # inc search: line isearch) _shape=$VI_MODE_CURSOR_INSERT ;; # inc search: line
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
viopp) _shape=$VI_MODE_CURSOR_OPPEND ;; # vi operation pending: blinking block visual-line) _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual line mode: block
*) _shape=0 ;; viopp) _shape=$VI_MODE_CURSOR_OPPEND ;; # vi operation pending: blinking block
*) _shape=0 ;;
esac esac
printf $'\e[%d q' "${_shape}" printf $'\e[%d q' "${_shape}"
} }
function _visual-mode { function zle-line-pre-redraw() {
typeset -g VI_KEYMAP=visual if [[ "$REGION_ACTIVE" -eq 0 && ("$VI_KEYMAP" == visual || "$VI_KEYMAP" == visual-line) ]]; then
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP" typeset -g VI_KEYMAP=$KEYMAP
zle .visual-mode _vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
elif [[ "$REGION_ACTIVE" -eq 1 && "$VI_KEYMAP" != "visual" ]]; then
typeset -g VI_KEYMAP=visual
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
elif [[ "$REGION_ACTIVE" -eq 2 && "$VI_KEYMAP" != "visual-line" ]]; then
typeset -g VI_KEYMAP=visual-line
_vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
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