From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v7 45/49] completion: bash: simplify _get_comp_words_by_ref()
Date: Sat, 1 Apr 2023 02:46:22 -0600 [thread overview]
Message-ID: <20230401084626.304356-46-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20230401084626.304356-1-felipe.contreras@gmail.com>
We don't need the whole functionality of _get_comp_words_by_ref(), we
know exactly what we need from that function, so only do that.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/completion/git-completion.bash | 30 ++++++--------------------
t/t9902-completion.sh | 21 ++++--------------
2 files changed, 10 insertions(+), 41 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 3f48b61cbe..7b46ce503d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -419,30 +419,12 @@ __git_reassemble_comp_words_by_ref()
if ! type _get_comp_words_by_ref >/dev/null 2>&1; then
_get_comp_words_by_ref ()
{
- local exclude cur_ words_ cword_
- if [ "$1" = "-n" ]; then
- exclude=$2
- shift 2
- fi
- __git_reassemble_comp_words_by_ref "$exclude"
- cur_=${words_[cword_]}
- while [ $# -gt 0 ]; do
- case "$1" in
- cur)
- cur=$cur_
- ;;
- prev)
- prev=${words_[$cword_-1]}
- ;;
- words)
- words=("${words_[@]}")
- ;;
- cword)
- cword=$cword_
- ;;
- esac
- shift
- done
+ local words_ cword_
+ __git_reassemble_comp_words_by_ref "=:"
+ cword=$cword_
+ cur=${words_[cword]}
+ prev=${words_[cword-1]}
+ words=("${words_[@]}")
}
fi
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index b4ed415245..fdc81d5d3f 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -40,23 +40,10 @@ GIT_TESTING_PORCELAIN_COMMAND_LIST='add checkout rebase'
# So let's override it with a minimal version for testing purposes.
_get_comp_words_by_ref ()
{
- while [ $# -gt 0 ]; do
- case "$1" in
- cur)
- cur=${_words[_cword]}
- ;;
- prev)
- prev=${_words[_cword-1]}
- ;;
- words)
- words=("${_words[@]}")
- ;;
- cword)
- cword=$_cword
- ;;
- esac
- shift
- done
+ cword=$_cword
+ cur=${_words[cword]}
+ prev=${_words[cword-1]}
+ words=("${_words[@]}")
}
print_comp ()
--
2.33.0
next prev parent reply other threads:[~2023-04-01 8:49 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-01 8:45 [PATCH v7 00/49] completion: git-completion 2.0 patches Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 01/49] test: completion add test for __git_cmd_idx Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 02/49] completion: bash: trivial cleanup Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 03/49] zsh: remove version Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 04/49] completion: bash: trivial grammar fix Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 05/49] completion: zsh: add higher-priority location Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 06/49] zsh: resolve symlink of script Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 07/49] zsh: simplify realpath dirname idiom Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 08/49] test: completion: use global config Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 09/49] completion: fix __git_cmd_idx regression for zsh Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 10/49] completion: fix for suboptions with value Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 11/49] completion: zsh: trivial improvement Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 12/49] completion: bash: do not modify COMP_WORDBREAKS Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 13/49] test: completion: fix currently typed words Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 14/49] test: completion: switch __gitcomp_nl prefix test Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 15/49] test: completion: add run_func() helper Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 16/49] completion: bash: remove non-append functionality Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 17/49] completion: bash: get rid of _append() functions Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 18/49] completion: bash: get rid of any non-append code Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 19/49] completion: zsh: fix options with arguments Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 20/49] completion: zsh: expand --git-dir file argument Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 21/49] completion: zsh: add support for general -C opts Felipe Contreras
2023-04-01 8:45 ` [PATCH v7 22/49] completion: zsh: fix for undefined completions Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 23/49] completion: zsh: add support for general -c opts Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 24/49] completion: zsh: fix extra space on foo= Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 25/49] completion: zsh: add excluded options Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 26/49] completion: zsh: always set compset Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 27/49] completion: factor out check in __gitcomp Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 28/49] completion: simplify equal suffix check Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 29/49] completion: refactor __gitcomp Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 30/49] completion: simplify __gitcomp Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 31/49] completion: bash: change suffix check in __gitcomp Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 32/49] completion: improve __gitcomp suffix code Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 33/49] test: completion: add missing test Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 34/49] completion: bash: simplify config_variable_name Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 35/49] completion: bash: improve __gitcomp description Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 36/49] completion: add __gitcomp_opts Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 37/49] completion: bash: cleanup __gitcomp* invocations Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 38/49] completion: bash: shuffle __gitcomp functions Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 39/49] completion: zsh: simplify __gitcomp_direct Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 40/49] completion: zsh: shuffle __gitcomp* functions Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 41/49] completion: zsh: fix direct quoting Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 42/49] completion: zsh: add elements individually in __gitcomp_opts Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 43/49] completion: zsh: add __gitcompadd helper Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 44/49] completion: zsh: add correct removable suffix Felipe Contreras
2023-04-01 8:46 ` Felipe Contreras [this message]
2023-04-01 8:46 ` [PATCH v7 46/49] completion: bash: refactor _get_comp_words_by_ref() Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 47/49] completion: bash: cleanup _get_comp_words_by_ref() Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 48/49] completion: bash: trivial cleanup Felipe Contreras
2023-04-01 8:46 ` [PATCH v7 49/49] completion: bash: rename _get_comp_words_by_ref() 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=20230401084626.304356-46-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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).