From eee45a9578042c70353d83267e67b442afa13b4c Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Mon, 5 Oct 2015 19:34:38 +0900 Subject: [PATCH] [completion] Revamp completion API * _fzf_complete is the helper function for custom completion * _fzf_complete FZF_OPTS ARGS * Reads the output of the source command instead of the command string * In zsh, you can use pipe to feed the data into the function, but it's not possible in bash as by doing so COMPREPLY is set from the subshell and thus nullified * Change the naming convention for consistency: * _fzf_complete_COMMAND e.g. # pass completion suggested by @d4ndo (#362) _fzf_complete_pass() { _fzf_complete '+m' "$@" < <( local pwdir=${PASSWORD_STORE_DIR-~/.password-store/} local stringsize="${#pwdir}" find "$pwdir" -name "*.gpg" -print | cut -c "$((stringsize + 1))"- | sed -e 's/\(.*\)\.gpg/\1/' ) } # Only in bash complete -F _fzf_complete_pass -o default -o bashdefault pass --- shell/completion.bash | 82 ++++++++++++++++++++++++++----------------- shell/completion.zsh | 70 +++++++++++++++++++++--------------- 2 files changed, 91 insertions(+), 61 deletions(-) diff --git a/shell/completion.bash b/shell/completion.bash index 3335a6a..44965ae 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -94,7 +94,7 @@ _fzf_handle_dynamic_completion() { fi } -_fzf_path_completion() { +__fzf_generic_path_completion() { local cur base dir leftover matches trigger cmd fzf [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf" cmd=$(echo ${COMP_WORDS[0]} | sed 's/[^a-z0-9_=]/_/g') @@ -135,20 +135,29 @@ _fzf_path_completion() { fi } -_fzf_list_completion() { - local cur selected trigger cmd src fzf +_fzf_feed_fifo() ( + rm -f "$fifo" + mkfifo "$fifo" + cat <&0 > "$fifo" & +) + +_fzf_complete() { + local fifo cur selected trigger cmd fzf + fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$" [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf" - read -r src + cmd=$(echo ${COMP_WORDS[0]} | sed 's/[^a-z0-9_=]/_/g') trigger=${FZF_COMPLETION_TRIGGER-'**'} cur="${COMP_WORDS[COMP_CWORD]}" if [[ ${cur} == *"$trigger" ]]; then cur=${cur:0:${#cur}-${#trigger}} + _fzf_feed_fifo "$fifo" tput sc - selected=$(eval "$src | $fzf $FZF_COMPLETION_OPTS $1 -q '$cur'" | tr '\n' ' ') - selected=${selected% } + selected=$(eval "cat '$fifo' | $fzf $FZF_COMPLETION_OPTS $1 -q '$cur'" | tr '\n' ' ') + selected=${selected% } # Strip trailing space not to repeat "-o nospace" tput rc + rm -f "$fifo" if [ -n "$selected" ]; then COMPREPLY=("$selected") @@ -160,25 +169,25 @@ _fzf_list_completion() { fi } -_fzf_all_completion() { - _fzf_path_completion \ +_fzf_path_completion() { + __fzf_generic_path_completion \ "-name .git -prune -o -name .svn -prune -o -type d -print -o -type f -print -o -type l -print" \ "-m" "" "$@" } _fzf_file_completion() { - _fzf_path_completion \ + __fzf_generic_path_completion \ "-name .git -prune -o -name .svn -prune -o -type f -print -o -type l -print" \ "-m" "" "$@" } _fzf_dir_completion() { - _fzf_path_completion \ + __fzf_generic_path_completion \ "-name .git -prune -o -name .svn -prune -o -type d -print" \ "" "/" "$@" } -_fzf_kill_completion() { +_fzf_complete_kill() { [ -n "${COMP_WORDS[COMP_CWORD]}" ] && return 1 local selected fzf @@ -193,28 +202,37 @@ _fzf_kill_completion() { fi } -_fzf_telnet_completion() { - _fzf_list_completion '+m' "$@" << "EOF" - \grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0' | awk '{if (length($2) > 0) {print $2}}' | sort -u -EOF +_fzf_complete_telnet() { + _fzf_complete '+m' "$@" < <( + \grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0' | + awk '{if (length($2) > 0) {print $2}}' | sort -u + ) } -_fzf_ssh_completion() { - _fzf_list_completion '+m' "$@" << "EOF" - cat <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | \grep -i '^host' | \grep -v '*') <(\grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0') | awk '{if (length($2) > 0) {print $2}}' | sort -u -EOF +_fzf_complete_ssh() { + _fzf_complete '+m' "$@" < <( + cat <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | \grep -i '^host' | \grep -v '*') \ + <(\grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0') | + awk '{if (length($2) > 0) {print $2}}' | sort -u + ) } -_fzf_env_var_completion() { - _fzf_list_completion '-m' "$@" << "EOF" +_fzf_complete_unset() { + _fzf_complete '-m' "$@" < <( declare -xp | sed 's/=.*//' | sed 's/.* //' -EOF + ) } -_fzf_alias_completion() { - _fzf_list_completion '-m' "$@" << "EOF" +_fzf_complete_export() { + _fzf_complete '-m' "$@" < <( + declare -xp | sed 's/=.*//' | sed 's/.* //' + ) +} + +_fzf_complete_unalias() { + _fzf_complete '-m' "$@" < <( alias | sed 's/=.*//' | sed 's/.* //' -EOF + ) } # fzf options @@ -257,19 +275,19 @@ done # Anything for cmd in $a_cmds; do - complete -F _fzf_all_completion -o default -o bashdefault $cmd + complete -F _fzf_path_completion -o default -o bashdefault $cmd done # Kill completion -complete -F _fzf_kill_completion -o nospace -o default -o bashdefault kill +complete -F _fzf_complete_kill -o nospace -o default -o bashdefault kill # Host completion -complete -F _fzf_ssh_completion -o default -o bashdefault ssh -complete -F _fzf_telnet_completion -o default -o bashdefault telnet +complete -F _fzf_complete_ssh -o default -o bashdefault ssh +complete -F _fzf_complete_telnet -o default -o bashdefault telnet # Environment variables / Aliases -complete -F _fzf_env_var_completion -o default -o bashdefault unset -complete -F _fzf_env_var_completion -o default -o bashdefault export -complete -F _fzf_alias_completion -o default -o bashdefault unalias +complete -F _fzf_complete_unset -o default -o bashdefault unset +complete -F _fzf_complete_export -o default -o bashdefault export +complete -F _fzf_complete_unalias -o default -o bashdefault unalias unset cmd d_cmds f_cmds a_cmds x_cmds diff --git a/shell/completion.zsh b/shell/completion.zsh index 9b6f467..d203498 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -10,8 +10,9 @@ # - $FZF_COMPLETION_TRIGGER (default: '**') # - $FZF_COMPLETION_OPTS (default: empty) -_fzf_path_completion() { +__fzf_generic_path_completion() { local base lbuf find_opts fzf_opts suffix tail fzf dir leftover matches nnm + # (Q) flag removes a quoting level: "foo\ bar" => "foo bar" base=${(Q)1} lbuf=$2 find_opts=$3 @@ -47,60 +48,71 @@ _fzf_path_completion() { [ -n "$nnm" ] && unsetopt nonomatch } -_fzf_all_completion() { - _fzf_path_completion "$1" "$2" \ +_fzf_path_completion() { + __fzf_generic_path_completion "$1" "$2" \ "-name .git -prune -o -name .svn -prune -o -type d -print -o -type f -print -o -type l -print" \ "-m" "" " " } _fzf_dir_completion() { - _fzf_path_completion "$1" "$2" \ + __fzf_generic_path_completion "$1" "$2" \ "-name .git -prune -o -name .svn -prune -o -type d -print" \ "" "/" "" } -_fzf_list_completion() { - local fzf_opts lbuf src fzf matches +_fzf_feed_fifo() ( + rm -f "$fifo" + mkfifo "$fifo" + cat <&0 > "$fifo" & +) + +_fzf_complete() { + local fifo fzf_opts lbuf fzf matches + fifo="${TMPDIR:-/tmp}/fzf-complete-fifo-$$" fzf_opts=$1 lbuf=$2 - read -r src [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf" - matches=$(eval "$src" | ${=fzf} ${=FZF_COMPLETION_OPTS} ${=fzf_opts} -q "$prefix") + _fzf_feed_fifo "$fifo" + matches=$(cat "$fifo" | ${=fzf} ${=FZF_COMPLETION_OPTS} ${=fzf_opts} -q "${(Q)prefix}" | tr '\n' ' ') if [ -n "$matches" ]; then - LBUFFER="$lbuf$matches " + LBUFFER="$lbuf$matches" fi zle redisplay + rm -f "$fifo" } -_fzf_telnet_completion() { - _fzf_list_completion '+m' "$@" << "EOF" - \grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0' | awk '{if (length($2) > 0) {print $2}}' | sort -u -EOF +_fzf_complete_telnet() { + _fzf_complete '+m' "$@" < <( + \grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0' | + awk '{if (length($2) > 0) {print $2}}' | sort -u + ) } -_fzf_ssh_completion() { - _fzf_list_completion '+m' "$@" << "EOF" - cat <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | \grep -i '^host' | \grep -v '*') <(\grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0') | awk '{if (length($2) > 0) {print $2}}' | sort -u -EOF +_fzf_complete_ssh() { + _fzf_complete '+m' "$@" < <( + cat <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | \grep -i '^host' | \grep -v '*') \ + <(\grep -v '^\s*\(#\|$\)' /etc/hosts | \grep -Fv '0.0.0.0') | + awk '{if (length($2) > 0) {print $2}}' | sort -u + ) } -_fzf_export_completion() { - _fzf_list_completion '+m' "$@" << "EOF" +_fzf_complete_export() { + _fzf_complete '-m' "$@" < <( declare -xp | sed 's/=.*//' | sed 's/.* //' -EOF + ) } -_fzf_unset_completion() { - _fzf_list_completion '+m' "$@" << "EOF" +_fzf_complete_unset() { + _fzf_complete '-m' "$@" < <( declare -xp | sed 's/=.*//' | sed 's/.* //' -EOF + ) } -_fzf_unalias_completion() { - _fzf_list_completion '+m' "$@" << "EOF" +_fzf_complete_unalias() { + _fzf_complete '+m' "$@" < <( alias | sed 's/=.*//' -EOF + ) } fzf-completion() { @@ -140,12 +152,12 @@ fzf-completion() { [ -z "$trigger" ] && prefix=${tokens[-1]} || prefix=${tokens[-1]:0:-${#trigger}} [ -z "${tokens[-1]}" ] && lbuf=$LBUFFER || lbuf=${LBUFFER:0:-${#tokens[-1]}} - if eval "type _fzf_${cmd}_completion > /dev/null"; then - eval "prefix=\"$prefix\" _fzf_${cmd}_completion \"$lbuf\"" + if eval "type _fzf_complete_${cmd} > /dev/null"; then + eval "prefix=\"$prefix\" _fzf_complete_${cmd} \"$lbuf\"" elif [ ${d_cmds[(i)$cmd]} -le ${#d_cmds} ]; then _fzf_dir_completion "$prefix" "$lbuf" else - _fzf_all_completion "$prefix" "$lbuf" + _fzf_path_completion "$prefix" "$lbuf" fi # Fall back to default completion else