Merge pull request #905 from scop/feat/3rd-party

feat: add 3rd party generated completion fallbacks

Author: scop

.pre-commit-config.yaml

@@ -34,10 +34,10 @@ repos:
         files: ^test/t/.+\.py$
         pass_filenames: false
 
-      - id: update-test-deprecated-links
-        name: update-test-deprecated-links
+      - id: update-test-fallback-links
+        name: update-test-fallback-links
         language: script
-        entry: test/deprecated/update-deprecated-links
+        entry: test/fallback/update-fallback-links
         files: ^completions/_
         pass_filenames: false
 

bash_completion

@@ -2537,6 +2537,9 @@ __load_completion()
         backslash=\\
     fi
 
+    # For loading 3rd party completions wrapped in shopt reset
+    local IFS=$' \t\n'
+
     for dir in "${dirs[@]}"; do
         [[ -d $dir ]] || continue
         for compfile in "$cmd" "$cmd.bash"; do
@@ -2554,7 +2557,7 @@ __load_completion()
         done
     done
 
-    # search deprecated completions "_$cmd"
+    # Search fallback completions named "_$cmd"
     for dir in "${dirs[@]}"; do
         [[ -d $dir ]] || continue
         compfile="$dir/_$cmd"
@@ -2564,7 +2567,7 @@ __load_completion()
             # Do not warn with . or .. (especially the former is common)
             [[ $compfile == */.?(.) ]] ||
                 echo "bash_completion: $compfile: is a directory" >&2
-        elif [[ -e $compfile ]] && . "$compfile"; then
+        elif [[ -e $compfile ]] && . "$compfile" "$cmd"; then
             [[ $backslash ]] && $(complete -p "$cmd") "\\$cmd"
             return 0
         fi

completions/.gitignore

@@ -84,6 +84,7 @@
 /host
 /hping
 /hping3
+/_hugo
 /iceweasel
 /identify
 /ifdown
@@ -95,6 +96,7 @@
 /iperf3
 /javac
 /javadoc
+/_kn
 /kplayer
 /l2ping
 /lbzip2
@@ -223,12 +225,15 @@
 /smbtree
 /sparc-koji
 /spovray
+/_sshi
 /star
 /stream
 /sudoedit
 /tightvncviewer
 /tracepath6
 /typeset
+/_upctl
+/_vacuum
 /vgcfgbackup
 /vgcfgrestore
 /vgchange

completions/Makefile.am

@@ -38,6 +38,7 @@ bashcomp_DATA = 2to3 \
 		bzip2 \
 		_cal \
 		cancel \
+		_cargo \
 		cardctl \
 		carton \
 		ccache \
@@ -130,12 +131,14 @@ bashcomp_DATA = 2to3 \
 		geoiplookup \
 		getconf \
 		getent \
+		_gh \
 		gkrellm \
 		gm \
 		gnatmake \
 		gnokii \
 		gnome-mplayer \
 		gnome-screenshot \
+		_golangci-lint \
 		gpasswd \
 		gpg \
 		gpg2 \
@@ -373,7 +376,9 @@ bashcomp_DATA = 2to3 \
 		rrdtool \
 		rsync \
 		_rtcwake \
+		_ruff \
 		_runuser \
+		_rustup \
 		sbcl \
 		sbopkg \
 		screen \
@@ -475,6 +480,7 @@ bashcomp_DATA = 2to3 \
 		xz \
 		xzdec \
 		ypmatch \
+		_yq \
 		_yum \
 		yum-arch \
 		zopfli \
@@ -593,6 +599,7 @@ CLEANFILES = \
 	host \
 	hping \
 	hping3 \
+	_hugo \
 	iceweasel \
 	identify \
 	ifdown \
@@ -604,6 +611,7 @@ CLEANFILES = \
 	iperf3 \
 	javac \
 	javadoc \
+	_kn \
 	kplayer \
 	l2ping \
 	lbzip2 \
@@ -766,12 +774,15 @@ CLEANFILES = \
 	smbtree \
 	sparc-koji \
 	spovray \
+	_sshi \
 	star \
 	stream \
 	sudoedit \
 	tightvncviewer \
 	tracepath6 \
 	typeset \
+	_upctl \
+	_vacuum \
 	vgcfgbackup \
 	vgcfgrestore \
 	vgchange \
@@ -868,6 +879,8 @@ symlinks: $(DATA)
 		geoiplookup6
 	$(ss) gkrellm \
 		gkrellm2
+	$(ss) _golangci-lint \
+		_hugo _kn _sshi _upctl _vacuum
 	$(ss) gpgv \
 		gpgv2
 	$(ss) gssdp-discover \

completions/_cargo

@@ -0,0 +1,13 @@
+# 3rd party completion loader for cargo                    -*- shell-script -*-
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+# shellcheck disable=SC2168 # "local" is ok, assume sourced by __load_completion
+local rustup="${1%cargo}rustup" # use rustup from same dir
+eval -- "$("$rustup" completions bash cargo 2>/dev/null)"
+
+{
+    complete -p "$1" || complete -p "${1##*/}"
+} &>/dev/null
+
+# ex: filetype=sh

completions/_gh

@@ -0,0 +1,12 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "$cmd completion --shell bash".
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" completion --shell bash 2>/dev/null)"
+
+{
+    complete -p "$1" || complete -p "${1##*/}"
+} &>/dev/null
+
+# ex: filetype=sh

completions/_golangci-lint

@@ -0,0 +1,13 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "$cmd completion bash".
+# For example, many Go programs using https://github.com/spf13/cobra do.
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" completion bash 2>/dev/null)"
+
+{
+    complete -p "$1" || complete -p "${1##*/}"
+} &>/dev/null
+
+# ex: filetype=sh

completions/_ruff

@@ -0,0 +1,12 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "$cmd generate-shell-completion bash".
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" generate-shell-completion bash 2>/dev/null)"
+
+{
+    complete -p "$1" || complete -p "${1##*/}"
+} &>/dev/null
+
+# ex: filetype=sh

completions/_rustup

@@ -0,0 +1,11 @@
+# 3rd party completion loader for rustup                   -*- shell-script -*-
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" completions bash rustup 2>/dev/null)"
+
+{
+    complete -p "$1" || complete -p "${1##*/}"
+} &>/dev/null
+
+# ex: filetype=sh

completions/_yq

@@ -0,0 +1,12 @@
+# 3rd party completion loader for commands emitting        -*- shell-script -*-
+# their completion using "$cmd shell-completion bash".
+#
+# This serves as a fallback in case the completion is not installed otherwise.
+
+eval -- "$("$1" shell-completion bash 2>/dev/null)"
+
+{
+    complete -p "$1" || complete -p "${1##*/}"
+} &>/dev/null
+
+# ex: filetype=sh