From: Jani Nikula <jani@nikula.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 2/3] completion: complete shared options for each command
Date: Sat, 17 Oct 2015 19:30:02 +0300 [thread overview]
Message-ID: <1445099403-25998-2-git-send-email-jani@nikula.org> (raw)
In-Reply-To: <1445099403-25998-1-git-send-email-jani@nikula.org>
Add support for completing --help, --uuid=, and --version after the
subcommand. Do not support shared options at the top level yet due to
difficulties in handling options with arguments.
--uuid necessitates adding 'compopt -o nospace' also to notmuch new
completion, but that just brings it in line with the rest.
---
completion/notmuch-completion.bash | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/completion/notmuch-completion.bash b/completion/notmuch-completion.bash
index 1552c1e51db7..1356c4a40515 100644
--- a/completion/notmuch-completion.bash
+++ b/completion/notmuch-completion.bash
@@ -27,6 +27,8 @@
# on completion.
#
+_notmuch_shared_options="--help --uuid= --version"
+
# $1: current input of the form prefix:partialinput, where prefix is
# to or from.
_notmuch_email()
@@ -109,7 +111,7 @@ _notmuch_compact()
! $split &&
case "${cur}" in
-*)
- local options="--backup= --quiet"
+ local options="--backup= --quiet ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -162,7 +164,7 @@ _notmuch_count()
! $split &&
case "${cur}" in
-*)
- local options="--output= --exclude= --batch --input= --lastmod"
+ local options="--output= --exclude= --batch --input= --lastmod ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -192,7 +194,7 @@ _notmuch_dump()
! $split &&
case "${cur}" in
-*)
- local options="--gzip --format= --output="
+ local options="--gzip --format= --output= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -222,7 +224,7 @@ _notmuch_insert()
! $split &&
case "${cur}" in
--*)
- local options="--create-folder --folder= --keep --no-hooks"
+ local options="--create-folder --folder= --keep --no-hooks ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
return
@@ -245,7 +247,8 @@ _notmuch_new()
case "${cur}" in
-*)
- local options="--no-hooks --quiet"
+ local options="--no-hooks --quiet ${_notmuch_shared_options}"
+ compopt -o nospace
COMPREPLY=( $(compgen -W "${options}" -- ${cur}) )
;;
esac
@@ -271,7 +274,7 @@ _notmuch_reply()
! $split &&
case "${cur}" in
-*)
- local options="--format= --format-version= --reply-to= --decrypt"
+ local options="--format= --format-version= --reply-to= --decrypt ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -301,7 +304,7 @@ _notmuch_restore()
! $split &&
case "${cur}" in
-*)
- local options="--format= --accumulate --input="
+ local options="--format= --accumulate --input= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -336,7 +339,7 @@ _notmuch_search()
! $split &&
case "${cur}" in
-*)
- local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate="
+ local options="--format= --output= --sort= --offset= --limit= --exclude= --duplicate= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -378,7 +381,7 @@ _notmuch_address()
! $split &&
case "${cur}" in
-*)
- local options="--format= --output= --sort= --exclude= --deduplicate="
+ local options="--format= --output= --sort= --exclude= --deduplicate= ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -412,7 +415,7 @@ _notmuch_show()
! $split &&
case "${cur}" in
-*)
- local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt --include-html"
+ local options="--entire-thread= --format= --exclude= --body= --format-version= --part= --verify --decrypt --include-html ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
;;
@@ -439,7 +442,7 @@ _notmuch_tag()
! $split &&
case "${cur}" in
--*)
- local options="--batch --input= --remove-all"
+ local options="--batch --input= --remove-all ${_notmuch_shared_options}"
compopt -o nospace
COMPREPLY=( $(compgen -W "$options" -- ${cur}) )
return
--
2.1.4
next prev parent reply other threads:[~2015-10-17 16:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-26 11:12 [PATCH] completion: handle notmuch address --deduplicate= option Jani Nikula
2015-10-17 16:30 ` [PATCH 1/3] completion: complete notmuch count --lastmod Jani Nikula
2015-10-17 16:30 ` Jani Nikula [this message]
2015-10-17 16:30 ` [PATCH 3/3] completion: clean up top level completion Jani Nikula
2015-10-17 21:03 ` [PATCH] completion: complete lastmod: search prefix Jani Nikula
2015-10-22 12:56 ` David Bremner
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: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445099403-25998-2-git-send-email-jani@nikula.org \
--to=jani@nikula.org \
--cc=notmuch@notmuchmail.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://yhetil.org/notmuch.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).