refactor(cvs): refactor _comp_cmd_cvs__{ => compgen_}entries

Author: akinomyoga

completions/cvs

@@ -1,14 +1,15 @@
 # cvs(1) completion                                        -*- shell-script -*-
 
-_comp_cmd_cvs__entries()
+# Usage: _comp_cmd_cvs__compgen_entries [base_path]
+# @param[opt] $1
+# shellcheck disable=SC2120
+_comp_cmd_cvs__compgen_entries()
 {
-    local prefix=${cur%/*}/ IFS=$'\n'
-    [[ -e ${prefix-}CVS/Entries ]] || prefix=""
-    entries=($(cut -d/ -f2 -s "${prefix-}CVS/Entries" 2>/dev/null))
-    if ((${#entries[@]})); then
-        _comp_compgen -Rv entries -- -P "${prefix-}" -W '"${entries[@]}"'
+    local base_path=${1-$cur}
+    local _prefix=${base_path%/*}/
+    [[ -e ${_prefix-}CVS/Entries ]] || _prefix=""
+    _comp_compgen -c "${cur#"$_prefix"}" split -lP "$_prefix" -- "$(cut -d/ -f2 -s "${_prefix-}CVS/Entries" 2>/dev/null)" &&
         compopt -o filenames
-    fi
 }
 
 _comp_cmd_cvs__modules()
@@ -156,7 +157,7 @@ _comp_cmd_cvs()
             esac
 
             if [[ $cur != -* ]]; then
-                _comp_cmd_cvs__entries
+                _comp_compgen -Rv entries -i cvs entries "${cur-}"
                 if [[ ! $cur ]]; then
                     _comp_expand_glob files '!(CVS)'
                 else
@@ -201,9 +202,7 @@ _comp_cmd_cvs()
             if [[ $cur == -* ]]; then
                 _comp_cmd_cvs__compgen_command_options "$1" "$mode"
             else
-                _comp_cmd_cvs__entries
-                ((${#entries[@]})) &&
-                    _comp_compgen -- -W '"${entries[@]}"'
+                _comp_cmd_cvs__compgen_entries
             fi
             ;;
         annotate)
@@ -212,9 +211,7 @@ _comp_cmd_cvs()
             if [[ $cur == -* ]]; then
                 _comp_cmd_cvs__compgen_command_options "$1" "$mode"
             else
-                _comp_cmd_cvs__entries
-                ((${#entries[@]})) &&
-                    _comp_compgen -- -W '"${entries[@]}"'
+                _comp_cmd_cvs__compgen_entries
             fi
             ;;
         checkout)
@@ -269,9 +266,7 @@ _comp_cmd_cvs()
                             s/^cvs diff: \([^ ]*\) .*, no comparison available$/\1/p
                         ')"
                 else
-                    _comp_cmd_cvs__entries
-                    ((${#entries[@]})) &&
-                        _comp_compgen -- -W '"${entries[@]}"'
+                    _comp_cmd_cvs__compgen_entries
                 fi
             else
                 _comp_cmd_cvs__compgen_command_options "$1" "$mode"
@@ -285,18 +280,14 @@ _comp_cmd_cvs()
                 _comp_cmd_cvs__compgen_command_options "$1" "$mode"
                 [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             else
-                _comp_cmd_cvs__entries
-                ((${#entries[@]})) &&
-                    _comp_compgen -- -W '"${entries[@]}"'
+                _comp_cmd_cvs__compgen_entries
             fi
             ;;
         editors | watchers)
             if [[ $cur == -* ]]; then
                 _comp_cmd_cvs__compgen_command_options "$1" "$mode"
             else
-                _comp_cmd_cvs__entries
-                ((${#entries[@]})) &&
-                    _comp_compgen -- -W '"${entries[@]}"'
+                _comp_cmd_cvs__compgen_entries
             fi
             ;;
         export)
@@ -355,7 +346,7 @@ _comp_cmd_cvs()
             ;;
         remove)
             if [[ $cur != -* ]]; then
-                _comp_cmd_cvs__entries
+                _comp_compgen -Rv entries -i cvs entries "${cur-}"
                 if [[ $prev != -f ]]; then
                     # find out what files are missing
                     for i in "${!entries[@]}"; do
@@ -383,9 +374,7 @@ _comp_cmd_cvs()
             if [[ $cur == -* ]]; then
                 _comp_cmd_cvs__compgen_command_options "$1" "$mode"
             else
-                _comp_cmd_cvs__entries
-                ((${#entries[@]})) &&
-                    _comp_compgen -- -W '"${entries[@]}"'
+                _comp_cmd_cvs__compgen_entries
             fi
             ;;
         "")