zsh-workers
 help / color / mirror / Atom feed
* [PATCH] Fix zstyle option completion
@ 2020-12-13  4:15 dana
  2020-12-13 17:31 ` Daniel Shahaf
  0 siblings, 1 reply; 3+ messages in thread
From: dana @ 2020-12-13  4:15 UTC (permalink / raw)
  To: Zsh hackers list; +Cc: Daniel Shahaf

I often retrieve zstyle commands from history and then edit them to add -d or
whatever at the beginning. But the completion function won't complete for you
there because of the change made by Daniel in workers/39659.

@Daniel: I think this achieves what you wanted without breaking my use case,
doesn't it? Or did you have something else in mind that i'm not seeing?

dana


diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle
index 75acde5f7..9e82d8ad5 100644
--- a/Completion/Zsh/Command/_zstyle
+++ b/Completion/Zsh/Command/_zstyle
@@ -217,7 +217,7 @@ taglist=(
 )
 
 # Be careful with the context arguments here.  They like to masquerade.
-_arguments -C \
+_arguments -C -A '-*' \
   '(: -)-L[output in form of zstyle commands]:pattern for context patterns:->metapatterns:style:->metastyles' \
   '(: -)-d[delete style definitions]:verbatim context pattern:->patterns:*:styles:->pstyles' \
   '(: -)-e[value is evaluated when style is looked up]:context pattern:->contexts:style:->styles:*:command:_cmdstring' \
@@ -228,7 +228,7 @@ _arguments -C \
   '(: -)-t[test a style, returning false if it'\''s undefined]:context name:->contexts:style:->styles:*:strings to test presence of: ' \
   '(: -)-T[test a style, returning true if it'\''s undefined]:context name:->contexts:style:->styles:*:strings to test presence of: ' \
   '(: -)-m[pattern-match values of a style]:context name:->contexts:style:->styles:pattern: ' \
-  '(-):context pattern:->contexts' '(-):style:->styles' '(-)*:argument:->style-arg'
+  ':context pattern:->contexts' ':style:->styles' '*:argument:->style-arg'
 
 while (( $#state )); do
   case "$state[1]" in



^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Fix zstyle option completion
  2020-12-13  4:15 [PATCH] Fix zstyle option completion dana
@ 2020-12-13 17:31 ` Daniel Shahaf
  2020-12-14  9:55   ` dana
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Shahaf @ 2020-12-13 17:31 UTC (permalink / raw)
  To: dana; +Cc: Zsh hackers list

dana wrote on Sat, Dec 12, 2020 at 22:15:47 -0600:
> I often retrieve zstyle commands from history and then edit them to add -d or
> whatever at the beginning. But the completion function won't complete for you
> there because of the change made by Daniel in workers/39659.
> 

A regression, then?  Sorry about that.

Could you clarify the precise LBUFFER/RBUFFER values that "won't
complete"?

> @Daniel: I think this achieves what you wanted without breaking my use case,
> doesn't it? Or did you have something else in mind that i'm not seeing?

What I had in mind in that commit was to complete the correct non-option
arguments after the options listed in the log message; e.g., «zstyle -s
<TAB>», «zstyle -s foo <TAB>», «zstyle -s foo bar <TAB>».

The «(-)» exclusions in the line changed were designed to make that line
complete the "set a zstyle" syntax, «zstyle foo bar baz» without any of
the options (not even -e, which is handled separately).

As written, I think the patch will cause «zstyle -g foo bar baz <TAB>»
to offer completions, whereas currently it correctly completes nothing.
(Just observing; not implying any conclusions.)

Cheers,

Daniel
(ENOTIME to test, sorry)

> diff --git a/Completion/Zsh/Command/_zstyle b/Completion/Zsh/Command/_zstyle
> index 75acde5f7..9e82d8ad5 100644
> --- a/Completion/Zsh/Command/_zstyle
> +++ b/Completion/Zsh/Command/_zstyle
> @@ -217,7 +217,7 @@ taglist=(
>  )
>  
>  # Be careful with the context arguments here.  They like to masquerade.
> -_arguments -C \
> +_arguments -C -A '-*' \
>    '(: -)-L[output in form of zstyle commands]:pattern for context patterns:->metapatterns:style:->metastyles' \
>    '(: -)-d[delete style definitions]:verbatim context pattern:->patterns:*:styles:->pstyles' \
>    '(: -)-e[value is evaluated when style is looked up]:context pattern:->contexts:style:->styles:*:command:_cmdstring' \
> @@ -228,7 +228,7 @@ _arguments -C \
>    '(: -)-t[test a style, returning false if it'\''s undefined]:context name:->contexts:style:->styles:*:strings to test presence of: ' \
>    '(: -)-T[test a style, returning true if it'\''s undefined]:context name:->contexts:style:->styles:*:strings to test presence of: ' \
>    '(: -)-m[pattern-match values of a style]:context name:->contexts:style:->styles:pattern: ' \
> -  '(-):context pattern:->contexts' '(-):style:->styles' '(-)*:argument:->style-arg'
> +  ':context pattern:->contexts' ':style:->styles' '*:argument:->style-arg'
>  
>  while (( $#state )); do
>    case "$state[1]" in
> 
> 


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Fix zstyle option completion
  2020-12-13 17:31 ` Daniel Shahaf
@ 2020-12-14  9:55   ` dana
  0 siblings, 0 replies; 3+ messages in thread
From: dana @ 2020-12-14  9:55 UTC (permalink / raw)
  To: Daniel Shahaf; +Cc: Zsh hackers list

On 13 Dec 2020, at 11:31, Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
> Could you clarify the precise LBUFFER/RBUFFER values that "won't
> complete"?

For example, when i do:

  # LBUFFER='zstyle -'
  # RBUFFER=' foo bar'
  % zstyle -<TAB> foo bar

... it tries (unsuccessfully) to complete argument-1 instead of showing me
options.

On 13 Dec 2020, at 11:31, Daniel Shahaf <d.s@daniel.shahaf.name> wrote:
> As written, I think the patch will cause «zstyle -g foo bar baz <TAB>»
> to offer completions, whereas currently it correctly completes nothing.

I don't think it should. All the options are exclusive with each other, so
that takes care of that already, and the -A '-*' should handle cases like
`zstyle foo bar <TAB>`. It gives me 'no more arguments' when i test your
example with my change. But i might not fully understand what you mean

dana



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-12-14  9:55 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-13  4:15 [PATCH] Fix zstyle option completion dana
2020-12-13 17:31 ` Daniel Shahaf
2020-12-14  9:55   ` dana

zsh-workers

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/zsh-workers

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 zsh-workers zsh-workers/ http://inbox.vuxu.org/zsh-workers \
		zsh-workers@zsh.org
	public-inbox-index zsh-workers

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.archive.zsh.workers


code repositories for the project(s) associated with this inbox:

	https://git.vuxu.org/mirror/zsh/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git