refactor: _longopt -> _comp_longopt

Author: scop

bash_completion

@@ -2370,7 +2370,7 @@ _complete_as_root()
     [[ $EUID -eq 0 || ${root_command-} ]]
 }
 
-_longopt()
+_comp_longopt()
 {
     local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
@@ -2420,7 +2420,8 @@ _longopt()
     fi
 }
 # makeinfo and texi2dvi are defined elsewhere.
-complete -F _longopt a2ps awk base64 bash bc bison cat chroot colordiff cp \
+complete -F _comp_longopt \
+    a2ps awk base64 bash bc bison cat chroot colordiff cp \
     csplit cut date df diff dir du enscript env expand fmt fold gperf \
     grep grub head irb ld ldd less ln ls m4 mkdir mkfifo mknod \
     mv netstat nl nm objcopy objdump od paste pr ptx readelf rm rmdir \

bash_completion.d/000_bash_completion_compat.bash

@@ -12,6 +12,7 @@ _comp_deprecate_func _upvars _comp_upvars
 _comp_deprecate_func __reassemble_comp_words_by_ref _comp__reassemble_words
 _comp_deprecate_func __get_cword_at_cursor_by_ref _comp__get_cword_at_cursor
 _comp_deprecate_func _get_comp_words_by_ref _comp_get_words
+_comp_deprecate_func _longopt _comp_longopt
 
 # Backwards compatibility for compat completions that use have().
 # @deprecated should no longer be used; generally not needed with dynamically

completions/abook

@@ -15,7 +15,7 @@ _comp_cmd_abook()
 
     case $cur in
         -*)
-            _longopt "$@"
+            _comp_longopt "$@"
             return
             ;;
     esac

completions/pyvenv

@@ -14,7 +14,7 @@ _comp_cmd_pyvenv()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        _longopt "$@"
+        _comp_longopt "$@"
         return
     fi
 

completions/sha256sum

@@ -14,7 +14,7 @@ _comp_cmd_sha256sum()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        _longopt "$@"
+        _comp_longopt "$@"
         return
     fi
 

test/t/test_grep.py

@@ -11,7 +11,7 @@ def test_2(self, completion):
         """
         Test --no-*dir isn't restricted to dirs only.
 
-        Not really a grep option, but tests _longopt.
+        Not really a grep option, but tests _comp_longopt.
         """
         assert completion == "foo foo.d/".split()
 

test/t/unit/test_unit_longopt.py

@@ -10,9 +10,9 @@ class TestUnitLongopt:
     @pytest.fixture(scope="class")
     def functions(self, request, bash):
         assert_bash_exec(bash, "_grephelp() { cat _longopt/grep--help.txt; }")
-        assert_bash_exec(bash, "complete -F _longopt _grephelp")
+        assert_bash_exec(bash, "complete -F _comp_longopt _grephelp")
         assert_bash_exec(bash, "_various() { cat _longopt/various.txt; }")
-        assert_bash_exec(bash, "complete -F _longopt _various")
+        assert_bash_exec(bash, "complete -F _comp_longopt _various")
 
     @pytest.mark.complete("_grephelp --")
     def test_1(self, functions, completion):