From 403bab8525aebbbbcb58d2cbbd519c956d6d89f9 Mon Sep 17 00:00:00 2001 From: Andrey Orst Date: Sat, 29 Sep 2018 23:33:44 +0300 Subject: [PATCH] add support for highlighting, support changable tmux height --- rc/fzf.kak | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 5 deletions(-) diff --git a/rc/fzf.kak b/rc/fzf.kak index 9403edd..ed395e5 100644 --- a/rc/fzf.kak +++ b/rc/fzf.kak @@ -50,6 +50,34 @@ Default arguments: " \ str fzf_tag_command "readtags" +declare-option -docstring "allow showing preview window +Default value: + false +" \ +bool fzf_preview true + +declare-option -docstring "amount of lines to pass to preview window +Default value: 100" \ +int fzf_preview_lines 100 + +declare-option -docstring "highlighter to use in preview window +Supported tools: + : : + Coderay: ""coderay"" + Highlight: ""highlight"" + Rouge: ""rouge"" + +Default arguments: + coderay: ""coderay {}"" + highlight: ""highlight --failsafe -O ansi -l {}"" + rouge: ""rougify {}"" +"\ +str fzf_highlighter "highlight" + +declare-option -docstring "height of fzf tmux split +Default value: 15" \ +int fzf_tmux_height 15 + # default mappings map global fzf -docstring "open buffer" b ': fzf-buffer' map global fzf -docstring "change directory" c ': fzf-cd' @@ -104,9 +132,32 @@ define-command -hidden fzf-file %{ : open file in new window $additional_keybindings" echo "info -title '$title' '$message'" [ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect ctrl-v --expect ctrl-s" - printf -v preview_opt -- "--preview '(highlight --failsafe -O ansi {} || cat {}) 2> /dev/null | head -n %d'" 200 - printf -v additional_flags "%s %s" "$additional_flags" "$preview_opt" - printf 'fzf "edit %s" "%s" "-m --expect ctrl-w %s"' '$1' "$cmd" "$additional_flags" + if [ $kak_opt_fzf_preview = "true" ]; then + case $kak_opt_fzf_highlighter in + coderay) + highlighter="coderay {}" + ;; + highlight) + highlighter="highlight --failsafe -O ansi {}" + ;; + rouge) + highlighter="rougify {}" + ;; + coderay*|highlight*|rougify*) + highlighter=$kak_opt_fzf_highlighter + ;; + *) + executable=$(echo $kak_opt_fzf_highlighter | awk '{print $1}'| tr '(' ' ' | cut -d " " -f 2) + echo "echo -markup '{Information}''$executable'' highlighter is not supported by the script. fzf.kak may not work as you expect.'" + highlighter=$kak_opt_fzf_highlighter + ;; + esac + sleep 0.1 + [ $(tput cols) -gt $(tput lines) ] && pos="right:50%%" || pos="top:60%%" + preview_opt="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=$pos" + additional_flags="$preview_opt $additional_flags" + fi + eval echo 'fzf \"edit \$1\" \"$cmd\" \"-m --expect ctrl-w $additional_flags\"' } } @@ -133,6 +184,31 @@ define-command -hidden fzf-git %{ : open file in new window $additional_keybindings" echo "info -title '$title' '$message'" [ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect ctrl-v --expect ctrl-s" + if [ $kak_opt_fzf_preview = "true" ]; then + case $kak_opt_fzf_highlighter in + coderay) + highlighter="coderay {}" + ;; + highlight) + highlighter="highlight --failsafe -O ansi {}" + ;; + rouge) + highlighter="rougify {}" + ;; + coderay*|highlight*|rougify*) + highlighter=$kak_opt_fzf_highlighter + ;; + *) + executable=$(echo $kak_opt_fzf_highlighter | awk '{print $1}'| tr '(' ' ' | cut -d " " -f 2) + echo "echo -markup '{Information}''$executable'' highlighter is not supported by the script. fzf.kak may not work as you expect.'" + cmd=$kak_opt_fzf_highlighter + ;; + esac + sleep 0.1 + [ $(tput cols) -gt $(tput lines) ] && pos="right:50%%" || pos="top:60%%" + preview_opt="--preview '($highlighter || cat {}) 2>/dev/null | head -n $kak_opt_fzf_preview_lines' --preview-window=$pos" + additional_flags="$preview_opt $additional_flags" + fi eval echo 'fzf \"edit \$1\" \"$cmd\" \"-m --expect ctrl-w $additional_flags\"' } } @@ -198,10 +274,10 @@ define-command -hidden fzf -params 2..3 %{ evaluate-commands %sh{ exec=$(mktemp $(eval echo ${TMPDIR:-/tmp}/kak-exec.XXXXXX)) if [ ! -z "${kak_client_env_TMUX}" ]; then - cmd="$items_command | fzf-tmux -d 20 --color=16 --expect ctrl-q $additional_flags > $tmp" + cmd="$items_command | fzf-tmux -d $kak_opt_fzf_tmux_height --color=16 --expect ctrl-q $additional_flags > $tmp" elif [ ! -z "${kak_opt_termcmd}" ]; then path=$(pwd) - cmd="$kak_opt_termcmd \"sh -c 'cd $path && $items_command | fzf --color=16 --expect ctrl-q $additional_flags > $tmp'\"" + cmd="$kak_opt_termcmd \"sh -c \\\"cd $path && $items_command | fzf --color=16 --expect ctrl-q $additional_flags > $tmp\\\"\"" else echo "fail termcmd option is not set" exit