From 6c09f2a45c5541e9c207d14fc7aa21a4a0066bde Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 4 May 2024 03:03:19 +0200
Subject: Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 completions/shellcheck | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

(limited to 'completions/shellcheck')

diff --git a/completions/shellcheck b/completions/shellcheck
index 6421d7b..dc14c07 100644
--- a/completions/shellcheck
+++ b/completions/shellcheck
@@ -1,63 +1,65 @@
 # bash completion for shellcheck(1)                        -*- shell-script -*-
 
-_shellcheck_optarg()
+_comp_cmd_shellcheck__optarg()
 {
     local args=$("$1" --help 2>&1 |
-        command sed -e 's/,/ /g' -ne 's/^.*'$2'\>.*(\([^)]*\)).*/\1/p')
-    COMPREPLY+=($(compgen -W '$args' -- "$cur"))
+        command sed -e 's/,/ /g' -ne 's/^.*'"$2"'\>.*(\([^)]*\)).*/\1/p')
+    _comp_compgen -a -- -W '$args'
 }
 
-_shellcheck()
+_comp_cmd_shellcheck()
 {
-    local cur prev words cword split
-    _init_completion -s || return
+    local cur prev words cword was_split comp_args
+    _comp_initialize -s -- "$@" || return
 
+    local noargopts='!(-*|*[eifCsoPW]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --version | -!(-*)V*)
+        --version | -${noargopts}V*)
             return
             ;;
-        --exclude | --include | -!(-*)[ei])
+        --exclude | --include | -${noargopts}[ei])
             return
             ;;
-        --format | -!(-*)f)
+        --format | -${noargopts}f)
             local args=$("$1" --format=nonexistent-format /dev/null 2>&1 |
                 command sed -ne '/^Supported formats/,//p' |
                 command sed -ne '/^[[:space:]]/p')
-            COMPREPLY=($(compgen -W '$args' -- "$cur"))
+            _comp_compgen -- -W '$args'
             return
             ;;
-        --color | -!(-*)C)
-            _shellcheck_optarg "$1" --color
+        --color | -${noargopts}C)
+            _comp_cmd_shellcheck__optarg "$1" --color
             return
             ;;
-        --shell | -!(-*)s)
-            _shellcheck_optarg "$1" --shell
+        --shell | -${noargopts}s)
+            _comp_cmd_shellcheck__optarg "$1" --shell
             return
             ;;
-        --enable | -!(-*)o)
-            COMPREPLY=($(compgen -W 'all' -- "$cur")) # TODO others?
+        --enable | -${noargopts}o)
+            _comp_compgen -- -W 'all' # TODO others?
             return
             ;;
-        --source-path | -!(-*)P)
-            _filedir -d
-            COMPREPLY+=($(compgen -W 'SCRIPTDIR' -- "$cur"))
+        --source-path | -${noargopts}P)
+            _comp_compgen_filedir -d
+            _comp_compgen -a -- -W 'SCRIPTDIR'
             return
             ;;
-        --wiki-link-count | -!(-*)W)
+        --wiki-link-count | -${noargopts}W)
             return
             ;;
     esac
 
-    $split && return
+    [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
+        _comp_compgen_help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi
 
-    _filedir
+    _comp_compgen_filedir
 } &&
-    complete -F _shellcheck shellcheck
+    complete -F _comp_cmd_shellcheck shellcheck
 
 # ex: filetype=sh
-- 
cgit v1.2.3