fix(java,rsync,scp): handle quoted space in filepaths properly

Filenames containing a special character are not properly completed
[1].  These completions generate filenames by pathname expanaion using
$cur.  However, $cur contains the word on the command line including
quotaing, such as cur='file\ with\ space.txt' and cur='"a b c.txt"'.
This patch obtains the value of "cur" using _comp_dequote.

[1] #1232

This patch also fixes a similar case in completions/java.

Co-authored-by: Yedaya Katsman <[email protected]>

Author: akinomyoga

completions/java

@@ -113,12 +113,16 @@ _comp_cmd_java__packages()
     _comp_cmd_java__find_sourcepath || return 0
     local -a sourcepaths=("${REPLY[@]}")
 
+    local REPLY
+    _comp_dequote "$cur" || REPLY=$cur
+    local cur_val=${REPLY-}
+
     # convert package syntax to path syntax
-    local cur=${cur//.//}
+    local cur_val=${cur_val//.//}
     # parse each sourcepath element for packages
     for i in "${sourcepaths[@]}"; do
         if [[ -d $i ]]; then
-            _comp_expand_glob files '"$i/$cur"*' || continue
+            _comp_expand_glob files '"$i/$cur_val"*' || continue
             _comp_split -la COMPREPLY "$(
                 command ls -F -d "${files[@]}" 2>/dev/null |
                     command sed -e 's|^'"$i"'/||'

completions/ssh

@@ -530,13 +530,16 @@ _comp_xfunc_scp_compgen_remote_files()
     done
 
     # remove backslash escape from the first colon
-    local cur=${cur/\\:/:}
-
-    local _userhost=${cur%%?(\\):*}
-    local _path=${cur#*:}
+    local REPLY=$cur
+    if [[ ! $_less_escaping ]]; then
+        # unescape (3 backslashes to 1 for chars we escaped)
+        REPLY=$(command sed -e 's/\\\\\\\('"$_comp_cmd_scp__path_esc"'\)/\\\1/g' <<<"$REPLY")
+    fi
+    _comp_dequote "$REPLY"
+    local cur_val=${REPLY-}
 
-    # unescape (3 backslashes to 1 for chars we escaped)
-    _path=$(command sed -e 's/\\\\\\\('"$_comp_cmd_scp__path_esc"'\)/\\\1/g' <<<"$_path")
+    local _userhost=${cur_val%%:*}
+    local _path=${cur_val#*:}
 
     # default to home dir of specified user on remote host
     if [[ ! $_path ]]; then
@@ -575,8 +578,12 @@ _comp_xfunc_scp_compgen_local_files()
         shift
     fi
 
+    local REPLY
+    _comp_dequote "$cur" || REPLY=$cur
+    local cur_val=${REPLY-}
+
     local files
-    _comp_expand_glob files '"$cur"*' || return 0
+    _comp_expand_glob files '"$cur_val"*' || return 0
     _comp_compgen -RU files split -l ${1:+-P "$1"} -- "$(
         command ls -aF1dL "${files[@]}" 2>/dev/null |
             _comp_cmd_scp__escape_path ${_dirs_only:+'-d'}

test/t/test_rsync.py

@@ -73,3 +73,15 @@ def test_remote_path_with_spaces(self, bash):
             completion == r"\ in\ filename.txt"
             or completion == r"\\\ in\\\ filename.txt"
         )
+
+    @pytest.mark.complete(r"rsync -na spaced\ ", cwd="scp")
+    def test_local_path_with_spaces(self, completion):
+        """This function tests xfunc _comp_xfunc_scp_compgen_local_files, which
+        is defined in completions/ssh, through the rsync interface.  We reuse
+        the fixture directory for the test of the scp completion.
+
+        The expected result depends on the rsync version, so we check the
+        result if it matches either one of two possible expected results.
+
+        """
+        assert completion == r"\ conf" or completion == r"\\\ conf"

test/t/test_scp.py

@@ -205,3 +205,11 @@ def test_local_path_mark_1(self, bash, tmpdir_mkfifo):
             bash, "scp local_path_1-", cwd=tmpdir_mkfifo
         )
         assert completion == "pipe"
+
+    @pytest.mark.complete("scp spa", cwd="scp")
+    def test_local_path_with_spaces_1(self, completion):
+        assert completion == r"ced\ \ conf"
+
+    @pytest.mark.complete(r"scp spaced\ ", cwd="scp")
+    def test_local_path_with_spaces_2(self, completion):
+        assert completion == r"\ conf"