Invoke fzf consitently with Ctrl-T (zsh)

hellricer · Apr 16, 2020 · ddd6fbf · ddd6fbf
1 parent dea206b
commit ddd6fbf
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 61 deletions.
diff --git a/shell/completion.zsh b/shell/completion.zsh
@@ -6,7 +6,6 @@
 #
 # - $FZF_TMUX               (default: 0)
 # - $FZF_TMUX_OPTS          (default: '-d 40%')
-# - $FZF_COMPLETION_TRIGGER (default: '**')
 # - $FZF_COMPLETION_OPTS    (default: empty)
 
 # Both branches of the following `if` do the same thing -- define
@@ -112,6 +111,11 @@ __fzf_comprun() {
   fi
 }
 
+__fzfcmd_complete() {
+  [ -n "$TMUX_PANE" ] && [ "${FZF_TMUX:-0}" != 0 ] && [ ${LINES:-40} -gt 15 ] &&
+    echo "fzf-tmux -d${FZF_TMUX_HEIGHT:-40%}" || echo "fzf"
+}
+
 # Extract the name of the command. e.g. foo=1 bar baz**<tab>
 __fzf_extract_command() {
   local token tokens
@@ -250,8 +254,17 @@ _fzf_complete_unalias() {
   )
 }
 
+_fzf_complete_kill() {
+  fzf="$(__fzfcmd_complete)"
+  matches=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS --preview 'echo {}' --preview-window down:3:wrap $FZF_COMPLETION_OPTS" ${(Q)${(Z+n+)fzf}} -m | awk '{print $2}' | tr '\n' ' ')
+  if [ -n "$matches" ]; then
+    LBUFFER="$LBUFFER$matches"
+  fi
+  zle reset-prompt
+}
+
 fzf-completion() {
-  local tokens cmd prefix trigger tail matches lbuf d_cmds
+  local tokens cmd prefix matches lbuf d_cmds
   setopt localoptions noshwordsplit noksh_arrays noposixbuiltins
 
   # http://zsh.sourceforge.net/FAQ/zshfaq03.html
@@ -264,41 +277,19 @@ fzf-completion() {
 
   cmd=$(__fzf_extract_command "$LBUFFER")
 
-  # Explicitly allow for empty trigger.
-  trigger=${FZF_COMPLETION_TRIGGER-'**'}
-  [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("")
+  [ ${LBUFFER[-1]} = ' ' ] && tokens+=("")
 
-  # When the trigger starts with ';', it becomes a separate token
-  if [[ ${LBUFFER} = *"${tokens[-2]}${tokens[-1]}" ]]; then
-    tokens[-2]="${tokens[-2]}${tokens[-1]}"
-    tokens=(${tokens[0,-2]})
-  fi
+  d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir})
 
-  tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))}
-  # Kill completion (do not require trigger sequence)
-  if [ "$cmd" = kill -a ${LBUFFER[-1]} = ' ' ]; then
-    matches=$(command ps -ef | sed 1d | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-50%} --min-height 15 --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS --preview 'echo {}' --preview-window down:3:wrap" __fzf_comprun "$cmd" -m | awk '{print $2}' | tr '\n' ' ')
-    if [ -n "$matches" ]; then
-      LBUFFER="$LBUFFER$matches"
-    fi
-    zle reset-prompt
-  # Trigger sequence given
-  elif [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then
-    d_cmds=(${=FZF_COMPLETION_DIR_COMMANDS:-cd pushd rmdir})
-
-    [ -z "$trigger"      ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}}
-    [ -z "${tokens[-1]}" ] && lbuf=$LBUFFER        || lbuf=${LBUFFER:0:-${#tokens[-1]}}
-
-    if eval "type _fzf_complete_${cmd} > /dev/null"; then
-      prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf}
-    elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then
-      _fzf_dir_completion "$prefix" "$lbuf"
-    else
-      _fzf_path_completion "$prefix" "$lbuf"
-    fi
-  # Fall back to default completion
+  prefix=${tokens[-1]}
+  [ -z "${tokens[-1]}" ] && lbuf=$LBUFFER || lbuf=${LBUFFER:0:-${#tokens[-1]}}
+
+  if eval "type _fzf_complete_${cmd} > /dev/null"; then
+    prefix="$prefix" eval _fzf_complete_${cmd} ${(q)lbuf}
+  elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then
+    _fzf_dir_completion "$prefix" "$lbuf"
   else
-    zle ${fzf_default_completion:-expand-or-complete}
+    _fzf_path_completion "$prefix" "$lbuf"
   fi
 }
 
@@ -308,9 +299,6 @@ fzf-completion() {
   unset binding
 }
 
-zle     -N   fzf-completion
-bindkey '^I' fzf-completion
-
 } always {
   # Restore the original options.
   eval $__fzf_completion_options

diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh
@@ -38,35 +38,11 @@ fi
 
 [[ -o interactive ]] || return 0
 
-# CTRL-T - Paste the selected file path(s) into the command line
-__fsel() {
-  local cmd="${FZF_CTRL_T_COMMAND:-"command find -L . -mindepth 1 \\( -path '*/\\.*' -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' \\) -prune \
-    -o -type f -print \
-    -o -type d -print \
-    -o -type l -print 2> /dev/null | cut -b3-"}"
-  setopt localoptions pipefail no_aliases 2> /dev/null
-  eval "$cmd" | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse $FZF_DEFAULT_OPTS $FZF_CTRL_T_OPTS" $(__fzfcmd) -m "$@" | while read item; do
-    echo -n "${(q)item} "
-  done
-  local ret=$?
-  echo
-  return $ret
-}
-
 __fzfcmd() {
   [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; } &&
     echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf"
 }
 
-fzf-file-widget() {
-  LBUFFER="${LBUFFER}$(__fsel)"
-  local ret=$?
-  zle reset-prompt
-  return $ret
-}
-zle     -N   fzf-file-widget
-bindkey '^T' fzf-file-widget
-
 # Ensure precmds are run after cd
 fzf-redraw-prompt() {
   local precmd
@@ -115,6 +91,10 @@ fzf-history-widget() {
 zle     -N   fzf-history-widget
 bindkey '^R' fzf-history-widget
 
+zle     -N   fzf-completion
+bindkey '^T' fzf-completion
+
+
 } always {
   eval $__fzf_key_bindings_options
   'unset' '__fzf_key_bindings_options'