From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH v2 08/26] completion: bash: get rid of _append() functions
Date: Tue, 10 Nov 2020 15:21:18 -0600 [thread overview]
Message-ID: <20201110212136.870769-9-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20201110212136.870769-1-felipe.contreras@gmail.com>
There's no need to have duplicated functionality.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.bash | 35 ++++++--------------------
contrib/completion/git-completion.zsh | 10 --------
2 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 6a1106f17d..7ecec00624 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -287,8 +287,7 @@ _get_comp_words_by_ref ()
}
fi
-# Fills the COMPREPLY array with prefiltered words without any additional
-# processing.
+# Appends prefiltered words to COMPREPLY without any additional processing.
# Callers must take care of providing only words that match the current word
# to be completed and adding any prefix and/or suffix (trailing space!), if
# necessary.
@@ -301,19 +300,6 @@ __gitcomp_direct ()
COMPREPLY+=($1)
}
-# Similar to __gitcomp_direct, but appends to COMPREPLY instead.
-# Callers must take care of providing only words that match the current word
-# to be completed and adding any prefix and/or suffix (trailing space!), if
-# necessary.
-# 1: List of newline-separated matching completion words, complete with
-# prefix and suffix.
-__gitcomp_direct_append ()
-{
- local IFS=$'\n'
-
- COMPREPLY+=($1)
-}
-
__gitcompappend ()
{
local x i=${#COMPREPLY[@]}
@@ -431,16 +417,8 @@ __gitcomp_builtin ()
__gitcomp "$options"
}
-# Variation of __gitcomp_nl () that appends to the existing list of
-# completion candidates, COMPREPLY.
-__gitcomp_nl_append ()
-{
- local IFS=$'\n'
- __gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }"
-}
-
# Generates completion reply from newline-separated possible completion words
-# by appending a space to all of them.
+# by appending a space to all of them. The result is appended to COMPREPLY.
# It accepts 1 to 4 arguments:
# 1: List of possible completion words, separated by a single newline.
# 2: A prefix to be added to each possible completion word (optional).
@@ -450,7 +428,8 @@ __gitcomp_nl_append ()
# appended.
__gitcomp_nl ()
{
- __gitcomp_nl_append "$@"
+ local IFS=$'\n'
+ __gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }"
}
# Fills the COMPREPLY array with prefiltered paths without any additional
@@ -837,7 +816,7 @@ __git_complete_refs ()
# Append DWIM remote branch names if requested
if [ "$dwim" = "yes" ]; then
- __gitcomp_direct_append "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
+ __gitcomp_direct "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
fi
}
@@ -2612,7 +2591,7 @@ __git_complete_config_variable_name ()
local pfx="${cur_%.*}."
cur_="${cur_#*.}"
__gitcomp_direct "$(__git_heads "$pfx" "$cur_" ".")"
- __gitcomp_nl_append $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx- }"
+ __gitcomp_nl $'autoSetupMerge\nautoSetupRebase\n' "$pfx" "$cur_" "${sfx- }"
return
;;
guitool.*.*)
@@ -2662,7 +2641,7 @@ __git_complete_config_variable_name ()
local pfx="${cur_%.*}."
cur_="${cur_#*.}"
__gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "."
- __gitcomp_nl_append "pushDefault" "$pfx" "$cur_" "${sfx- }"
+ __gitcomp_nl "pushDefault" "$pfx" "$cur_" "${sfx- }"
return
;;
url.*.*)
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index fa7f88bbb3..1781401f5d 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -120,16 +120,6 @@ __gitcomp_file ()
compadd -f -p "${2-}" -- ${(f)1} && _ret=0
}
-__gitcomp_direct_append ()
-{
- __gitcomp_direct "$@"
-}
-
-__gitcomp_nl_append ()
-{
- __gitcomp_nl "$@"
-}
-
__gitcomp_file_direct ()
{
__gitcomp_file "$1" ""
--
2.29.2
next prev parent reply other threads:[~2020-11-10 21:22 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-10 21:21 [PATCH v2 00/26] completion: bash: a bunch of fixes, cleanups, and reorganization Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 01/26] completion: bash: fix prefix detection in branch.* Felipe Contreras
2020-11-25 8:48 ` SZEDER Gábor
2020-11-25 20:37 ` Junio C Hamano
2020-11-25 21:46 ` Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 02/26] completion: bash: add correct suffix in variables Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 03/26] completion: bash: fix for suboptions with value Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 04/26] completion: bash: do not modify COMP_WORDBREAKS Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 05/26] test: completion: fix currently typed words Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 06/26] test: completion: add run_func() helper Felipe Contreras
2020-11-11 7:27 ` Junio C Hamano
2020-11-11 11:43 ` Felipe Contreras
2020-11-11 16:39 ` Junio C Hamano
2020-11-12 22:54 ` Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 07/26] completion: bash: remove non-append functionality Felipe Contreras
2020-11-10 21:21 ` Felipe Contreras [this message]
2020-11-10 21:21 ` [PATCH v2 09/26] completion: bash: get rid of any non-append code Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 10/26] completion: bash: factor out check in __gitcomp Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 11/26] completion: bash: simplify equal suffix check Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 12/26] completion: bash: refactor __gitcomp Felipe Contreras
2020-11-12 19:58 ` Junio C Hamano
2020-11-12 22:00 ` Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 13/26] completion: bash: simplify __gitcomp Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 14/26] completion: bash: change suffix check in __gitcomp Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 15/26] completion: bash: improve __gitcomp suffix code Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 16/26] completion: bash: simplify config_variable_name Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 17/26] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 18/26] completion: bash: simplify _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 19/26] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 20/26] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 21/26] completion: bash: trivial cleanup Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 22/26] completion: bash: rename _get_comp_words_by_ref() Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 23/26] completion: bash: improve __gitcomp description Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 24/26] completion: bash: add __gitcomp_opts Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 25/26] completion: bash: cleanup __gitcomp* invocations Felipe Contreras
2020-11-10 21:21 ` [PATCH v2 26/26] completion: bash: shuffle __gitcomp functions Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201110212136.870769-9-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).