[PATCH] _multi_parts doesn't always pass -f to compadd

[PATCH] _multi_parts doesn't always pass -f to compadd

[dana]

I noticed this the other day and forgot about it until now. In some cases
(seemingly the most common ones?), _multi_parts doesn't pass -f to compadd,
which prevents colours/symbols from being applied to files. Just adding -f to
the list of options that are passed unconditionally seems to fix it? Possibly
some of the other options could be added too, but i didn't check

dana


diff --git a/Completion/Base/Utility/_multi_parts b/Completion/Base/Utility/_multi_parts
index 00e3e26cc..8a77ff0f0 100644
--- a/Completion/Base/Utility/_multi_parts
+++ b/Completion/Base/Utility/_multi_parts
@@ -15,7 +15,7 @@ typeset -U tmp1 matches
 
 zparseopts -D -a sopts \
     'J+:=group' 'V+:=group' 'x+:=expl' 'X+:=expl' 'P:=opts' 'F:=opts' \
-    S: r: R: q 1 2 o+: n f 'M+:=matcher' 'i=imm'
+    S: r: R: q 1 2 o+: n 'f=opts' 'M+:=matcher' 'i=imm'
 
 sopts=( "$sopts[@]" "$opts[@]" )
 if (( $#matcher )); then

Re: [PATCH] _multi_parts doesn't always pass -f to compadd

[Bart Schaefer]

On Sat, Dec 21, 2019 at 8:47 PM dana <dana@dana.is> wrote:
>
> I noticed this the other day and forgot about it until now. In some cases
> (seemingly the most common ones?), _multi_parts doesn't pass -f to compadd,
> which prevents colours/symbols from being applied to files. Just adding -f to
> the list of options that are passed unconditionally seems to fix it?

_multi_parts is intended to be usable in cases that are not files,
such as (IIRC) tar listings, perl module names, etc.

I don't know if passing -f to compadd when adding something that is
not a file has any bad effects.

Re: [PATCH] _multi_parts doesn't always pass -f to compadd

[dana]

On 21 Dec 2019, at 23:31, Bart Schaefer <schaefer@brasslantern.com> wrote:
> _multi_parts is intended to be usable in cases that are not files,
> such as (IIRC) tar listings, perl module names, etc.

Yeah. The caller still has to explicitly pass -f to _multi_parts (which is not
common — _git is like the only thing in the repo that does), so it shouldn't
affect anything that doesn't AFAIK

dana