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

make `-items-smd' work like pipe; simplify sk-grep.kak

Browse source
This commit is contained in:
Andrey Orst 2019-03-27 11:35:54 +03:00
parent f42cbcb86f
commit 11f1d99cd2
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rc/fzf.kak
View file

@ -103,7 +103,8 @@ define-command -docstring \
Switches: Switches:
-kak-cmd <command>: A Kakoune cmd that is applied to fzf resulting value. -kak-cmd <command>: A Kakoune cmd that is applied to fzf resulting value.
-items-cmd <items command>: A command that is used to provide list of values to fzf. -items-cmd <items command>: A command that is used as a pipe to provide list of values to fzf.
-fzf-impl <implementation>: Owerride fzf implementation variable
-fzf-args <args>: Additional flags for fzf program -fzf-args <args>: Additional flags for fzf program
-preview-cmd: a preview command -preview-cmd: a preview command
-preview: should fzf window include preview -preview: should fzf window include preview
@ -113,7 +114,8 @@ fzf -shell-script-completion %{echo "-kak-cmd\n-items-cmd\n-fzf-args\n-post-acti
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case $1 in case $1 in
-kak-cmd) shift; kakoune_cmd="$1" ;; -kak-cmd) shift; kakoune_cmd="$1" ;;
-items-cmd) shift; items_cmd="$1" ;; -items-cmd) shift; items_cmd="$1 |" ;;
-fzf-impl) shift; fzf_impl="$1" ;;
-fzf-args) shift; fzf_args="$1" ;; -fzf-args) shift; fzf_args="$1" ;;
-preview-cmd) shift; preview_cmd="$1" ;; -preview-cmd) shift; preview_cmd="$1" ;;
-preview) preview="true" ;; -preview) preview="true" ;;
@ -123,6 +125,10 @@ fzf -shell-script-completion %{echo "-kak-cmd\n-items-cmd\n-fzf-args\n-post-acti
shift shift
done done
if [ -z "${fzf_impl}" ]; then
fzf_impl="${kak_opt_fzf_implementation}"
fi
if [ "${preview}" = "true" ]; then if [ "${preview}" = "true" ]; then
# bake position option to define them at runtime # bake position option to define them at runtime
if [ -n "${kak_client_env_TMUX}" ]; then if [ -n "${kak_client_env_TMUX}" ]; then
@ -149,8 +155,10 @@ fzf -shell-script-completion %{echo "-kak-cmd\n-items-cmd\n-fzf-args\n-post-acti
fzfcmd="${fzf_tmp}/fzfcmd" fzfcmd="${fzf_tmp}/fzfcmd"
result="${fzf_tmp}/result" result="${fzf_tmp}/result"
shell_executable="$(command -v sh)"
# compose entire fzf command with all args into single file which will be executed later # compose entire fzf command with all args into single file which will be executed later
printf "%s\n" "cd \"${PWD}\" && ${preview_position} ${items_cmd} | SHELL=$(command -v sh) ${kak_opt_fzf_implementation} ${fzf_args} ${preview_cmd} ${filter} > ${result}; rm ${fzfcmd}" > ${fzfcmd} printf "%s\n" "cd \"${PWD}\" && ${preview_position} ${items_cmd} SHELL=${shell_executable} ${fzf_impl} ${fzf_args} ${preview_cmd} ${filter} > ${result}; rm ${fzfcmd}" > ${fzfcmd}
chmod 755 ${fzfcmd} chmod 755 ${fzfcmd}
if [ -n "${kak_client_env_TMUX}" ]; then if [ -n "${kak_client_env_TMUX}" ]; then

5
rc/modules/sk-grep.kak
View file

@ -38,10 +38,7 @@ define-command -hidden fzf-sk-grep %{ evaluate-commands %sh{
printf "%s\n" "info -title '${title}' '${message}${tmux_keybindings}'" printf "%s\n" "info -title '${title}' '${message}${tmux_keybindings}'"
[ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect ctrl-v --expect ctrl-s" [ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect ctrl-v --expect ctrl-s"
impl=$kak_opt_fzf_implementation printf "%s\n" "fzf -kak-cmd %{fzf-sk-grep-handler} -fzf-impl %{sk -i -c '$kak_opt_fzf_sk_grep_command {}'} -fzf-args %{--expect ctrl-w $additional_flags}"
printf "%s\n" "set-option global fzf_implementation %{sk -i -c '$kak_opt_fzf_sk_grep_command {}'}
fzf -kak-cmd %{fzf-sk-grep-handler} -items-cmd %{echo >/dev/null 2>&1} -fzf-args %{--expect ctrl-w $additional_flags}
set-option global fzf_implementation %{${impl}}"
}} }}
define-command -hidden fzf-sk-grep-handler -params 1 %{ evaluate-commands %sh{ define-command -hidden fzf-sk-grep-handler -params 1 %{ evaluate-commands %sh{