diff mbox series

[v2,37/45] completion: zsh: fix direct quoting

Message ID	20210618182518.697912-38-felipe.contreras@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: Felipe Contreras <felipe.contreras@gmail.com> To: git@vger.kernel.org Cc: Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH v2 37/45] completion: zsh: fix direct quoting Date: Fri, 18 Jun 2021 13:25:10 -0500 Message-Id: <20210618182518.697912-38-felipe.contreras@gmail.com> In-Reply-To: <20210618182518.697912-1-felipe.contreras@gmail.com> References: <20210618182518.697912-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	completion: git-completion 1.3.3 patches \| expand [v2,00/45] completion: git-completion 1.3.3 patches [v2,01/45] completion: fix __git_cmd_idx regression [v2,02/45] completion: bash: fix prefix detection in branch.* [v2,03/45] completion: fix for suboptions with value [v2,04/45] completion: bash: fix for multiple dash commands [v2,05/45] completion: bash: add correct suffix in variables [v2,06/45] completion: zsh: add higher-priority location [v2,07/45] completion: zsh: trivial improvement [v2,08/45] completion: bash: do not modify COMP_WORDBREAKS [v2,09/45] test: completion: fix currently typed words [v2,10/45] test: completion: switch __gitcomp_nl prefix test [v2,11/45] test: completion: add run_func() helper [v2,12/45] completion: bash: remove non-append functionality [v2,13/45] completion: bash: get rid of _append() functions [v2,14/45] completion: bash: get rid of any non-append code [v2,15/45] completion: zsh: fix options with arguments [v2,16/45] completion: zsh: expand --git-dir file argument [v2,17/45] completion: zsh: add support for general -C opts [v2,18/45] completion: zsh: fix for undefined completions [v2,19/45] completion: zsh: add support for general -c opts [v2,20/45] completion: zsh: fix extra space on foo= [v2,21/45] completion: zsh: add excluded options [v2,22/45] completion: zsh: always set compset [v2,23/45] completion: factor out check in __gitcomp [v2,24/45] completion: simplify equal suffix check [v2,25/45] completion: refactor __gitcomp [v2,26/45] completion: simplify __gitcomp [v2,27/45] completion: bash: change suffix check in __gitcomp [v2,28/45] completion: improve __gitcomp suffix code [v2,29/45] completion: bash: simplify config_variable_name [v2,30/45] test: completion: add missing test [v2,31/45] completion: bash: improve __gitcomp description [v2,32/45] completion: add __gitcomp_opts [v2,33/45] completion: bash: cleanup __gitcomp* invocations [v2,34/45] completion: bash: shuffle __gitcomp functions [v2,35/45] completion: zsh: simplify __gitcomp_direct [v2,36/45] completion: zsh: shuffle __gitcomp* functions [v2,37/45] completion: zsh: fix direct quoting [v2,38/45] completion: zsh: add elements individually in __gitcomp_opts [v2,39/45] completion: zsh: add __gitcompadd helper [v2,40/45] completion: zsh: add correct removable suffix [v2,41/45] completion: bash: simplify _get_comp_words_by_ref() [v2,42/45] completion: bash: refactor _get_comp_words_by_ref() [v2,43/45] completion: bash: cleanup _get_comp_words_by_ref() [v2,44/45] completion: bash: trivial cleanup [v2,45/45] completion: bash: rename _get_comp_words_by_ref()

Commit Message

Felipe Contreras June 18, 2021, 6:25 p.m. UTC

Apparently using "compadd -Q" is almost always wrong, we want zsh to add
quoting when necessary. However, if we remove the -Q option, that would
make zsh add an extra "\ " at the end of some completions.

We can manually remove the spaces from the completions that have them,
and then add the suffix with the -S option, thus there's no more need
for the -Q option.

This makes completions like "stash@{0}" complete correctly:

  git stash show <tab>

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 contrib/completion/git-completion.zsh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index c4510a3180..3818291950 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -55,7 +55,7 @@  __gitcomp ()
 	emulate -L zsh
 
 	local IFS=$' \t\n'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	compadd -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
 }
 
 __gitcomp_opts ()
@@ -85,14 +85,17 @@  __gitcomp_opts ()
 		fi
 		array+=("$c$sfx")
 	done
-	compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+	compadd -S '' -p "${2-}" -a -- array && _ret=0
 }
 
 __gitcomp_nl ()
 {
 	emulate -L zsh
 
-	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
+	# words that don't end up in space
+	compadd -p "${2-}" -S "${4- }" -q -- ${${(f)1}:#*\ } && _ret=0
+	# words that end in space
+	compadd -p "${2-}" -S " ${4- }" -q -- ${${(M)${(f)1}:#*\ }% } && _ret=0
 }
 
 __gitcomp_file ()