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

Block pseudo/meta arguments from ./configure completions

Browse source 
Also finishes faster.
This commit is contained in:
Mahmoud Al-Qudsi 2018-05-17 23:36:56 -05:00
parent 4b78c92652
commit 4974ecfc32
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
share/functions/__fish_parse_configure.fish
View file

@ -45,16 +45,23 @@ function __fish_parse_configure
if string replace -fr '^\s+(-.*?)\s+([^\s\-].*)' '$1\n$2' -- $line | read -lL opts description if string replace -fr '^\s+(-.*?)\s+([^\s\-].*)' '$1\n$2' -- $line | read -lL opts description
for opt in (string split -n , -- $opts | string trim) for opt in (string split -n , -- $opts | string trim)
if string match -qr -- '--.*=\[.*\]' $opt if string match -qr -- '--[a-z_0-9-]+=\[.*\]' $opt
# --option=[OPTIONAL_VALUE] # --option=[OPTIONAL_VALUE]
string replace -r -- '(--.*)=.*' '$1' $opt | read opt string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
else if string match -qr -- '--.*=[A-Z]+' $opt else if string match -qr -- '--[a-z_0-9-]+\[=.*\]' $opt
# --option[=OPTIONAL_VALUE]
string replace -r -- '(--[a-z_0-9-]+)\[=.*' '$1' $opt | read opt
else if string match -qr -- '--[a-z_0-9-]+=[A-Z]+' $opt
# --option=CLASS_OF_VALUE (eg FILE or DIR) # --option=CLASS_OF_VALUE (eg FILE or DIR)
string replace -r -- '(--.*)=.*' '$1' $opt | read opt string replace -r -- '(--[a-z_0-9-]+)=.*' '$1' $opt | read opt
else if string match -qr -- '--.*=\S+' $opt else if string match -qr -- '--[a-z_0-9-]+=\S+' $opt
# --option=literal_value, leave as-is # --option=literal_value, leave as-is
else if string match -qr -- '-[^-]\b' $opt else if string match -qr -- '--[a-z_0-9-]+$' $opt
# long option, leave as-is
else if string match -qr -- '-[^-]$' $opt
# short option, leave as-is # short option, leave as-is
else
continue
end end
echo "$opt"\t"$description" # parsed by `complete` as value and description echo "$opt"\t"$description" # parsed by `complete` as value and description