Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-15 01:17:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove __fish_can_complete_switches

Browse source 
This was only used in __fish_should_complete_switches, and is a tiny
helper function that is better integrated directly.

Part of #5279.

[ci skip]
This commit is contained in:
Fabian Homborg 2019-01-26 19:11:27 +01:00
parent 882da75d29
commit 7ad779ac00
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
share/functions/__fish_can_complete_switches.fish
View file

@ -1,14 +0,0 @@
# Returns whether it is at all possible (even if not recommended)
# to complete a -s or --long argument.
function __fish_can_complete_switches
# Search backwards
for arg in (commandline -ct)[-1..1]
if test "$arg" = ""
continue
else if not string match -qr -- "^-\S*\$" "$arg"
return 1
end
end
return 0
end

6
share/functions/__fish_should_complete_switches.fish
View file

@ -1,8 +1,10 @@
# Returns whether we *should* complete a -s or --long argument.
# The preference is NOT to do so, i.e. prefer subcommands over switches.
function __fish_should_complete_switches
if not __fish_can_complete_switches
return 1
for arg in (commandline -ct)[-1..1]
if not string match -qr -- "^-\S*\$" "$arg"
return 1
end
end
if string match -qr -- "^-" (commandline -ct)[-1]
return 0