diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2024-04-19 22:40:38 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 22:40:38 +0900 |
| commit | f864f8b5f7ab62e81fbf9eb2ac2333c7e52bb4e4 (patch) | |
| tree | 81ef4e2c8043565d883eda9b619645890ade9ecd /shell/key-bindings.zsh | |
| parent | 31d72efba703b49b6c5f3ceee3eadac69bb1cd46 (diff) | |
| download | fzf-f864f8b5f7ab62e81fbf9eb2ac2333c7e52bb4e4.tar.gz | |
Respect $FZF_DEFAULT_OPTS_FILE in key bindings and completion (#3742)
Fix #3740
Diffstat (limited to 'shell/key-bindings.zsh')
| -rw-r--r-- | shell/key-bindings.zsh | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index 07baa203..56e3ae5c 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -38,11 +38,21 @@ fi { if [[ -o interactive ]]; then +__fzf_defaults() { + # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + echo "--height ${FZF_TMUX_HEIGHT:-40%} --bind=ctrl-z:ignore $1" + command cat "${FZF_DEFAULT_OPTS_FILE-}" 2> /dev/null + echo "${FZF_DEFAULT_OPTS-} $2" +} + # CTRL-T - Paste the selected file path(s) into the command line -__fsel() { +__fzf_select() { setopt localoptions pipefail no_aliases 2> /dev/null local item - FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --walker=file,dir,follow,hidden --scheme=path --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_CTRL_T_OPTS-}" $(__fzfcmd) -m "$@" < /dev/tty | while read item; do + FZF_DEFAULT_COMMAND=${FZF_CTRL_T_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path" "${FZF_CTRL_T_OPTS-} -m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) "$@" < /dev/tty | while read item; do echo -n "${(q)item} " done local ret=$? @@ -56,7 +66,7 @@ __fzfcmd() { } fzf-file-widget() { - LBUFFER="${LBUFFER}$(__fsel)" + LBUFFER="${LBUFFER}$(__fzf_select)" local ret=$? zle reset-prompt return $ret @@ -71,7 +81,10 @@ fi # ALT-C - cd into the selected directory fzf-cd-widget() { setopt localoptions pipefail no_aliases 2> /dev/null - local dir="$(FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} --reverse --walker=dir,follow,hidden --scheme=path --bind=ctrl-z:ignore ${FZF_DEFAULT_OPTS-} ${FZF_ALT_C_OPTS-}" $(__fzfcmd) +m < /dev/tty)" + local dir="$( + FZF_DEFAULT_COMMAND=${FZF_ALT_C_COMMAND:-} \ + FZF_DEFAULT_OPTS=$(__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path" "${FZF_ALT_C_OPTS-} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd) < /dev/tty)" if [[ -z "$dir" ]]; then zle redisplay return 0 @@ -96,7 +109,8 @@ fzf-history-widget() { local selected num setopt localoptions noglobsubst noposixbuiltins pipefail no_aliases 2> /dev/null selected="$(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' | - FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} ${FZF_DEFAULT_OPTS-} -n2..,.. --scheme=history --bind=ctrl-r:toggle-sort,ctrl-z:ignore ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m" $(__fzfcmd))" + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" local ret=$? if [ -n "$selected" ]; then num=$(awk '{print $1}' <<< "$selected") |