[shell] Add FZF_CTRL_T_COMMAND for CTRL-T

Close #40

README.md

@@ -147,8 +147,9 @@ Key bindings for command line
 The install script will setup the following key bindings for bash, zsh, and
 fish.
 
-- `CTRL-T` - Paste the selected file path(s) into the command line
+- `CTRL-T` - Paste the selected files and directories onto the command line
-- `CTRL-R` - Paste the selected command from history into the command line
+    - Set `FZF_CTRL_T_COMMAND` to override the default command
+- `CTRL-R` - Paste the selected command from history onto the command line
     - Sort is disabled by default to respect chronological ordering
     - Press `CTRL-R` again to toggle sort
 - `ALT-C` - cd into the selected directory

shell/key-bindings.bash

@@ -1,10 +1,11 @@
 # Key bindings
 # ------------
 __fzf_select__() {
-  command find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
+  local cmd="${FZF_CTRL_T_COMMAND:-"command \\find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
     -o -type f -print \
     -o -type d -print \
-    -o -type l -print 2> /dev/null | sed 1d | cut -b3- | fzf -m | while read item; do
+    -o -type l -print 2> /dev/null | sed 1d | cut -b3-"}"
+  eval "$cmd" | fzf -m | while read item; do
     printf '%q ' "$item"
   done
   echo
@@ -24,7 +25,7 @@ __fzf_select_tmux__() {
   else
     height="-l $height"
   fi
-  tmux split-window $height "cd $(printf %q "$PWD");bash -c 'source ~/.fzf.bash; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'"
+  tmux split-window $height "cd $(printf %q "$PWD"); FZF_CTRL_T_COMMAND=$(printf %q "$FZF_CTRL_T_COMMAND") bash -c 'source ~/.fzf.bash; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'"
 }
 
 __fzf_cd__() {

shell/key-bindings.fish

@@ -14,10 +14,12 @@ function fzf_key_bindings
   end
 
   function __fzf_ctrl_t
-    command find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
+    set -q FZF_CTRL_T_COMMAND; or set -l FZF_CTRL_T_COMMAND "
+    command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
       -o -type f -print \
       -o -type d -print \
-      -o -type l -print 2> /dev/null | sed 1d | cut -b3- | eval (__fzfcmd) -m > $TMPDIR/fzf.result
+      -o -type l -print 2> /dev/null | sed 1d | cut -b3-"
+    eval $FZF_CTRL_T_COMMAND | eval (__fzfcmd) -m > $TMPDIR/fzf.result
     and commandline -i (cat $TMPDIR/fzf.result | __fzf_escape)
     commandline -f repaint
     rm -f $TMPDIR/fzf.result

shell/key-bindings.zsh

@@ -4,10 +4,11 @@ if [[ $- =~ i ]]; then
 
 # CTRL-T - Paste the selected file path(s) into the command line
 __fsel() {
-  command find -L . \( -path '*/\.*' -o -fstype 'dev' -o -fstype 'proc' \) -prune \
+  local cmd="${FZF_CTRL_T_COMMAND:-"command \\find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \
     -o -type f -print \
     -o -type d -print \
-    -o -type l -print 2> /dev/null | sed 1d | cut -b3- | $(__fzfcmd) -m | while read item; do
+    -o -type l -print 2> /dev/null | sed 1d | cut -b3-"}"
+  eval "$cmd" | $(__fzfcmd) -m | while read item; do
     printf '%q ' "$item"
   done
   echo

test/test_go.rb

@@ -148,6 +148,7 @@ class TestBase < Minitest::Test
 
   def setup
     ENV.delete 'FZF_DEFAULT_OPTS'
+    ENV.delete 'FZF_CTRL_T_COMMAND'
     ENV.delete 'FZF_DEFAULT_COMMAND'
   end
 
@@ -651,6 +652,12 @@ module TestShell
     @tmux.kill
   end
 
+  def set_var name, val
+    tmux.prepare
+    tmux.send_keys "export #{name}='#{val}'", :Enter
+    tmux.prepare
+  end
+
   def test_ctrl_t
     tmux.prepare
     tmux.send_keys 'C-t', pane: 0
@@ -670,6 +677,14 @@ module TestShell
     tmux.send_keys 'C-c', 'C-d'
   end
 
+  def test_ctrl_t_command
+    set_var "FZF_CTRL_T_COMMAND", "seq 100"
+    tmux.send_keys 'C-t', pane: 0
+    lines = tmux.until(1) { |lines| lines.item_count == 100 }
+    tmux.send_keys :BTab, :BTab, :BTab, :Enter, pane: 1
+    tmux.until(0) { |lines| lines[-1].include? '1 2 3' }
+  end
+
   def test_alt_c
     tmux.prepare
     tmux.send_keys :Escape, :c, pane: 0
@@ -842,6 +857,12 @@ class TestFish < TestBase
     tmux.until { |lines| lines.empty? }
   end
 
+  def set_var name, val
+    tmux.prepare
+    tmux.send_keys "set -l #{name} '#{val}'", :Enter
+    tmux.prepare
+  end
+
   def setup
     super
     @tmux = Tmux.new :fish