Merge pull request #888 from akinomyoga/failglob-3

fix(java): fix for failglob and refactor

Author: scop

completions/java

@@ -8,62 +8,65 @@ _comp_cmd_java__classpath()
 }
 
 # exact classpath determination
-_java_find_classpath()
+# @var[out] ret  Array to store classpaths
+# @return 0 if at least one element is generated, or otherwise 1
+_comp_cmd_java__find_classpath()
 {
     local i
 
-    classpath=
+    ret=
 
     # search first in current options
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} == -@(cp|classpath) ]]; then
-            classpath=${words[i + 1]}
+            ret=${words[i + 1]}
             break
         fi
     done
 
-    # default to environment
-    [[ ! $classpath ]] && classpath=${CLASSPATH-}
-
-    # default to current directory
-    [[ ! $classpath ]] && classpath=.
+    # fall back to environment, followed by current directory
+    _comp_split -F : ret "${ret:-${CLASSPATH:-.}}"
 }
 
 # exact sourcepath determination
-_java_find_sourcepath()
+# @var[out] ret  Array to store sourcepaths
+# @return 0 if at least one element is generated, or otherwise 1
+_comp_cmd_java__find_sourcepath()
 {
     local i
 
-    sourcepath=
+    ret=
 
     # search first in current options
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} == -sourcepath ]]; then
-            sourcepath=${words[i + 1]}
+            ret=${words[i + 1]}
             break
         fi
     done
 
-    # default to classpath
-    if [[ ! -v sourcepath ]]; then
-        local classpath
-        _java_find_classpath
-        sourcepath=$classpath
+    # fall back to classpath
+    if [[ ! $ret ]]; then
+        _comp_cmd_java__find_classpath
+        return
     fi
+
+    _comp_split -F : ret "$ret"
 }
 
 # available classes completion
 _comp_cmd_java__classes()
 {
-    local classpath i
+    local ret i
 
     # find which classpath to use
-    _java_find_classpath
+    _comp_cmd_java__find_classpath
+    local -a classpaths=("${ret[@]}")
 
     # convert package syntax to path syntax
     cur=${cur//.//}
     # parse each classpath element for classes
-    for i in ${classpath//:/ }; do
+    for i in "${classpaths[@]}"; do
         if [[ $i == *.@(jar|zip) && -r $i ]]; then
             if type zipinfo &>/dev/null; then
                 COMPREPLY+=($(zipinfo -1 "$i" "$cur*" 2>/dev/null |
@@ -103,27 +106,30 @@ _comp_cmd_java__classes()
 # available packages completion
 _comp_cmd_java__packages()
 {
-    local sourcepath i
+    local ret i files
 
     # find which sourcepath to use
-    _java_find_sourcepath
+    _comp_cmd_java__find_sourcepath || return 0
+    local -a sourcepaths=("${ret[@]}")
 
     # convert package syntax to path syntax
-    cur=${cur//.//}
+    local cur=${cur//.//}
     # parse each sourcepath element for packages
-    for i in ${sourcepath//:/ }; do
+    for i in "${sourcepaths[@]}"; do
         if [[ -d $i ]]; then
-            COMPREPLY+=($(command ls -F -d "$i/$cur"* 2>/dev/null |
-                command sed -e 's|^'"$i"'/||'))
+            _comp_expand_glob files '"$i/$cur"*'
+            ((${#files[@]})) || continue
+            _comp_split -la COMPREPLY "$(
+                command ls -F -d "${files[@]}" 2>/dev/null |
+                    command sed -e 's|^'"$i"'/||'
+            )"
         fi
     done
     if ((${#COMPREPLY[@]} != 0)); then
-        # keep only packages
-        COMPREPLY=($(tr " " "\n" <<<"${COMPREPLY[@]}" | command grep "/$"))
-        # remove packages extension
-        COMPREPLY=(${COMPREPLY[@]%/})
+        # keep only packages with the package suffix `/` being removed
+        _comp_split -l COMPREPLY "$(printf '%s\n' "${COMPREPLY[@]}" | command sed -n 's,/$,,p')"
         # convert path syntax to package syntax
-        cur="${COMPREPLY[*]//\//.}"
+        ((${#COMPREPLY[@]})) && COMPREPLY=("${COMPREPLY[@]//\//.}")
     fi
 }
 

test/t/test_java.py

@@ -1,6 +1,6 @@
 import pytest
 
-from conftest import is_bash_type
+from conftest import is_bash_type, assert_bash_exec, bash_env_saved
 
 
 @pytest.mark.bashcomp(
@@ -47,3 +47,46 @@ def test_5(self, completion):
     @pytest.mark.complete("java -jar java/")
     def test_6(self, completion):
         assert completion == "a/ bashcomp.jar bashcomp.war".split()
+
+    @pytest.mark.complete("javadoc -sourcepath java/a:java/a/c ")
+    def test_sourcepath_1(self, completion):
+        """sourcepath should be split by `:`"""
+        assert completion == "c"
+
+    @pytest.mark.complete("javadoc -sourcepath java/?:java/x ")
+    def test_sourcepath_2(self, completion):
+        """pathname expansion should not happen after splitting the argument by
+        `:`"""
+        assert not completion
+
+    @pytest.mark.complete("javadoc -sourcepath java/a ")
+    def test_packages_1(self, completion):
+        assert completion == "c"
+
+    @pytest.mark.complete("javadoc -sourcepath java/a x")
+    def test_packages_2(self, completion):
+        assert not completion
+
+    @pytest.mark.complete(
+        "javadoc -sourcepath java/a x", shopt=dict(failglob=True)
+    )
+    def test_packages_3(self, completion):
+        assert not completion
+
+    @pytest.mark.complete("javadoc -sourcepath java/a ", env=dict(IFS="a"))
+    def test_packages_4(self, completion):
+        assert completion == "c"
+
+    def test_packages_5(self, bash):
+        """_comp_cmd_java__packages should not modify the outerscope `cur`"""
+        with bash_env_saved(bash) as bash_env:
+            bash_env.write_variable("cur", "a.b.c")
+            assert_bash_exec(
+                bash,
+                "_comp_test_f() { local cword=3 words=(javadoc -sourcepath java/a a.b.c); COMPREPLY+=(); _comp_cmd_java__packages; }; _comp_test_f",
+            )
+
+    @pytest.mark.complete("javadoc -sourcepath java a.")
+    def test_packages_6(self, completion):
+        """A period in package names should not be converted to slash."""
+        assert completion == "c"