Merge pull request #1365 from scop/feat/shtab-3rdparty

feat(shtab): add 3rd party fallback completion loader

Author: scop

completions/.gitignore

@@ -107,8 +107,8 @@
 /dropdb
 /dropuser
 /_dyff
-/_esc
 /edquota
+/_esc
 /etherwake
 /f77
 /f95
@@ -149,6 +149,7 @@
 /_gitsign
 /gkrellm2
 /_glab
+/_glances
 /_glen
 /_glow
 /gmake
@@ -222,9 +223,9 @@
 /_kubectl
 /_kubectl-argo-rollouts
 /_kubectl-kuttl
-/_kubescape
 /_kubelogin
 /_kubemqctl
+/_kubescape
 /_kubesec
 /_kubeshark
 /_kubespy
@@ -274,8 +275,8 @@
 /_mise
 /mkisofs
 /_mmctl
-/mogrify
 /_mockery
+/mogrify
 /_moldy
 /montage
 /mozilla-firefox
@@ -346,15 +347,15 @@
 /py.test-[23]
 /pydoc3
 /pylint-[23]
+/pypy
+/pypy3
+/pyston
+/pyston3
 /pytest-[23]
 /python2
 /python2.*
 /python3
 /python3.*
-/pypy
-/pypy3
-/pyston
-/pyston3
 /pyvenv-3.*
 /qemu-kvm
 /qemu-system-i386
@@ -385,16 +386,16 @@
 /_sentry-cli
 /setquota
 /sftp
-/shasum
 /sha1sum
 /sha224sum
 /sha384sum
 /sha512sum
+/shasum
 /sidedoor
 /_sinker
 /_skaffold
-/_slsa-verifier
 /slogin
+/_slsa-verifier
 /smbcacls
 /smbcquotas
 /smbget
@@ -420,14 +421,20 @@
 /_tendermint
 /_terraform
 /_tfctl
+/tightvncviewer
 /_tilt
 /_timoni
 /_tkn
 /_tkn-pac
-/tightvncviewer
+/_tldr
 /_todoist
 /_tofu
 /tracepath6
+/_trash
+/_trash-empty
+/_trash-list
+/_trash-put
+/_trash-restore
 /_trivy
 /typeset
 /_upctl
@@ -467,8 +474,8 @@
 /_xc
 /xpovray
 /xvnc4viewer
-/_ytt
 /ypcat
+/_ytt
 /_zarf
 /_zitadel
 /_zola

completions/Makefile.am

@@ -38,8 +38,8 @@ cross_platform = 2to3 \
 		bzip2 \
 		_cal \
 		cancel \
-		_cargo \
 		cardctl \
+		_cargo \
 		carton \
 		ccache \
 		ccze \
@@ -209,9 +209,9 @@ cross_platform = 2to3 \
 		java \
 		javaws \
 		_jj \
-		jq \
 		jpegoptim \
 		jps \
+		jq \
 		jshint \
 		json_xs \
 		jsonschema \
@@ -238,8 +238,8 @@ cross_platform = 2to3 \
 		list_lists \
 		list_members \
 		list_owners \
-		_look \
 		locale-gen \
+		_look \
 		lpq \
 		lpr \
 		lrzip \
@@ -404,6 +404,7 @@ cross_platform = 2to3 \
 		sh \
 		sha256sum \
 		shellcheck \
+		_shtab \
 		sitecopy \
 		slabtop \
 		_slackpkg \
@@ -425,8 +426,8 @@ cross_platform = 2to3 \
 		sshow \
 		_stern \
 		strace \
-		_stripe \
 		strings \
+		_stripe \
 		_su \
 		sudo \
 		svcadm \
@@ -571,9 +572,9 @@ CLEANFILES = \
 	_ansible-playbook \
 	_ansible-pull \
 	_ansible-vault \
+	_apko \
 	apropos \
 	aptitude-curses \
-	_apko \
 	_aqua \
 	_arduino-cli \
 	_argo \
@@ -649,9 +650,9 @@ CLEANFILES = \
 	_datree \
 	dcop \
 	_deck \
+	_deno \
 	_depot \
 	_devspace \
-	_deno \
 	dfutool \
 	_diesel \
 	display \
@@ -665,8 +666,8 @@ CLEANFILES = \
 	dropdb \
 	dropuser \
 	_dyff \
-	_esc \
 	edquota \
+	_esc \
 	etherwake \
 	f77 \
 	f95 \
@@ -717,6 +718,7 @@ CLEANFILES = \
 	_gitsign \
 	gkrellm2 \
 	_glab \
+	_glances \
 	_glen \
 	_glow \
 	gmake \
@@ -790,9 +792,9 @@ CLEANFILES = \
 	_kubectl \
 	_kubectl-argo-rollouts \
 	_kubectl-kuttl \
-	_kubescape \
 	_kubelogin \
 	_kubemqctl \
+	_kubescape \
 	_kubesec \
 	_kubeshark \
 	_kubespy \
@@ -847,9 +849,9 @@ CLEANFILES = \
 	lz4c \
 	mailsnarf \
 	_mattermost \
-	_melange \
 	md5sum \
 	mdecrypt \
+	_melange \
 	mencoder \
 	_metalctl \
 	micropython \
@@ -991,11 +993,11 @@ CLEANFILES = \
 	_sentry-cli \
 	setquota \
 	sftp \
-	shasum \
 	sha1sum \
 	sha224sum \
 	sha384sum \
 	sha512sum \
+	shasum \
 	sidedoor \
 	_sinker \
 	_skaffold \
@@ -1026,14 +1028,20 @@ CLEANFILES = \
 	_tendermint \
 	_terraform \
 	_tfctl \
+	tightvncviewer \
 	_tilt \
 	_timoni \
 	_tkn \
 	_tkn-pac \
-	tightvncviewer \
+	_tldr \
 	_todoist \
 	_tofu \
 	tracepath6 \
+	_trash \
+	_trash-empty \
+	_trash-list \
+	_trash-put \
+	_trash-restore \
 	_trivy \
 	typeset \
 	_upctl \
@@ -1073,8 +1081,8 @@ CLEANFILES = \
 	_xc \
 	xpovray \
 	xvnc4viewer \
-	_ytt \
 	ypcat \
+	_ytt \
 	_zarf \
 	_zitadel \
 	_zola
@@ -1355,6 +1363,9 @@ symlinks: $(DATA)
 		javac javadoc
 	$(ss) koji \
 		arm-koji ppc-koji s390-koji sparc-koji
+	$(ss) _keyring \
+		_glances _tldr _trash _trash-empty _trash-list \
+		_trash-put _trash-restore
 	$(ss) ldapsearch \
 		ldapadd ldapcompare ldapdelete ldapmodify ldapmodrdn \
 		ldappasswd ldapwhoami

completions/_shtab

@@ -0,0 +1,9 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "$cmd --print-own-completion bash".
+# For example, https://github.com/iterative/shtab does.
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" --print-own-completion bash 2>/dev/null)"
+
+# ex: filetype=sh

test/fallback/completions/shtab

@@ -0,0 +1 @@
+../../../completions/_shtab

test/t/Makefile.am

@@ -568,6 +568,7 @@ EXTRA_DIST = \
 	test_sha512sum.py \
 	test_shar.py \
 	test_shellcheck.py \
+	test_shtab.py \
 	test_sitecopy.py \
 	test_slabtop.py \
 	test_slackpkg.py \

test/t/test_shtab.py

@@ -0,0 +1,11 @@
+import pytest
+
+
+class TestShtab:
+    @pytest.mark.complete("shtab ", require_cmd=True)
+    def test_basic(self, completion):
+        assert not completion
+
+    @pytest.mark.complete("shtab -", require_cmd=True)
+    def test_options(self, completion):
+        assert completion

test/test-cmd-list.txt

@@ -346,6 +346,7 @@ sha384sum
 sha512sum
 shar
 shellcheck
+shtab
 sitecopy
 slabtop
 slapt-get