fish: Fix fzf escaping in completion and file widget
parent
7dae6cb3aa
commit
bf0e5b05ed
|
@ -42,8 +42,14 @@ function __fzf-complete -d 'fzf completion and print selection back to commandli
|
||||||
## We need to escape the result. We unescape 'r' first in case 'r' to
|
## We need to escape the result. We unescape 'r' first in case 'r' to
|
||||||
## prevent double escaping.
|
## prevent double escaping.
|
||||||
switch (string sub -s 1 -l 1 -- $token)
|
switch (string sub -s 1 -l 1 -- $token)
|
||||||
case "'" '"'
|
case "'"
|
||||||
commandline -i -- (string escape -- (eval "printf '%s' '$r'"))
|
commandline -i -- (string escape -- (eval "printf '%s' '$r'"))
|
||||||
|
case '"'
|
||||||
|
set -l quoted (string escape -- (eval "printf '%s' '$r'"))
|
||||||
|
set -l len (string length $quoted)
|
||||||
|
commandline -i -- '"'(string sub -s 2 -l (math $len - 2) (string escape -- (eval "printf '%s' '$r'")))'"'
|
||||||
|
case '~'
|
||||||
|
commandline -i -- (string sub -s 2 (string escape -n -- (eval "printf '%s' '$r'")))
|
||||||
case '*'
|
case '*'
|
||||||
commandline -i -- (string escape -n -- (eval "printf '%s' '$r'"))
|
commandline -i -- (string escape -n -- (eval "printf '%s' '$r'"))
|
||||||
end
|
end
|
||||||
|
@ -70,19 +76,25 @@ end
|
||||||
function fzf-file-widget
|
function fzf-file-widget
|
||||||
set -l cwd_esc (commandline -t)
|
set -l cwd_esc (commandline -t)
|
||||||
## The commandline token might be escaped, we need to unescape it.
|
## The commandline token might be escaped, we need to unescape it.
|
||||||
set -l cwd (eval "printf '%s' '$cwd_esc'")
|
set -l cwd (eval "printf '%s' $cwd_esc")
|
||||||
if [ ! -d "$cwd" ]
|
if [ ! -d "$cwd" ]
|
||||||
set cwd .
|
set cwd .
|
||||||
end
|
end
|
||||||
|
|
||||||
set -q FZF_CTRL_T_COMMAND; or set -l FZF_CTRL_T_COMMAND "
|
set -q FZF_CTRL_T_COMMAND; or set -l FZF_CTRL_T_COMMAND "
|
||||||
command find -L \$cwd \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
|
command find -L $cwd_esc \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
|
||||||
-o -type f -print \
|
-o -type f -print \
|
||||||
-o -type d -print \
|
-o -type d -print \
|
||||||
-o -type l -print 2> /dev/null | sed 1d"
|
-o -type l -print 2> /dev/null | sed 1d"
|
||||||
|
|
||||||
set -l result
|
set -l result
|
||||||
eval $FZF_CTRL_T_COMMAND | eval (__fzfcmd) -m $FZF_CTRL_T_OPTS | while read -l r; set result $result $r; end
|
set found (eval $FZF_CTRL_T_COMMAND)
|
||||||
|
if [ -z "$found" ]
|
||||||
|
commandline -f repaint
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
string join \n $found | eval (__fzfcmd) -m $FZF_CTRL_T_OPTS | while read -l r; set result $result $r; end
|
||||||
if [ "$result" ]
|
if [ "$result" ]
|
||||||
if [ "$cwd" != . ]
|
if [ "$cwd" != . ]
|
||||||
## Remove last token from commandline.
|
## Remove last token from commandline.
|
||||||
|
|
Loading…
Reference in New Issue