refactor: { => _comp_compgen}_tilde with interface changes

Author: akinomyoga

bash_completion

@@ -850,7 +850,7 @@ _comp_quote_compgen()
 #
 _comp_compgen_filedir()
 {
-    _tilde "${cur-}" || return
+    _comp_compgen_tilde && return
 
     local -a toks
     local arg=${1-}
@@ -1458,21 +1458,21 @@ _ncpus()
 }
 
 # Perform tilde (~) completion
-# @return  True (0) if completion needs further processing,
-#          False (1) if tilde is followed by a valid username, completions are
+# @return  False (1) if completion needs further processing,
+#          True (0) if tilde is followed by a valid username, completions are
 #          put in COMPREPLY and no further processing is necessary.
-# TODO: rename per API conventions
-_tilde()
+_comp_compgen_tilde()
 {
-    if [[ ${1-} == \~* && $1 != */* ]]; then
+    if [[ ${cur-} == \~* && $cur != */* ]]; then
         # Try generate ~username completions
-        if _comp_compgen -c "${1#\~}" -- -P '~' -u; then
-            # 2>/dev/null for direct invocation, e.g. in the _tilde unit test
+        if _comp_compgen -c "${cur#\~}" -- -P '~' -u; then
+            # 2>/dev/null for direct invocation, e.g. in the
+            # _comp_compgen_tilde unit test
             compopt -o filenames 2>/dev/null
-            return 1
+            return 0
         fi
     fi
-    return 0
+    return 1
 }
 
 # Expand variable starting with tilde (~)
@@ -1519,7 +1519,7 @@ _expand()
             __expand_tilde_by_ref cur
             ;;
         ~*)
-            _tilde "$cur" ||
+            _comp_compgen -v COMPREPLY tilde &&
                 eval "COMPREPLY[0]=$(printf ~%q "${COMPREPLY[0]#\~}")"
             return ${#COMPREPLY[@]}
             ;;
@@ -2556,7 +2556,7 @@ _filedir_xspec()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     local ret
     _comp_quote_compgen "$cur"

bash_completion.d/000_bash_completion_compat.bash

@@ -264,4 +264,16 @@ _filedir()
     _comp_compgen -a filedir "$@"
 }
 
+# Perform tilde (~) completion
+# @return  True (0) if completion needs further processing,
+#          False (1) if tilde is followed by a valid username, completions are
+#          put in COMPREPLY and no further processing is necessary.
+# @deprecated Use `_comp_compgen -c CUR tilde [-d]`.  Note that the exit status
+# of `_comp_compgen_tilde` is flipped.  It returns 0 when the tilde completions
+# are attempted, or otherwise 1.
+_tilde()
+{
+    ! _comp_compgen -c "$1" tilde
+}
+
 # ex: filetype=sh

completions/bzip2

@@ -34,7 +34,7 @@ _comp_cmd_bzip2()
         [[ $prev == -*z* ]] && xspec=
     fi
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     compopt -o filenames
     COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))

completions/gzip

@@ -35,7 +35,7 @@ _comp_cmd_gzip()
         [[ $prev == -*f* ]] && xspec=
     fi
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     compopt -o filenames
     COMPREPLY=($(compgen -f -X "$xspec" -- "$cur")

completions/lrzip

@@ -44,7 +44,7 @@ _comp_cmd_lrzip()
         return
     fi
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     local IFS=$'\n'
     compopt -o filenames

completions/lz4

@@ -41,7 +41,7 @@ _comp_cmd_lz4()
         esac
     done
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     local IFS=$'\n'
     compopt -o filenames

completions/lzma

@@ -24,7 +24,7 @@ _comp_cmd_lzma()
         [[ $prev == -*z* ]] && xspec=
     fi
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     compopt -o filenames
     COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))

completions/lzop

@@ -50,7 +50,7 @@ _comp_cmd_lzop()
             ;;
     esac
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     local IFS=$'\n'
     compopt -o filenames

completions/xz

@@ -47,7 +47,7 @@ _comp_cmd_xz()
         return
     fi
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     local IFS=$'\n'
     compopt -o filenames

completions/zopfli

@@ -18,7 +18,7 @@ _comp_cmd_zopfli()
         return
     fi
 
-    _tilde "$cur" || return
+    _comp_compgen_tilde && return
 
     local IFS=$'\n' xspec="*.@(gz|t[ag]z)"
     compopt -o filenames