diff options
| -rw-r--r-- | shell/completion.zsh | 9 | ||||
| -rw-r--r-- | test/test_go.rb | 14 |
2 files changed, 19 insertions, 4 deletions
diff --git a/shell/completion.zsh b/shell/completion.zsh index 79a9b24d..c9c3276f 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -11,7 +11,7 @@ # - $FZF_COMPLETION_OPTS (default: empty) _fzf_path_completion() { - local base lbuf find_opts fzf_opts suffix tail fzf dir leftover matches + local base lbuf find_opts fzf_opts suffix tail fzf dir leftover matches nnm base=$1 lbuf=$2 find_opts=$3 @@ -20,6 +20,10 @@ _fzf_path_completion() { tail=$6 [ ${FZF_TMUX:-1} -eq 1 ] && fzf="fzf-tmux -d ${FZF_TMUX_HEIGHT:-40%}" || fzf="fzf" + if ! setopt | grep nonomatch > /dev/null; then + nnm=1 + setopt nonomatch + fi dir="$base" while [ 1 ]; do if [ -z "$dir" -o -d ${~dir} ]; then @@ -35,11 +39,12 @@ _fzf_path_completion() { LBUFFER="$lbuf$matches$tail" zle redisplay fi - return + break fi dir=$(dirname "$dir") dir=${dir%/}/ done + [ -n "$nnm" ] && unsetopt nonomatch } _fzf_all_completion() { diff --git a/test/test_go.rb b/test/test_go.rb index 21299c46..7f25eb12 100644 --- a/test/test_go.rb +++ b/test/test_go.rb @@ -574,7 +574,7 @@ end module CompletionTest def test_file_completion - tmux.send_keys 'mkdir -p /tmp/fzf-test; touch /tmp/fzf-test/{1..100}; touch ~/fzf-home', :Enter + tmux.send_keys 'mkdir -p /tmp/fzf-test; touch /tmp/fzf-test/{1..100}; touch ~/fzf-home no~such~user', :Enter tmux.prepare tmux.send_keys 'cat /tmp/fzf-test/10**', :Tab, pane: 0 tmux.until(1) { |lines| lines.item_count > 0 } @@ -594,7 +594,17 @@ module CompletionTest tmux.send_keys :Enter tmux.until do |lines| tmux.send_keys 'C-L' - lines[-1].include?('fzf-home') + lines[-1].end_with?('fzf-home') + end + + # ~INVALID_USERNAME**<TAB> + tmux.send_keys 'C-u' + tmux.send_keys "cat ~such**", :Tab, pane: 0 + tmux.until(1) { |lines| lines[-3].end_with? 'no~such~user' } + tmux.send_keys :Enter + tmux.until do |lines| + tmux.send_keys 'C-L' + lines[-1].end_with?('no~such~user') end end |