Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-12-31 14:01:47 +00:00
Code Issues Projects Releases Wiki Activity

[fish] Small syntax modification of some commands

Browse Source 
No actual change, just for consistency with the rest of the code.
This commit is contained in:
bitraid 2024-12-19 11:36:37 +02:00 committed by Junegunn Choi
parent 3b0f976380
commit 0167691941
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
shell/key-bindings.fish
View File

@ -57,8 +57,8 @@ function fzf_key_bindings
function fzf-history-widget -d "Show command history" function fzf-history-widget -d "Show command history"
test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40% test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
begin begin
set -l FISH_MAJOR (string split '.' -- $version)[1] set -l FISH_MAJOR (string split -f 1 -- '.' $version)
set -l FISH_MINOR (string split '.' -- $version)[2] set -l FISH_MINOR (string split -f 2 -- '.' $version)
# merge history from other sessions before searching # merge history from other sessions before searching
test -z "$fish_private_mode"; and builtin history merge test -z "$fish_private_mode"; and builtin history merge
@ -157,13 +157,13 @@ function fzf_key_bindings
# so that after eval, the original string is returned, but with the # so that after eval, the original string is returned, but with the
# variable names replaced by their values. # variable names replaced by their values.
set commandline (string escape -n -- $commandline) set commandline (string escape -n -- $commandline)
set commandline (string replace -r -a '\x5c\$(?=[\w])' '\$' -- $commandline) set commandline (string replace -r -a -- '\x5c\$(?=[\w])' '\$' $commandline)
# eval is used to do shell expansion on paths # eval is used to do shell expansion on paths
eval set commandline $commandline eval set commandline $commandline
# Combine multiple consecutive slashes into one # Combine multiple consecutive slashes into one
set commandline (string replace -r -a '/+' '/' -- $commandline) set commandline (string replace -r -a -- '/+' '/' $commandline)
if test -z "$commandline" if test -z "$commandline"
# Default to current directory with no --query # Default to current directory with no --query
@ -180,7 +180,7 @@ function fzf_key_bindings
set fzf_query $commandline set fzf_query $commandline
else else
# Also remove trailing slash after dir, to "split" input properly # 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
end end
@ -193,7 +193,7 @@ function fzf_key_bindings
set dir $argv set dir $argv
# Strip trailing slash, unless $dir is root dir (/) # Strip trailing slash, unless $dir is root dir (/)
set dir (string replace -r '(?<!^)/$' '' -- $dir) set dir (string replace -r -- '(?<!^)/$' '' $dir)
# Iteratively check if dir exists and strip tail end of path # Iteratively check if dir exists and strip tail end of path
while test ! -d "$dir" while test ! -d "$dir"