Merge pull request #2063 from gaelicWizard/lib/completion/components - I know she's borken but I can fix her!

Author: seefood

completion/available/apm.completion.bash

@@ -1,4 +1,4 @@
 # shellcheck shell=bash
 about-completion "apm completion"
-# shellcheck disable=SC1090
-source "${BASH_IT}"/vendor/github.com/vigo/apm-bash-completion/apm
+# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/vigo/apm-bash-completion
+source "${BASH_IT?}/vendor/github.com/vigo/apm-bash-completion/apm"

completion/available/awless.completion.bash

@@ -1,5 +1,10 @@
 # shellcheck shell=bash
-if _command_exists awless; then
-	# shellcheck disable=SC1090
-	source <(awless completion bash)
-fi
+
+# Make sure awless is installed
+_bash-it-completion-helper-necessary awless || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient awless || return
+
+# shellcheck disable=SC1090
+source <(awless completion bash)

completion/available/awscli.completion.bash

@@ -1,5 +1,9 @@
 # shellcheck shell=bash
 
-if _command_exists aws_completer; then
-	complete -C "$(command -v aws_completer)" aws
-fi
+# Make sure aws is installed
+_bash-it-completion-helper-necessary aws aws_completer || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient aws || return
+
+complete -C aws_completer aws

completion/available/cargo.completion.bash

@@ -1,6 +1,10 @@
 # shellcheck shell=bash
-# cargo (Rust package manager) completion
+about-completion "cargo (Rust package manager) completion"
 
-if _binary_exists rustup && _binary_exists cargo; then
-	eval "$(rustup completions bash cargo)"
-fi
+# Make sure cargo is installed
+_bash-it-completion-helper-necessary rustup cargo || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient cargo || return
+
+eval "$(rustup completions bash cargo)"

completion/available/conda.completion.bash

@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "conda completion"
 
 if _command_exists conda; then

completion/available/consul.completion.bash

@@ -1,7 +1,10 @@
 # shellcheck shell=bash
-cite "about-completion"
 about-completion "Hashicorp consul completion"
 
-if _command_exists consul; then
-	complete -C "$(command -v consul)" consul
-fi
+# Make sure consul is installed
+_bash-it-completion-helper-necessary consul || return
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient consul || return
+
+complete -C consul consul

completion/available/crystal.completion.bash

@@ -1,2 +1,4 @@
 # shellcheck shell=bash
-_log_warning 'Bash completion for "crystal" is now covered by "system". This completion can be disabled.'
+
+_log_warning 'Bash completion for "crystal" is now covered by "system".'
+_disable-completion "crystal"

completion/available/defaults.completion.bash

@@ -1,6 +1,7 @@
 # shellcheck shell=bash
 # shellcheck disable=SC1090
 
-if test -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash"; then
-	source "$_"
+if [[ -s "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash" ]]; then
+	# shellcheck source-path=SCRIPTDIR/../../vendor/github.com/gaelicWizard/bash-progcomp
+	source "${BASH_IT?}/vendor/github.com/gaelicWizard/bash-progcomp/defaults.completion.bash"
 fi

completion/available/dirs.completion.bash

@@ -1,16 +1,13 @@
 # shellcheck shell=bash
-# Bash completion support for the 'dirs' plugin (commands G, R).
+about-completion "Bash completion support for the 'dirs' plugin (commands G, R)."
 
-_dirs-complete() {
-	local CURRENT_PROMPT="${COMP_WORDS[COMP_CWORD]}"
-
-	# parse all defined shortcuts from ~/.dirs
-	if [ -r "$HOME/.dirs" ]; then
-		# shellcheck disable=SC2207
-		COMPREPLY=($(compgen -W "$(grep -v '^#' ~/.dirs | sed -e 's/\(.*\)=.*/\1/')" -- "${CURRENT_PROMPT}"))
+function _dirs-complete() {
+	# parse all defined shortcuts ${BASH_IT_DIRS_BKS}
+	if [[ -s "${BASH_IT_DIRS_BKS:-/dev/null}" ]]; then
+		IFS=$'\n' read -d '' -ra COMPREPLY < <(grep -v '^#' "${BASH_IT_DIRS_BKS?}" | sed -e 's/\(.*\)=.*/\1/')
 	fi
 
 	return 0
 }
 
-complete -o default -o nospace -F _dirs-complete G R
+complete -o default -o nospace -F _dirs-complete -X '!&*' G R

completion/available/dmidecode.completion.bash

@@ -1,22 +1,25 @@
 # shellcheck shell=bash
 
-function __dmidecode_completion() {
-	# shellcheck disable=SC2155
-	local prev=$(_get_pword)
-	# shellcheck disable=SC2155
-	local curr=$(_get_cword)
+# Make sure dmidecode is installed
+_bash-it-completion-helper-necessary dmidecode || :
+
+# Don't handle completion if it's already managed
+_bash-it-completion-helper-sufficient dmidecode || return
+
+function _dmidecode() {
+	local prev="${COMP_WORDS[COMP_CWORD - 1]}"
 
 	case $prev in
 		-s | --string | -t | --type)
 			OPTS=$(dmidecode "$prev" 2>&1 | grep -E '^ ' | sed 's/ *//g')
 			# shellcheck disable=SC2207
-			COMPREPLY=($(compgen -W "$OPTS" -- "$curr"))
+			COMPREPLY=("${OPTS[@]}")
 			;;
 		dmidecode)
 			# shellcheck disable=SC2207
-			COMPREPLY=($(compgen -W "-d --dev-mem -h --help -q --quiet -s --string -t --type -H --handle -u --dump{,-bin} --from-dump --no-sysfs --oem-string -V --version" -- "$curr"))
+			COMPREPLY=("-d" "--dev-mem" "-h" "--help" "-q" "--quiet" "-s" "--string" "-t" "--type" "-H" "--handle" "-u" "--dump" "-dump-bin" "--from-dump" "--no-sysfs" "--oem-string" "-V" "--version")
 			;;
 	esac
 }
 
-complete -F __dmidecode_completion dmidecode
+complete -F _dmidecode -X '!&*' dmidecode