mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-06-23 08:31:16 -03:00
97641c7bf6
Commitdf3b0bd89f(Fix commandline state for custom completions with variable overrides, 2022-01-26) made us push a transient command line for custom completions based on a tautological null-pointer check ("var_assignments"). Commit77aeb6a2a8(Port execution, 2023-10-08) turned the null pointer into a reference and replaced the check with "!ad.var_assignments.is_empty()". This broke scenarios that relied on the transient commandline. In particular the attached test cases rely on the transient commandline implicitly placing the cursor at the end, irrespective of the cursor in the actual commandline. I'm not sure if there is an easy way to identify these scenarios. Let's restore historical behavior by always pushing the transient command line. Fixes #11423
93 lines
2.2 KiB
Python
93 lines
2.2 KiB
Python
#!/usr/bin/env python3
|
|
from pexpect_helper import SpawnedProc, control
|
|
|
|
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()
|
|
|
|
# Verify COMPLETE_AUTO_SPACE behavior
|
|
sendline("complete -x -c monster -a truck")
|
|
expect_prompt()
|
|
sendline("complete -x -c monster -a energy=")
|
|
expect_prompt()
|
|
send("monster t")
|
|
sleep(0.1)
|
|
send("\t")
|
|
sleep(0.1)
|
|
send("!")
|
|
expect_str("monster truck !") # space
|
|
send("\b" * 64)
|
|
send("monster e")
|
|
sleep(0.1)
|
|
send("\t")
|
|
sleep(0.1)
|
|
send("!")
|
|
expect_str("monster energy=!") # no space
|
|
send("\b" * 64)
|
|
|
|
sendline(
|
|
"""
|
|
# Make sure this function does nothing
|
|
function my_is; :; end
|
|
complete -c my_is -n 'test (count (commandline -xpc)) = 1' -xa arg
|
|
complete -c my_is -n '__fish_seen_subcommand_from not' -xa '(
|
|
set -l cmd (commandline -xpc) (commandline -ct)
|
|
set cmd (string join " " my_is $cmd[3..-1])" "
|
|
commandline --replace --current-process $cmd
|
|
complete -C"$cmd"
|
|
)'
|
|
"""
|
|
)
|
|
|
|
send("my_is not \t")
|
|
send("still.alive")
|
|
expect_re(".*still.alive")
|
|
sendline("")
|
|
|
|
# Check cancelling completion acceptance
|
|
# (bind cancel to something else so we don't have to mess with the escape delay)
|
|
sendline("bind ctrl-g cancel")
|
|
sendline("complete -c echo -x -a 'foooo bar'")
|
|
send("echo fo\t")
|
|
send("\x07")
|
|
sendline("bar")
|
|
expect_re("bar")
|
|
sendline("echo fo\t")
|
|
expect_re("foooo")
|
|
|
|
# As soon as something after the "complete" happened,
|
|
# cancel should not undo.
|
|
# In this case that's the space after the tab!
|
|
send("echo fo\t ")
|
|
send("\x07")
|
|
sendline("bar")
|
|
expect_re("foooo bar")
|
|
|
|
sendline("bind ctrl-g 'commandline -f cancel; commandline \"\"'")
|
|
send("echo fo\t")
|
|
expect_re("foooo")
|
|
send("\x07")
|
|
sendline("echo bar")
|
|
expect_re("\n.*bar")
|
|
sendline("echo fo\t")
|
|
expect_re("foooo")
|
|
|
|
# Custom completions that access the command line.
|
|
sendline("complete -e :; complete : -a '(echo (commandline -ct)-completed)'")
|
|
send(": abcd" + control("b") * 2 + "\t")
|
|
expect_str(": abcd-completed")
|
|
send(control("u"))
|
|
# Another one.
|
|
sendline("mkdir -p foo/bar; touch foo/bar/baz.fish")
|
|
send("source foo/b/baz.fish")
|
|
send(control("b") * 9 + "\t")
|
|
expect_str("source foo/bar/baz.fish")
|
|
send(control("u"))
|