From 91c00e1c7e957c0a5597a5d0f2341ff4c3a25008 Mon Sep 17 00:00:00 2001 From: Andrey Orst Date: Thu, 29 Nov 2018 14:34:11 +0300 Subject: [PATCH] tweak fzf to calculate preview position for all commands --- rc/fzf.kak | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/rc/fzf.kak b/rc/fzf.kak index 6b44e93..ee7d12c 100644 --- a/rc/fzf.kak +++ b/rc/fzf.kak @@ -104,7 +104,7 @@ fzf -params 2..4 %{ evaluate-commands %sh{ exit fi - if [ "$command" = "edit" ] && [ $kak_opt_fzf_preview = "true" ]; then + if [ $command = "edit" ] && [ $kak_opt_fzf_preview = "true" ]; then case $kak_opt_fzf_highlighter in bat) highlighter="bat --color=always --style=plain {}" ;; @@ -122,16 +122,16 @@ fzf -params 2..4 %{ evaluate-commands %sh{ highlighter=$kak_opt_fzf_highlighter ;; esac - if [ -n "$kak_client_env_TMUX" ]; then - preview_pos="pos=right:$kak_opt_fzf_preview_width;" - tmux_height=$kak_opt_fzf_tmux_height_file_preview - else - 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 - + tmux_height=$kak_opt_fzf_tmux_height_file_preview additional_flags="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=\$pos $additional_flags" fi + if [ -n "$kak_client_env_TMUX" ]; then + preview_pos="pos=right:$kak_opt_fzf_preview_width;" + else + 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 + tmp=$(mktemp ${TMPDIR:-/tmp}/kak-fzf-tmp.XXXXXX) fzfcmd=$(mktemp ${TMPDIR:-/tmp}/kak-fzfcmd.XXXXXX) printf "%s\n" "cd $PWD && $preview_pos $items_command | SHELL=$(command -v sh) fzf $additional_flags > $tmp" > $fzfcmd