h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-07 10:01:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix vi mode x and X keys to populate kill-ring

Browse Source 
Closes #12420
Closes #12536
This commit is contained in:
JANMESH ARUN SHEWALE
2026-03-11 22:19:50 +05:30
committed by Johannes Altmanninger
parent bcda4c5c4d
commit ddf99b7063
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
share/functions/fish_vi_key_bindings.fish
View File

@@ -46,6 +46,33 @@ function __fish_vi_consume_count -a varname
echo $effective_count
end
function __fish_vi_delete_char
set -l count (__fish_vi_consume_count __fish_vi_count)
commandline -f begin-selection
if test $count -gt 1
for i in (seq 1 (math $count - 1))
commandline -f forward-char
end
end
commandline -f kill-selection end-selection
end
function __fish_vi_backward_delete_char
set -l count (__fish_vi_consume_count __fish_vi_count)
set -l start_cursor (commandline -C)
if test $start_cursor -eq 0
return
end
commandline -f backward-char
commandline -f begin-selection
if test $count -gt 1
for i in (seq 1 (math $count - 1))
commandline -f backward-char
end
end
commandline -f kill-selection end-selection
end
function fish_vi_yank_selection
set -g fish_cursor_end_mode exclusive
commandline -f kill-selection -f yank
@@ -350,8 +377,8 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
bind --preset -M default e 'fish_vi_run_count forward-word-end'
bind --preset -M default E 'fish_vi_run_count forward-bigword-end'
bind --preset -M default x 'fish_vi_run_count delete-char'
bind --preset -M default X 'fish_vi_run_count backward-delete-char'
bind --preset -M default x __fish_vi_delete_char
bind --preset -M default X __fish_vi_backward_delete_char
bind --preset -m insert enter execute
bind --preset -m insert ctrl-j execute

22
tests/pexpects/vi-key-bindings.py
View File

@@ -42,3 +42,25 @@ sleep(1)
send("hhhdhldl")
sendline("")
expect_re(r"\bacdf\b")
# Test x copying to clipboard
send("echo hello")
send("\033")
sleep(1)
# Delete 'o', then 'l', then 'l', buffer contains 'l'
send("xxx")
# Re-insert 'l'
send("p")
sendline("")
# Results in 'hel' because 'p' pastes after the cursor ('e').
# string is 'he' + paste 'l' after 'e' = 'hel'
expect_re(r"\bhel\b")
send("echo 123456")
send("\033")
sleep(1)
send("hhh") # cursor on 3
send("3x") # deletes 3, 4, 5
send("p") # pastes after 2 -> 123456
sendline("")
expect_re(r"\b123456\b")