Nulo/fzf.kak
1
0
Fork 0
Code Releases Activity

use printf, simplify everything, remove cd part

Browse source
This commit is contained in:
Andrey Orst 2018-11-22 15:37:06 +03:00
parent 72fd5719a5
commit ce91198a89
1 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
rc/fzf.kak
View file

@ -67,17 +67,17 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
callback=$1 callback=$1
items_command=$2 items_command=$2
additional_flags=$3 additional_flags=$3
tmux_height=$kak_opt_fzf_tmux_height
items_executable=$(echo $items_command | grep -o -E "[[:alpha:]]+" | head -1) items_executable=$(printf "%s\n" "$items_command" | grep -o -E "[[:alpha:]]+" | head -1)
if [ -z $(command -v $items_executable) ]; then if [ -z $(command -v $items_executable) ]; then
echo "fail %{'$items_executable' executable not found}" printf "%s\n" "fail %{'$items_executable' executable not found}"
exit exit
fi fi
tmp=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-fzf.XXXXXX)) tmp=$(mktemp ${TMPDIR:-/tmp}/kak-fzf.XXXXXX)
if [ "$(echo $callback | grep -o -E '[[:alpha:]]+' | head -1)" = "edit" ] && [ $kak_opt_fzf_preview = "true" ]; then tmux_height=$kak_opt_fzf_tmux_height
if [ "$callback" = "edit" ] && [ $kak_opt_fzf_preview = "true" ]; then
case $kak_opt_fzf_highlighter in case $kak_opt_fzf_highlighter in
bat) bat)
highlighter="bat --color=always --style=header,grid,numbers {}" ;; highlighter="bat --color=always --style=header,grid,numbers {}" ;;
@ -90,15 +90,15 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
bat*|coderay*|highlight*|rougify*) bat*|coderay*|highlight*|rougify*)
highlighter=$kak_opt_fzf_highlighter ;; highlighter=$kak_opt_fzf_highlighter ;;
*) *)
executable=$(echo $kak_opt_fzf_highlighter | grep -o -E '[[:alpha:]]+' | head -1) executable=$(printf "%s\n" "$kak_opt_fzf_highlighter" | grep -o -E '[[:alpha:]]+' | head -1)
echo "echo -markup %{{Information}'$executable' highlighter is not supported by the script. fzf.kak may not work as you expect.}" printf "%s\n" "echo -markup %{{Information}'$executable' highlighter is not supported by the script. fzf.kak may not work as you expect.}"
highlighter=$kak_opt_fzf_highlighter ;; highlighter=$kak_opt_fzf_highlighter ;;
esac esac
if [ ! -z "${kak_client_env_TMUX}" ]; then if [ ! -z "${kak_client_env_TMUX}" ]; then
preview_pos="pos=right:$kak_opt_fzf_preview_width;" preview_pos="pos=right:$kak_opt_fzf_preview_width;"
tmux_height=$kak_opt_fzf_tmux_height_file_preview tmux_height=$kak_opt_fzf_tmux_height_file_preview
else else
preview_pos='sleep 0.1; if [ $(tput cols) -gt $(expr $(tput lines) \* 2) ]; then pos=right:'$kak_opt_fzf_preview_width'; else pos=top:'$kak_opt_fzf_preview_height'; fi;' preview_pos="sleep 0.1; [ \$(tput cols) -gt \$(expr \$(tput lines) \* 2) ] && pos=right:$kak_opt_fzf_preview_width || pos=top:$kak_opt_fzf_preview_height;"
fi fi
additional_flags="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=\$pos $additional_flags" additional_flags="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=\$pos $additional_flags"
fi fi
@ -106,12 +106,12 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
if [ ! -z "${kak_client_env_TMUX}" ]; then if [ ! -z "${kak_client_env_TMUX}" ]; then
cmd="$preview_pos $items_command | fzf-tmux -d $tmux_height --expect ctrl-q $additional_flags > $tmp" cmd="$preview_pos $items_command | fzf-tmux -d $tmux_height --expect ctrl-q $additional_flags > $tmp"
elif [ ! -z "${kak_opt_termcmd}" ]; then elif [ ! -z "${kak_opt_termcmd}" ]; then
fzfcmd=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-fzfcmd.XXXXXX)) fzfcmd=$(mktemp ${TMPDIR:-/tmp}/kak-fzfcmd.XXXXXX)
chmod 755 $fzfcmd chmod 755 $fzfcmd
echo "cd $PWD && $preview_pos $items_command | fzf --expect ctrl-q $additional_flags > $tmp" > $fzfcmd printf "%s\n" "cd $PWD && $preview_pos $items_command | fzf --expect ctrl-q $additional_flags > $tmp" > $fzfcmd
cmd="$kak_opt_termcmd 'sh -c $fzfcmd'" cmd="$kak_opt_termcmd 'sh -c $fzfcmd'"
else else
echo "fail termcmd option is not set" printf "%s\n" "fail termcmd option is not set"
exit exit
fi fi
@ -120,11 +120,9 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
if [ -s $tmp ]; then if [ -s $tmp ]; then
( (
read action read action
if [ "${callback% *}" != "change-directory" ]; then
case $action in case $action in
ctrl-w) ctrl-w)
wincmd="x11-new " [ ! -z "${kak_client_env_TMUX}" ] && wincmd="tmux-new-window" || wincmd="x11-new" ;;
[ ! -z "${kak_client_env_TMUX}" ] && wincmd="tmux-new-window " ;;
ctrl-s) ctrl-s)
wincmd="tmux-new-vertical" ;; wincmd="tmux-new-vertical" ;;
ctrl-v) ctrl-v)
@ -137,21 +135,14 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{
esac esac
callback="$wincmd $callback" callback="$wincmd $callback"
kakoune_command () { kakoune_command () {
echo "evaluate-commands -client $kak_client '$callback' '$1'" printf "%s\n" "evaluate-commands -client $kak_client '$callback' '$1'"
} }
else
kakoune_command() {
echo "evaluate-commands -client $kak_client '$callback' '$1'"
echo "evaluate-commands -client $kak_client fzf-cd"
}
fi
while read item; do while read item; do
kakoune_command "$item" | kak -p $kak_session kakoune_command "$item" | kak -p $kak_session
done done
) < $tmp ) < $tmp
fi fi
rm $tmp rm $tmp
rm $kakoune_command
[ -z "$fzfcmd" ] && rm $fzfcmd [ -z "$fzfcmd" ] && rm $fzfcmd
) > /dev/null 2>&1 < /dev/null & ) > /dev/null 2>&1 < /dev/null &
}} }}