Merge branch 'pull/369'

Closes: #369 * pull/369: docs: update AUTHORS and HISTORY sections refactor: tweak per `:h wildcard` definition feat: let *~ wildcard work.
wincent · May 9, 2020 · d044bac · d044bac
2 parents 1d67adc + f37c6a3
commit d044bac
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/doc/command-t.txt b/doc/command-t.txt
@@ -1404,27 +1404,27 @@ AUTHORS                                         *command-t-authors*
 Command-T is written and maintained by Greg Hurrell <greg@hurrell.net>.
 Other contributors that have submitted patches include, in alphabetical order:
 
-  Abhinav Gupta                   Nate Kane
-  Adrian Keet                     Nicholas T.
-  Aleksandrs Ļedovskis            Nicolas Alpi
-  Alexey Terekhov                 Nikolai Aleksandrovich Pavlov
-  Andrius Grabauskas              Nilo César Teixeira
-  Andy Waite                      Noon Silk
-  Anthony Panozzo                 Ole Petter Bang
-  Artem Nezvigin                  Patrick Hayes
-  Ben Boeckel                     Paul Jolly
-  Daniel Burgess                  Pavel Sergeev
-  Daniel Hahler                   Rainux Luo
-  David Emett                     Richard Feldman
-  David Szotten                   Roland Puntaier
-  Douglas Drumond                 Ross Lagerwall
-  Emily Strickland                Sam Morris
-  Felix Tjandrawibawa             Scott Bronson
-  Gary Bernhardt                  Seth Fowler
-  Henric Trotzig                  Sherzod Gapirov
-  Ivan Ukhov                      Shlomi Fish
-  Jakob Pfender                   Stefan Schmidt
-  Jeff Kreeftmeijer               Stephen Gelman
+  Abhinav Gupta                   Nicholas T.
+  Adrian Keet                     Nicolas Alpi
+  Aleksandrs Ļedovskis            Nikolai Aleksandrovich Pavlov
+  Alexey Terekhov                 Nilo César Teixeira
+  Andrius Grabauskas              Noon Silk
+  Andy Waite                      Ole Petter Bang
+  Anthony Panozzo                 Patrick Hayes
+  Artem Nezvigin                  Paul Jolly
+  Ben Boeckel                     Pavel Sergeev
+  Daniel Burgess                  Rainux Luo
+  Daniel Hahler                   Richard Feldman
+  David Emett                     Roland Puntaier
+  David Szotten                   Ross Lagerwall
+  Douglas Drumond                 Sam Morris
+  Emily Strickland                Scott Bronson
+  Felix Tjandrawibawa             Seth Fowler
+  Gary Bernhardt                  Sherzod Gapirov
+  Henric Trotzig                  Shlomi Fish
+  Ivan Ukhov                      Stefan Schmidt
+  Jakob Pfender                   Stephen Gelman
+  Jeff Kreeftmeijer               Steve Herrell
   Jerome Castaneda                Steven Moazami
   Joe Lencioni                    Steven Stallion
   KJ Tsanaktsidis                 Sung Pae
@@ -1437,6 +1437,7 @@ Other contributors that have submitted patches include, in alphabetical order:
   Max Timkovich                   Yan Pritzker
   Mike Lundy                      Zak Johnson
   Nadav Samet                     xiaodezhang
+  Nate Kane
 
 This list produced with:
 
@@ -1573,6 +1574,9 @@ master (not yet released) ~
 - Close match listing after buffer deletion to avoid likely errors on
   subsequent interactions (#357, patch from Andrius Grabauskas).
 - Fix |E116| error opening filenames containing single quotes.
+- Deal with |'wildignore'| (and |g:CommandTWildIgnore|) patterns of the form
+  "*pattern" (eg. "*~", which would ignore files created with Vim's default
+  |'backupext'|) (#369, patch from Steve Herrell).
 
 5.0.3 (19 September 2018) ~
 

diff --git a/ruby/command-t/lib/command-t/vim.rb b/ruby/command-t/lib/command-t/vim.rb
@@ -79,6 +79,9 @@ def wildignore_to_regexp(str)
           elsif pattern.match(%r{\A\*\.([^*]+)\z})
             # *.something (match file with extension at any level)
             '\.' + Regexp.escape($~[1]) + '\z'
+          elsif pattern.match(%r{\A\*([^*/.]+)\z})
+            # *something (match suffix at any level)
+            Regexp.escape($~[1]) + '\z'
           elsif pattern.match(%r{\A\*/([^/]+)/\*\z})
             # */something/* (match directories at any level)
             '(\A|/)' + Regexp.escape($~[1]) + '/.+'