Merge pull request #2

rockandska · web-flow · commit b8cc3f95dd20 · 2019-03-16T12:11:06.000+01:00
diff --git a/README.md b/README.md
@@ -89,8 +89,17 @@ The default binding to select an entry is the key \<TAB\> ( you already have you
 
 Like the original [fzf](https://github.com/junegunn/fzf) completion script, you could use recursive search with some bash complete functions by adding `**` at the end of your path, then hit key \<TAB\> to recursively looking for corresponding files / path / directories.
 
-- **Only _filedir function works with globs right now( cd, ls, and many others) , vi use _filedir_xspec and is not globs compatible right now (need to add it)**.
-- **If there is no results, you will be aware by seeing the \** removed from your current search**
+- **Works with complete functions who use for path/files lookup :**
+  - **_filedir**
+    - cd
+    - ls
+    - and more than 400 commands
+  - **_filedir_xspec**
+    - vi(m)
+    - bunzip2
+    - lynx
+    - and more than 140 commands
+- **If there is no results, you will be aware by seeing the "\*\*" removed from your current search**
 - **Be cautious that using this capability on huge directories could freeze your shell for ages without be able to cancel it with CTRL-C (need to fix it)**
 - **The bindings with globs are different ( \<TAB\>, \<SHIFT-TAB\> are used to (un)select multiples results and \<ENTER\> to validate )**
 
diff --git a/bash_completion.d/_filedir b/bash_completion.d/_filedir
@@ -32,7 +32,8 @@ __fzf_obc_trap__filedir()
     if [[ "$1" != -d ]]; then
       # With an extension filter
       if [[ -n "$1" ]];then
-        COMPREPLY+=( $(__fzf_obc_search "files" "$1") )
+        local xspec=${1:+"!*.@($1|${1^^})"};
+        COMPREPLY+=( $(__fzf_obc_search "files" "${xspec}") )
       else
         # Without extension filter
         COMPREPLY+=( $(__fzf_obc_search "paths") )
diff --git a/bash_completion.d/_filedir_xspec b/bash_completion.d/_filedir_xspec
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+__fzf_obc_trap__filedir_xspec()
+{
+  local last_status=$1
+  shift
+  local IFS=$'\n'
+  # Add / for directories to the original COMPREPLY
+  # Exclude from COMPREPLY directories listed into FZF_OBC_EXCLUDE_PATH
+  local i reply_expand exclude_arr exclude exclude_expand
+  IFS=':' read -r -a exclude_arr <<< "${FZF_OBC_EXCLUDE_PATH}"
+  for i in "${!COMPREPLY[@]}";do
+    reply_expand="${COMPREPLY[$i]}"
+    __fzf_obc_expand_tilde_by_ref reply_expand
+    for exclude in "${exclude_arr[@]}";do
+      exclude_expand=${exclude}
+      __fzf_obc_expand_tilde_by_ref exclude_expand
+      if [[ "${reply_expand}" == "${exclude_expand}" ]] || [[ "${reply_expand}" == *"/${exclude_expand}" ]];then
+        unset "COMPREPLY[$i]" && continue 2
+      fi
+    done
+    if test -d "${reply_expand}";then
+      COMPREPLY[$i]=${COMPREPLY[$i]}/
+    fi
+  done
+
+  # Add to COMPREPLY our own results
+  # Add recursivity to native _filedir
+  if [[ "${cur}" == *"**" ]];then
+    cur=${cur/\*\*/}
+    __fzf_obc_tilde "$cur" || return
+    local xspec
+    # shellcheck disable=SC2154
+    xspec="${_xspecs[${1##*/}]}"
+    local matchop=!;
+    if [[ $xspec == !* ]]; then
+        xspec=${xspec#!};
+        matchop=@;
+    fi;
+    xspec="$matchop($xspec|${xspec^^})";
+    COMPREPLY+=( $(__fzf_obc_search "files" "${xspec}") )
+    cur="${cur}**"
+  fi
+  return "${last_status}"
+}
diff --git a/bash_completion.d/_fzf_obc_functions b/bash_completion.d/_fzf_obc_functions
@@ -33,7 +33,7 @@ __fzf_obc_search() {
   local type xspec
   type="${1}"
   shift
-  xspec=${1:+"*.@($1|${1^^})"}
+  xspec=${1}
 
   local cur_expanded=${cur:-./}
   __fzf_obc_expand_tilde_by_ref cur_expanded
diff --git a/test/lib/ttytest_addons.rb b/test/lib/ttytest_addons.rb
@@ -71,13 +71,14 @@ def clear_screen
             sleep 0.05
           end
         end
-        driver.tmux(*%W[send-keys -Rt #{name}], 'Escape')
-        driver.tmux(*%W[send-keys -Rt #{name}], 'Escape')
         driver.tmux(*%W[send-keys -Rt #{name}], 'C-c')
+        sleep TTYtest.send_keys_delay
         driver.tmux(*%W[send-keys -Rt #{name}], 'C-c')
-        driver.tmux(*%W[send-keys -Rt #{name}], 'Enter')
+        sleep TTYtest.send_keys_delay
         driver.tmux(*%W[send-keys -Rt #{name}], 'printf "\\033c"')
+        sleep TTYtest.send_keys_delay
         driver.tmux(*%W[send-keys -Rt #{name}], 'Enter')
+        sleep TTYtest.send_keys_delay
       end
     end
   end
diff --git a/test/test-fzf-obc.rb b/test/test-fzf-obc.rb
@@ -21,7 +21,12 @@
 
 puts "\nChecking for binaries required for those tests\n\n"
 
-check_cmds('fzf,git')
+check_cmds(%w{
+  fzf
+  git
+  insmod
+  vi
+})
 
 
 class FzfObcTest < Minitest::Test
@@ -30,17 +35,10 @@ class FzfObcTest < Minitest::Test
 
   def setup
     prepare_tmux
+    cleanup
     @@tty.clear_screen()
   end
 
-  def teardown
-    if !TTYtest.debug
-      Dir.chdir BASE
-      FileUtils.rm_rf "#{TEST_DIR}"
-      FileUtils.rm_rf "#{ENV['HOME']}/#{HOME_TEST_DIR}"
-    end
-  end
-
   def prepare_tmux
     return if @@prepare_tmux_done
     @@prepare_tmux_done = true
@@ -140,6 +138,24 @@ def files_glob_creation
     files_creation
   end
 
+  def create_files_dirs(
+    dest: TEST_DIR,
+    subdirs: %w{},
+    files: %w{}
+  )
+    dest = File.expand_path(dest)
+    FileUtils.mkdir_p "#{dest}"
+    for file in files
+      FileUtils.touch "#{dest}/#{file}"
+    end
+    for dir in subdirs
+      FileUtils.mkdir_p "#{dest}/#{dir}"
+      for file in files
+        FileUtils.touch "#{dest}/#{dir}/#{file}"
+      end
+    end
+  end
+
   def files_home_completion
     FileUtils.mkdir_p "#{ENV['HOME']}/#{HOME_TEST_DIR}"
     FileUtils.touch "#{ENV['HOME']}/#{HOME_TEST_DIR}/fzf-obc.test"
@@ -302,4 +318,140 @@ def test_files_home_glob_completion
     TTY
   end
 
+  def test__filedir_with_insmod
+    # insmod use _filedir with extension filter
+    puts "\nDebug: inside " + __method__.to_s + "\n" if TTYtest.debug
+    create_files_dirs(
+      subdirs: %w{d1},
+      files: %w{
+        test.ko.gz
+        test\ 1.ko.gz
+        test.log
+        test.mp3
+      }
+    )
+    @@tty.send_keys(<<~EOF)
+      insmod #{TEST_DIR}/
+      #{TAB}
+    EOF
+    @@tty.assert_matches(<<~EOF)
+      $ insmod #{TEST_DIR}/
+      >
+        3/3
+      > #{TEST_DIR}/test.ko.gz
+        #{TEST_DIR}/test 1.ko.gz
+        #{TEST_DIR}/d1/
+    EOF
+  end
+
+  def test__filedir_with_insmod_in_home
+    # insmod use _filedir with extension filter
+    puts "\nDebug: inside " + __method__.to_s + "\n" if TTYtest.debug
+    create_files_dirs(
+      dest: "~/#{HOME_TEST_DIR}",
+      subdirs: %w{d1},
+      files: %w{
+        test.ko.gz
+        test\ 1.ko.gz
+        test.log
+        test.mp3
+      }
+    )
+    @@tty.send_keys(<<~EOF)
+      insmod ~/#{HOME_TEST_DIR}/
+      #{TAB}
+    EOF
+    @@tty.assert_matches(<<~EOF)
+      $ insmod ~/#{HOME_TEST_DIR}/
+      >
+        3/3
+      > ~/#{HOME_TEST_DIR}/test.ko.gz
+        ~/#{HOME_TEST_DIR}/test 1.ko.gz
+        ~/#{HOME_TEST_DIR}/d1/
+    EOF
+  end
+
+  def test__filedir_xspec_with_vi
+    # vi use _filedir_xspec with extension filter
+    puts "\nDebug: inside " + __method__.to_s + "\n" if TTYtest.debug
+    create_files_dirs(
+      subdirs: %w{d1},
+      files: %w{
+        test.conf
+        test\ 1.conf
+        test.class
+        test.mp3
+      }
+    )
+    @@tty.send_keys(<<~EOF)
+      vi #{TEST_DIR}/
+      #{TAB}
+    EOF
+    @@tty.assert_matches(<<~EOF)
+      $ vi #{TEST_DIR}/
+      >
+        3/3
+      > #{TEST_DIR}/test.conf
+        #{TEST_DIR}/test 1.conf
+        #{TEST_DIR}/d1/
+    EOF
+  end
+
+  def test__filedir_xspec_with_vi_in_home
+    # vi use _filedir_xspec with extension filter
+    puts "\nDebug: inside " + __method__.to_s + "\n" if TTYtest.debug
+    create_files_dirs(
+      dest: "~/#{HOME_TEST_DIR}",
+      subdirs: %w{d1},
+      files: %w{
+        test.conf
+        test\ 1.conf
+        test.class
+        test.mp3
+      }
+    )
+    @@tty.send_keys(<<~EOF)
+      vi ~/#{HOME_TEST_DIR}/
+      #{TAB}
+    EOF
+    @@tty.assert_matches(<<~EOF)
+      $ vi ~/#{HOME_TEST_DIR}/
+      >
+        3/3
+      > ~/#{HOME_TEST_DIR}/test.conf
+        ~/#{HOME_TEST_DIR}/test 1.conf
+        ~/#{HOME_TEST_DIR}/d1/
+    EOF
+
+    # With globs
+    @@tty.clear_screen()
+    @@tty.send_keys(<<~EOF)
+      vi ~/#{HOME_TEST_DIR}/**
+      #{TAB}
+    EOF
+    @@tty.assert_matches(<<~EOF)
+      $ vi ~/#{HOME_TEST_DIR}/**
+      >
+        4/4
+      > ~/#{HOME_TEST_DIR}/test.conf
+        ~/#{HOME_TEST_DIR}/test 1.conf
+        ~/#{HOME_TEST_DIR}/d1/test.conf
+        ~/#{HOME_TEST_DIR}/d1/test 1.conf
+    EOF
+
+  end
+
+end
+
+def cleanup
+  Dir.chdir BASE
+  FileUtils.rm_rf "#{TEST_DIR}"
+  FileUtils.rm_rf "#{ENV['HOME']}/#{HOME_TEST_DIR}"
+end
+
+MiniTest.after_run do
+  if !TTYtest.debug
+    # Don't cleanup in debug mode to keep the last test structure
+    cleanup
+  end
 end
