From fe29c469034f85240498b866d09cba70fc342d83 Mon Sep 17 00:00:00 2001
From: Andrey Orst <andreyorst@gmail.com>
Date: Sun, 3 Mar 2019 21:31:23 +0300
Subject: [PATCH] add working skim handler

---
 rc/fzf-modules/sk-grep.kak | 30 ++++++++++++++++++++++--------
 rc/fzf.kak                 |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/rc/fzf-modules/sk-grep.kak b/rc/fzf-modules/sk-grep.kak
index 1dcdeb6..1cf8aa0 100644
--- a/rc/fzf-modules/sk-grep.kak
+++ b/rc/fzf-modules/sk-grep.kak
@@ -8,7 +8,10 @@
 # │ GitHub.com/andreyorst/fzf.kak        │
 # ╰──────────────────────────────────────╯
 
-declare-option str fzf_sk_grep_command 'grep -r'
+declare-option -docstring "what command to use to provide list of grep search matches.
+
+  Default value: 'grep -r'" \
+str fzf_sk_grep_command 'grep -r'
 
 evaluate-commands %sh{
     if [ -n "$(command -v sk)" ]; then
@@ -22,17 +25,28 @@ define-command -hidden sk-interactive-grep %{ evaluate-commands %sh{
     	exit
 	fi
     title="skim interactive grep"
-    message="Interactively grep pattern from current directory"
-    printf "%s\n" "info -title '$title' '$message'"
+    message="Interactively grep pattern from current directory
+<ret>: open search result in new buffer.
+<c-w>: open search result in new window"
+    [ ! -z "${kak_client_env_TMUX}" ] && tmux_keybindings="
+<c-s>: open search result in horizontal split
+<c-v>: open search result in vertical split"
+
+    printf "%s\n" "info -title '${title}' '${message}${tmux_keybindings}'"
+    [ ! -z "${kak_client_env_TMUX}" ] && additional_flags="--expect ctrl-v --expect ctrl-s"
     impl=$kak_opt_fzf_implementation
-    printf "%s\n" "set-option global fzf_implementation sk
-                   fzf %{fzf-sk-grep-handler} %{echo >/dev/null 2>&1} %{-i -c '$kak_opt_fzf_sk_grep_command {}'}
+    printf "%s\n" "set-option global fzf_implementation \"sk -i -c '$kak_opt_fzf_sk_grep_command {}'\"
+                   fzf %{fzf-sk-grep-handler} %{echo >/dev/null 2>&1} %{--expect ctrl-w $additional_flags}
                    set-option global fzf_implementation $impl"
 }}
 
 define-command fzf-sk-grep-handler -params 1 %{ evaluate-commands %sh{
-    file="${1%%:*}"
-    pattern="${1##:*}"
-    printf "%s\n" "edit -existing %{$file}; execute-keys /\Q$pattern"
+    printf "%s\n" "$1" | awk '{
+             file = $0; sub(/:.*/, "", file); gsub("&", "&&", file);
+             keys = $0; sub(/[^:]+:/, "", keys); gsub(/</, "<lt>", keys); gsub(/\t/, "<c-v><c-i>", keys); gsub("&", "&&", keys); gsub("\\\\/", "/", keys);
+             # print "echo -debug %&" file "&";
+             # print "echo -debug %&" keys "&";
+             print "edit -existing %&" file "&; execute-keys %&/\\Q" keys "<ret>vc&";
+         }'
 }}
 
diff --git a/rc/fzf.kak b/rc/fzf.kak
index 7d3c5ec..9e96967 100644
--- a/rc/fzf.kak
+++ b/rc/fzf.kak
@@ -209,7 +209,7 @@ fzf -params 2..4 %{ evaluate-commands %sh{
                         fi ;;
                 esac
                 kakoune_command() {
-                    printf "%s\n" "evaluate-commands -client $kak_client $wincmd $command %{$1}"
+                    printf "%s\n" "evaluate-commands -client $kak_client $wincmd %{$command %{$1}}"
                     [ -n "$extra_action" ] && printf "%s\n" "evaluate-commands -client $kak_client $extra_action"
                 }
                 while read item; do