diff mbox series

[41/51] completion: zsh: fix direct quoting

Message ID	20220830093138.1581538-42-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: git-fc@googlegroups.com, Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH 41/51] completion: zsh: fix direct quoting Date: Tue, 30 Aug 2022 04:31:28 -0500 Message-Id: <20220830093138.1581538-42-felipe.contreras@gmail.com> In-Reply-To: <20220830093138.1581538-1-felipe.contreras@gmail.com> References: <20220830093138.1581538-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	completion: revamp \| expand [00/51] completion: revamp [01/51] test: completion add test for __git_cmd_idx [02/51] test: add zsh completion tests [03/51] completion: fix __git_cmd_idx regression for zsh [04/51] completion: bash: trivial cleanup [05/51] completion: zsh: add higher-priority location [06/51] zsh: resolve symlink of script [07/51] zsh: simplify realpath dirname idiom [08/51] test: reset environment variables [09/51] completion: prompt: use generic colors [10/51] completion: fix for suboptions with value [11/51] completion: zsh: trivial improvement [12/51] completion: bash: do not modify COMP_WORDBREAKS [13/51] test: completion: fix currently typed words [14/51] test: completion: switch __gitcomp_nl prefix test [15/51] test: completion: add run_func() helper [16/51] completion: bash: remove non-append functionality [17/51] completion: bash: get rid of _append() functions [18/51] completion: bash: get rid of any non-append code [19/51] completion: zsh: fix options with arguments [20/51] completion: zsh: expand --git-dir file argument [21/51] completion: zsh: add support for general -C opts [22/51] completion: zsh: fix for undefined completions [23/51] completion: zsh: add support for general -c opts [24/51] completion: zsh: fix extra space on foo= [25/51] completion: zsh: add excluded options [26/51] completion: zsh: always set compset [27/51] completion: factor out check in __gitcomp [28/51] completion: simplify equal suffix check [29/51] completion: refactor __gitcomp [30/51] completion: simplify __gitcomp [31/51] completion: bash: change suffix check in __gitcomp [32/51] completion: improve __gitcomp suffix code [33/51] test: completion: add missing test [34/51] completion: bash: simplify config_variable_name [35/51] completion: bash: improve __gitcomp description [36/51] completion: add __gitcomp_opts [37/51] completion: bash: cleanup __gitcomp* invocations [38/51] completion: bash: shuffle __gitcomp functions [39/51] completion: zsh: simplify __gitcomp_direct [40/51] completion: zsh: shuffle __gitcomp* functions [41/51] completion: zsh: fix direct quoting [42/51] completion: zsh: add elements individually in __gitcomp_opts [43/51] completion: zsh: add __gitcompadd helper [44/51] completion: zsh: add correct removable suffix [45/51] completion: bash: simplify _get_comp_words_by_ref() [46/51] completion: bash: refactor _get_comp_words_by_ref() [47/51] completion: bash: cleanup _get_comp_words_by_ref() [48/51] completion: bash: trivial cleanup [49/51] completion: bash: rename _get_comp_words_by_ref() [50/51] zsh: remove version [51/51] completion: bash: trivial grammar fix

Commit Message

Felipe Contreras Aug. 30, 2022, 9:31 a.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 645b4bac31..27ca6efe89 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 ()