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 regression spuriously expanding abbr with cursor outside token

Browse Source 
Given "abbr foo something", the input sequence

    foo<space><ctrl-z><space>

would re-expand the abbreviation on the second space which is surprising
because the cursor is not at or inside the command token.  This looks to be
a regression from 00432df42 (Trigger abbreviations after inserting process
separators, 2024-04-13)

Happily, 69583f303 (Allow restricting abbreviations to specific commands
(#10452), 2024-04-24) made some changes that mean the bad commit seems no
longer necessary. Not sure why it works but I'll take it.
This commit is contained in:
Johannes Altmanninger
2024-05-03 08:30:27 +02:00
parent b5624f2e81
commit d4ecea56df
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
share/functions/__fish_shared_key_bindings.fish
View File

@@ -105,20 +105,20 @@ function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mod
or exit # protect against invalid $argv
# Space and other command terminators expands abbrs _and_ inserts itself.
bind --preset $argv space self-insert expand-abbr-backtrack
bind --preset $argv ";" self-insert expand-abbr-backtrack
bind --preset $argv "|" self-insert expand-abbr-backtrack
bind --preset $argv "&" self-insert expand-abbr-backtrack
bind --preset $argv ">" self-insert expand-abbr-backtrack
bind --preset $argv "<" self-insert expand-abbr-backtrack
bind --preset $argv shift-enter "commandline -i \n" expand-abbr-backtrack
$legacy_bind --preset $argv \e\[27\;2\;13~ "commandline -i \n" expand-abbr-backtrack # Sent with XTerm.vt100.formatOtherKeys: 0
bind --preset $argv alt-enter "commandline -i \n" expand-abbr-backtrack
bind --preset $argv ")" self-insert expand-abbr-backtrack # Closing a command substitution.
bind --preset $argv space self-insert expand-abbr
bind --preset $argv ";" self-insert expand-abbr
bind --preset $argv "|" self-insert expand-abbr
bind --preset $argv "&" self-insert expand-abbr
bind --preset $argv ">" self-insert expand-abbr
bind --preset $argv "<" self-insert expand-abbr
bind --preset $argv shift-enter "commandline -i \n" expand-abbr
$legacy_bind --preset $argv \e\[27\;2\;13~ "commandline -i \n" expand-abbr # Sent with XTerm.vt100.formatOtherKeys: 0
bind --preset $argv alt-enter "commandline -i \n" expand-abbr
bind --preset $argv ")" self-insert expand-abbr # Closing a command substitution.
bind --preset $argv ctrl-space 'test -n "$(commandline)" && commandline -i " "'
bind --preset $argv -k nul 'test -n "$(commandline)" && commandline -i " "'
# Shift-space behaves like space because it's easy to mistype.
bind --preset $argv shift-space 'commandline -i " "' expand-abbr-backtrack
bind --preset $argv shift-space 'commandline -i " "' expand-abbr
bind --preset $argv enter execute
bind --preset $argv ctrl-j execute