Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support [*{}~$] in completions with __fish_complete_suffix

Browse source 
Previously, trying to complete a token with any of these
expansion-related characters would cause the completion to return no
results, as it would emit expanded values which weren't matched by the
autocompleter.
This commit is contained in:
Mahmoud Al-Qudsi 2018-05-20 00:38:17 -05:00
parent 4974ecfc32
commit 332e17e8e8
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
share/functions/__fish_complete_suffix.fish
View file

@ -45,21 +45,26 @@ function __fish_complete_suffix -d "Complete using files"
# but complete.cpp will not consider it a match, so we have to output the
# correct form.
if string match -qr '^\./' -- $comp
eval "set files ./$base*$suff"
# Also do directory completion, since there might be files
# with the correct suffix in a subdirectory
eval "set files ./$base*{$suff,/}"
else
eval "set files $base*$suff"
# Also do directory completion, since there might be files
# with the correct suffix in a subdirectory
eval "set files $base*{$suff,/}"
end
# Another problem is that expanded paths are not matched, either.
# So an expression like $HOME/foo*.zip will expand to /home/rdahl/foo-bar.zip
# but that no longer matches the expression at the command line.
if string match -qr '[${}*~]' $comp
set -l expanded
eval "set expanded $comp"
set files (string replace -- $expanded $comp $files)
end
if test $files[1]
printf "%s\t$desc\n" $files
end
#
# Also do directory completion, since there might be files
# with the correct suffix in a subdirectory
# No need to describe directories (#279)
#
__fish_complete_directories $comp ""
end