diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2015-05-11 13:06:02 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2015-05-11 13:06:02 +0900 |
| commit | 3b63b398101dbbcc8b09ba136a8e28a1dd6daa11 (patch) | |
| tree | e28da4b69c282077d8e01fc65abaab342d582a09 | |
| parent | 0cd238700caea82b44a1c66dc6a60323b83a1b68 (diff) | |
[zsh-completion] Allow empty prefix & trigger sequence (#232)
| -rw-r--r-- | shell/completion.zsh | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/shell/completion.zsh b/shell/completion.zsh index a5285546..40e8f2e5 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -112,14 +112,24 @@ fzf-zsh-completion() { # Explicitly allow for empty trigger. trigger=${FZF_COMPLETION_TRIGGER-'**'} + [ -z "$trigger" -a ${LBUFFER[-1]} = ' ' ] && tokens+=("") - # Trigger sequence given tail=${LBUFFER:$(( ${#LBUFFER} - ${#trigger} ))} - if [ ${#tokens} -gt 1 -a $tail = $trigger ]; then + # Kill completion (do not require trigger sequence) + if [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then + [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf" + matches=$(ps -ef | sed 1d | ${=fzf} ${=FZF_COMPLETION_OPTS} -m | awk '{print $2}' | tr '\n' ' ') + if [ -n "$matches" ]; then + LBUFFER="$LBUFFER$matches" + zle redisplay + fi + # Trigger sequence given + elif [ ${#tokens} -gt 1 -a "$tail" = "$trigger" ]; then d_cmds=(cd pushd rmdir) - prefix=${tokens[-1]:0:-${#trigger}} - lbuf=${LBUFFER:0:-${#tokens[-1]}} + [ -z "$trigger" ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}} + [ -z "${tokens[-1]}" ] && lbuf=$LBUFFER || lbuf=${LBUFFER:0:-${#tokens[-1]}} + if [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then _fzf_dir_completion "$prefix" $lbuf elif [ $cmd = telnet ]; then @@ -133,14 +143,6 @@ fzf-zsh-completion() { else _fzf_all_completion "$prefix" $lbuf fi - # Kill completion (do not require trigger sequence) - elif [ $cmd = kill -a ${LBUFFER[-1]} = ' ' ]; then - [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf" - matches=$(ps -ef | sed 1d | ${=fzf} ${=FZF_COMPLETION_OPTS} -m | awk '{print $2}' | tr '\n' ' ') - if [ -n "$matches" ]; then - LBUFFER="$LBUFFER$matches" - zle redisplay - fi # Fall back to default completion else zle expand-or-complete |