Merge pull request #1083 from akinomyoga/_comp_split-1

fix(ri): fix several problems and use `_comp_split`

Author: scop

completions/ri

@@ -1,35 +1,39 @@
 # ri completion for Ruby documentation                     -*- shell-script -*-
 # by Ian Macdonald <ian@caliban.org>
 
-_comp_cmd_ri__methods()
+# @var[in] ri_version
+# @var[in] prefix
+# @var[in] classes
+_comp_cmd_ri__compgen_methods()
 {
-    local regex IFS=$' \t\n'
+    local _regex
+    local IFS=$' \t\n' # needed for ${classes[@]+"${classes[@]}"} in bash-5.2
 
+    local _methods
     if [[ $ri_version == integrated ]]; then
         if [[ ! $separator ]]; then
-            regex="(Instance|Class)"
+            _regex="(Instance|Class)"
         elif [[ $separator == "#" ]]; then
-            regex=Instance
+            _regex=Instance
         else
-            regex=Class
+            _regex=Class
         fi
 
-        COMPREPLY+=(
+        _comp_split -la _methods \
             "$(ri ${classes[@]+"${classes[@]}"} 2>/dev/null | ruby -ane \
-                'if /^'"$regex"' methods:/.../^------------------|^$/ and \
+                'if /^'"$_regex"' methods:/.../^------------------|^$/ and \
             /^ / then print $_.split(/, |,$/).grep(/^[^\[]*$/).join("\n"); \
-            end' 2>/dev/null | sort -u)")
+            end' 2>/dev/null | sort -u)"
     else
         # older versions of ri didn't distinguish between class/module and
         # instance methods
-        COMPREPLY+=(
+        _comp_split -la _methods \
             "$(ruby -W0 "$ri_path" ${classes[@]+"${classes[@]}"} 2>/dev/null | ruby -ane \
                 'if /^-/.../^-/ and ! /^-/ and ! /^ +(class|module): / then \
             print $_.split(/, |,$| +/).grep(/^[^\[]*$/).join("\n"); \
-            end' | sort -u)")
-    fi
-    ((${#COMPREPLY[@]})) &&
-        _comp_compgen -c "$method" -- "$prefix" -W '"${COMPREPLY[@]}"'
+            end' | sort -u)"
+    fi &&
+        _comp_compgen -- -P "$prefix" -W '"${_methods[@]}"'
 }
 
 # needs at least Ruby 1.8.0 in order to use -W0
@@ -66,7 +70,7 @@ _comp_cmd_ri()
         return
     fi
 
-    local class method prefix ri_path ri_version ri_major separator IFS
+    local class method prefix="" ri_path ri_version ri_major="" separator
     local -a classes
 
     ri_path=$(type -p ri)
@@ -78,35 +82,33 @@ _comp_cmd_ri()
     [[ $ri_version =~ ri[[:space:]]v?([0-9]+) ]] && ri_major=${BASH_REMATCH[1]}
 
     # need to also split on commas
-    IFS=$', \n\t'
     if [[ $cur == [A-Z]*[#.]* ]]; then
         [[ $cur == *#* ]] && separator=# || separator=.
         # we're completing on class and method
         class=${cur%"$separator"*}
         method=${cur#*"$separator"}
-        classes=($class)
-        prefix="-P $class$separator"
-        _comp_cmd_ri__methods
+        _comp_split -F $', \n\t' classes "$class"
+        prefix=$class$separator
+        _comp_compgen -c "$method" -i ri methods
         return
     fi
 
     if [[ $ri_version == integrated ]]; then
         # integrated ri from Ruby 1.9
-        classes=($(ri -c 2>/dev/null | ruby -ne 'if /^\s*$/..$stdin.eof then \
-        if /^ +[A-Z]/ then print; end; end' 2>/dev/null))
+        _comp_split -F $', \n\t' classes \
+            "$(ri -c 2>/dev/null | ruby -ne 'if /^\s*$/..$stdin.eof then \
+            if /^ +[A-Z]/ then print; end; end' 2>/dev/null)"
     elif [[ $ri_major && $ri_major -ge 3 ]]; then
-        classes=($(ri -l 2>/dev/null))
+        _comp_split -F $', \n\t' classes "$(ri -l 2>/dev/null)"
     elif [[ $ri_version == "ri 1.8a" ]]; then
-        classes=($(ruby -W0 "$ri_path" |
+        _comp_split -F $', \n\t' classes "$(ruby -W0 "$ri_path" |
             ruby -ne 'if /^'"'"'ri'"'"' has/..$stdin.eof then \
-            if /^ .*[A-Z]/ then print; end; end'))
+            if /^ .*[A-Z]/ then print; end; end')"
     else
-        classes=($(ruby -W0 "$ri_path" |
+        _comp_split -F $', \n\t' classes "$(ruby -W0 "$ri_path" |
             ruby -ne 'if /^I have/..$stdin.eof then \
-                if /^ .*[A-Z]/ then print; end; end'))
-    fi
-
-    ((${#classes[@]})) &&
+                if /^ .*[A-Z]/ then print; end; end')"
+    fi &&
         _comp_compgen -- -W '"${classes[@]}"'
     _comp_ltrim_colon_completions "$cur"
 
@@ -116,8 +118,7 @@ _comp_cmd_ri()
     fi
 
     # we're completing on methods
-    method=$cur
-    _comp_cmd_ri__methods
+    _comp_cmd_ri__compgen_methods
 } &&
     complete -F _comp_cmd_ri ri