Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-09 17:53:56 +00:00
Code Issues Projects Releases Wiki Activity

[fish] Fix parser handling of option-like args (#2208)

Browse Source 
Fixes error when option-like args are parsed (e.g. "-1").
This commit is contained in:
Andrew Zhou 2020-10-11 22:58:37 -05:00 committed by GitHub
parent fc7630a66d
commit 6c9adea0d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
shell/key-bindings.fish
View File

@ -127,12 +127,12 @@ function fzf_key_bindings
else
set dir (__fzf_get_dir $commandline)
if [ "$dir" = "." -a (string sub -l 1 $commandline) != '.' ]
if [ "$dir" = "." -a (string sub -l 1 -- $commandline) != '.' ]
# if $dir is "." but commandline is not a relative path, this means no file path found
set fzf_query $commandline
else
# Also remove trailing slash after dir, to "split" input properly
set fzf_query (string replace -r "^$dir/?" '' "$commandline")
set fzf_query (string replace -r "^$dir/?" -- '' "$commandline")
end
end
@ -144,15 +144,15 @@ function fzf_key_bindings
set dir $argv
# Strip all trailing slashes. Ignore if $dir is root dir (/)
if [ (string length $dir) -gt 1 ]
set dir (string replace -r '/*$' '' $dir)
if [ (string length -- $dir) -gt 1 ]
set dir (string replace -r '/*$' -- '' $dir)
end
# Iteratively check if dir exists and strip tail end of path
while [ ! -d "$dir" ]
# If path is absolute, this can keep going until ends up at /
# If path is relative, this can keep going until entire input is consumed, dirname returns "."
set dir (dirname "$dir")
set dir (dirname -- "$dir")
end
echo $dir