mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-28 05:43:11 +00:00
00432df420
On
a;
we don't expand the abbreviation because the cursor is right of semicolon,
not on the command token. Fix this by making sure that we call expand-abbr
with the cursor on the semicolon which is the end of the command token.
(Now that our bind command execution order is less surprising, this is doable.)
This means that we need to fix the cursor after successfully expanding
an abbreviation. Do this by setting the position explicitly even when no
--set-position is in effect.
An earlier version of this patch used
bind space self-insert backward-char expand-abbr or forward-char
The problem with that (as a failing test shows) was that given "abbr m
myabbr", after typing "m space ctrl-z", the cursor would be after the "m",
not after the space. The second space removes the space, not changing the
cursor position, which is weird. I initially tried to fix this by adding
a hack to the undo group logic, to always restore the cursor position from
when begin-undo-group was used.
bind space self-insert begin-undo-group backward-char expand-abbr end-undo-group or forward-char
However this made test_torn_escapes.py fail for mysterious reasons.
I believe this is because that test registers and triggers a SIGUSR1 handler;
since the signal handler will rearrange char events, that probably messes
with the undo group guards.
I resorted to adding a tailor-made readline cmd. We could probably remove
it and give the new behavior to expand-abbr, not sure.
Fixes #9730
159 lines
4 KiB
Python
159 lines
4 KiB
Python
#!/usr/bin/env python3
|
|
from pexpect_helper import SpawnedProc
|
|
|
|
import re
|
|
|
|
sp = SpawnedProc()
|
|
send, sendline, sleep, expect_prompt, expect_re, expect_str = (
|
|
sp.send,
|
|
sp.sendline,
|
|
sp.sleep,
|
|
sp.expect_prompt,
|
|
sp.expect_re,
|
|
sp.expect_str,
|
|
)
|
|
expect_prompt()
|
|
|
|
# ? prints the command line, bracketed by <>, then clears it.
|
|
sendline(r"""bind '?' 'echo "<$(commandline)>"; commandline ""'; """)
|
|
expect_prompt()
|
|
|
|
# Basic test.
|
|
# Default abbreviations expand only in command position.
|
|
sendline(r"abbr alpha beta")
|
|
expect_prompt()
|
|
|
|
send(r"alpha ?")
|
|
expect_str(r"<beta >")
|
|
|
|
send(r"echo alpha ?")
|
|
expect_str(r"<echo alpha >")
|
|
|
|
send(r"alpha;?")
|
|
expect_str(r"<beta;>")
|
|
|
|
# Abbreviation expansions may have multiple words.
|
|
sendline(r"abbr --add emacsnw emacs -nw -l")
|
|
expect_prompt()
|
|
send(r"emacsnw ?")
|
|
expect_str(r"<emacs -nw -l >")
|
|
|
|
# Regression test that abbreviations still expand in incomplete positions.
|
|
sendline(r"""abbr --erase (abbr --list)""")
|
|
expect_prompt()
|
|
sendline(r"""abbr --add foo echo bar""")
|
|
expect_prompt()
|
|
sendline(r"if foo")
|
|
expect_str(r"if echo bar")
|
|
sendline(r"end")
|
|
expect_prompt(r"bar")
|
|
|
|
# Regression test that 'echo (' doesn't hang.
|
|
sendline(r"echo )")
|
|
expect_str(r"Unexpected ')' for unopened parenthesis")
|
|
send(r"?")
|
|
expect_str(r"<echo )>")
|
|
|
|
# Support position anywhere.
|
|
sendline(r"abbr alpha --position anywhere beta2")
|
|
expect_prompt()
|
|
|
|
send(r"alpha ?")
|
|
expect_str(r"<beta2 >")
|
|
|
|
send(r"echo alpha ?")
|
|
expect_str(r"<echo beta2 >")
|
|
|
|
# Support regex.
|
|
sendline(r"abbr alpha --regex 'A[0-9]+Z' beta3")
|
|
expect_prompt()
|
|
send(r"A123Z ?")
|
|
expect_str(r"<beta3 >")
|
|
send(r"AZ ?")
|
|
expect_str(r"<AZ >")
|
|
send(r"QA123Z ?") # fails as the regex must match the entire string
|
|
expect_str(r"<QA123Z >")
|
|
send(r"A0000000000000000000009Z ?")
|
|
expect_str(r"<beta3 >")
|
|
|
|
# Support functions. Here anything in between @@ is uppercased, except 'nope'.
|
|
sendline(
|
|
r"""function uppercaser
|
|
string match --quiet '*nope*' $argv[1] && return 1
|
|
string trim --chars @ $argv | string upper
|
|
end
|
|
""".strip()
|
|
)
|
|
expect_prompt()
|
|
sendline(r"abbr uppercaser --regex '@.+@' --function uppercaser")
|
|
expect_prompt()
|
|
send(r"@abc@ ?")
|
|
expect_str(r"<ABC >")
|
|
send(r"@nope@ ?")
|
|
expect_str(r"<@nope@ >")
|
|
sendline(r"abbr --erase uppercaser")
|
|
expect_prompt()
|
|
|
|
# -f works as shorthand for --function.
|
|
sendline(r"abbr uppercaser2 --regex '@.+@' -f uppercaser")
|
|
expect_prompt()
|
|
send(r"@abc@ ?")
|
|
expect_str(r"<ABC >")
|
|
send(r"@nope@ ?")
|
|
expect_str(r"<@nope@ >")
|
|
sendline(r"abbr --erase uppercaser2")
|
|
expect_prompt()
|
|
|
|
# Abbreviations which cause the command line to become incomplete or invalid
|
|
# are visibly expanded.
|
|
sendline(r"abbr openparen --position anywhere '('")
|
|
expect_prompt()
|
|
sendline(r"abbr closeparen --position anywhere ')'")
|
|
expect_prompt()
|
|
sendline(r"echo openparen")
|
|
expect_str(r"echo (")
|
|
send(r"?")
|
|
expect_str(r"<echo (>")
|
|
sendline(r"echo closeparen")
|
|
expect_str(r"echo )")
|
|
send(r"?")
|
|
expect_str(r"<echo )>")
|
|
sendline(r"echo openparen seq 5 closeparen") # expands on enter
|
|
expect_prompt(r"1 2 3 4 5")
|
|
sendline(r"echo openparen seq 5 closeparen ") # expands on space
|
|
expect_prompt(r"1 2 3 4 5")
|
|
|
|
|
|
# Verify that 'commandline' is accurate.
|
|
# Abbreviation functions cannot usefully change the command line, but they can read it.
|
|
sendline(
|
|
r"""function check_cmdline
|
|
set -g last_cmdline (commandline)
|
|
set -g last_cursor (commandline --cursor)
|
|
false
|
|
end
|
|
""".strip()
|
|
)
|
|
expect_prompt()
|
|
sendline(r"abbr check_cmdline --regex '@.+@' --function check_cmdline")
|
|
expect_prompt()
|
|
send(r"@abc@ ?")
|
|
expect_str(r"<@abc@ >")
|
|
sendline(r"echo $last_cursor : $last_cmdline")
|
|
expect_prompt(r"6 : @abc@ ")
|
|
|
|
|
|
# Test cursor positioning.
|
|
sendline(r"""abbr --erase (abbr --list) """)
|
|
expect_prompt()
|
|
sendline(r"""abbr LLL --position anywhere --set-cursor 'abc%ghi'""")
|
|
expect_prompt()
|
|
send(r"""echo LLL def?""")
|
|
expect_str(r"<echo abcdefghi >")
|
|
|
|
sendline(r"""abbr --erase (abbr --list) """)
|
|
expect_prompt()
|
|
sendline(r"""abbr LLL --position anywhere --set-cursor=!HERE! '!HERE! | less'""")
|
|
expect_prompt()
|
|
send(r"""echo LLL derp?""")
|
|
expect_str(r"<echo derp | less >")
|