[PATCH] lei: completion: bash: generalize nospace usage

[PATCH] lei: completion: bash: generalize nospace usage

[Eric Wong]

We'll be completing more options with ':', '//' and '=' in the
future, so make it easier to disable trailing spaces on
completions.
---
 contrib/completion/lei-completion.bash | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/contrib/completion/lei-completion.bash b/contrib/completion/lei-completion.bash
index 619805fb..2c28d44a 100644
--- a/contrib/completion/lei-completion.bash
+++ b/contrib/completion/lei-completion.bash
@@ -4,14 +4,12 @@
 # preliminary bash completion support for lei (Local Email Interface)
 # Needs a lot of work, see `lei__complete' in lib/PublicInbox::LEI.pm
 _lei() {
-	case ${COMP_WORDS[@]} in
-	*' add-external h'* | *' --mirror h'*)
-		compopt -o nospace
-		;;
+	local wordlist="$(lei _complete ${COMP_WORDS[@]})"
+	case $wordlist in
+	*':'* | *'='* | '//'*) compopt -o nospace ;;
 	*) compopt +o nospace ;; # the default
 	esac
-	COMPREPLY=($(compgen -W "$(lei _complete ${COMP_WORDS[@]})" \
-			-- "${COMP_WORDS[COMP_CWORD]}"))
+	COMPREPLY=($(compgen -W "$wordlist" -- "${COMP_WORDS[COMP_CWORD]}"))
 	return 0
 }
 complete -o default -o bashdefault -F _lei lei

better "compopt -o nospace" ideas? [was: lei: completion: bash: generalize nospace usage]

[Eric Wong]

Eric Wong <e@80x24.org> wrote:
> We'll be completing more options with ':', '//' and '=' in the
> future, so make it easier to disable trailing spaces on
> completions.

<snip>

> +++ b/contrib/completion/lei-completion.bash
> @@ -4,14 +4,12 @@
>  # preliminary bash completion support for lei (Local Email Interface)
>  # Needs a lot of work, see `lei__complete' in lib/PublicInbox::LEI.pm
>  _lei() {
> -	case ${COMP_WORDS[@]} in
> -	*' add-external h'* | *' --mirror h'*)
> -		compopt -o nospace
> -		;;
> +	local wordlist="$(lei _complete ${COMP_WORDS[@]})"
> +	case $wordlist in
> +	*':'* | *'='* | '//'*) compopt -o nospace ;;

While this is nicer than before, I'm still wondering if there's
a better way for lei to communicate "-o nospace" to bash...
(or similar options for other shells)

Thanks in advance for any ideas you might provide.

>  	*) compopt +o nospace ;; # the default
>  	esac
> -	COMPREPLY=($(compgen -W "$(lei _complete ${COMP_WORDS[@]})" \
> -			-- "${COMP_WORDS[COMP_CWORD]}"))
> +	COMPREPLY=($(compgen -W "$wordlist" -- "${COMP_WORDS[COMP_CWORD]}"))
>  	return 0
>  }
>  complete -o default -o bashdefault -F _lei lei