command-t 1.4 → 1.5

data/Gemfile

@@ -1,5 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
+
+gem 'nokogiri', '~> 1.5.10'
 gem 'mechanize'
 gem 'rake'
 gem 'rr'
-gem 'rspec', '>= 2.0.0.rc'
+gem 'rspec'

data/README.txt

@@ -158,7 +158,7 @@ of the following commands:
 
 Note: Make sure you compile targeting the same architecture Vim was built for.
 For instance, MacVim binaries are built for i386, but sometimes GCC compiles
-for x86_64. First you have to check the platfom Vim was built for:
+for x86_64. First you have to check the platform Vim was built for:
 
   vim --version
   ...
@@ -206,9 +206,9 @@ Or you can switch to a specific release with:
 
 After installing or updating you must build the extension:
 
-  cd ~/.vim/bundle/command-t
-  bundle install
-  rake make
+  cd ~/.vim/bundle/command-t/ruby/command-t
+  ruby extconf.rb
+  make
 
 While the Vimball installation automatically generates the help tags, under
 Pathogen it is necessary to do so explicitly from inside Vim:
@@ -323,6 +323,7 @@ has focus:
     <C-p>       select previous file in the file listing
     <Up>        select previous file in the file listing
     <C-f>       flush the cache (see |:CommandTFlush| for details)
+    <C-q>       place the current matches in the quickfix window
     <C-c>       cancel (dismisses file listing)
 
 The following is also available on terminals which support it:
@@ -420,7 +421,7 @@ changes via |:let|.
 Following is a list of all available options:
 
                                                *g:CommandTMaxFiles*
-  |g:CommandTMaxFiles|                           number (default 10000)
+  |g:CommandTMaxFiles|                           number (default 30000)
 
       The maximum number of files that will be considered when scanning the
       current directory. Upon reaching this number scanning stops. This
@@ -435,7 +436,7 @@ Following is a list of all available options:
       skipped.
 
                                                *g:CommandTMaxCachedDirectories*
-  |g:CommandTMaxCachedDirectories|                           number (default 1)
+  |g:CommandTMaxCachedDirectories|               number (default 1)
 
       The maximum number of directories whose contents should be cached when
       recursively scanning. With the default value of 1, each time you change
@@ -528,6 +529,23 @@ Following is a list of all available options:
       When this setting is off (the default) the matches in the |:CommandTTag|
       listing do not include filenames.
 
+                                                *g:CommandTHighlightColor*
+  |g:CommandTHighlightColor|                      string (default: 'PmenuSel')
+
+      Specifies the highlight color that will be used to show the currently
+      selected item in the match listing window.
+
+                                                *g:CommandTWildIgnore*
+  |g:CommandTWildIgnore|                          string (default: none)
+
+      Optionally override Vim's global |'wildignore'| setting during Command-T
+      seaches. If you wish to supplement rather than replace the global
+      setting, you can use a syntax like:
+
+        let g:CommandTWildIgnore=&wildignore . ",**/bower_components/*"
+
+      See also |command-t-wildignore|.
+
 As well as the basic options listed above, there are a number of settings that
 can be used to override the default key mappings used by Command-T. For
 example, to set <C-x> as the mapping for cancelling (dismissing) the Command-T
@@ -585,6 +603,9 @@ Following is a list of all map settings and their defaults:
                                       *g:CommandTRefreshMap*
                 |g:CommandTRefreshMap|  <C-f>
 
+                                      *g:CommandTQuickfixMap*
+               |g:CommandTQuickfixMap|  <C-q>
+
                                       *g:CommandTCursorLeftMap*
              |g:CommandTCursorLeftMap|  <Left>
                                       <C-h>
@@ -619,6 +640,11 @@ settings can be used to control behavior:
 
       See the |'wildignore'| documentation for more information.
 
+      If you want to influence Command-T's file exclusion behavior without
+      changing your global |'wildignore'| setting, you can use the
+      |g:CommandTWildIgnore| setting to apply an override that takes effect
+      only during Command-T searches.
+
 
 AUTHORS                                         *command-t-authors*
 
@@ -626,14 +652,16 @@ Command-T is written and maintained by Wincent Colaiuta <win@wincent.com>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
-  Anthony Panozzo           Mike Lundy                Steven Moazami
-  Daniel Hahler             Nate Kane                 Sung Pae
-  Felix Tjandrawibawa       Nicholas Alpi             Thomas Pelletier
-  Gary Bernhardt            Nadav Samet               Victor Hugo Borja
-  Jeff Kreeftmeijer         Noon Silk                 Woody Peterson
-  Lucas de Vries            Rainux Luo                Yan Pritzker
-  Marian Schubert           Scott Bronson             Zak Johnson
-  Matthew Todd              Seth Fowler
+  Anthony Panozzo           Mike Lundy                Sung Pae
+  Daniel Hahler             Nate Kane                 Thomas Pelletier
+  Felix Tjandrawibawa       Nicholas Alpi             Victor Hugo Borja
+  Gary Bernhardt            Nadav Samet               Woody Peterson
+  Ivan Ukhov                Noon Silk                 Yan Pritzker
+  Jeff Kreeftmeijer         Paul Jolly                Zak Johnson
+  Lucas de Vries            Rainux Luo
+  Marcus Brito              Scott Bronson
+  Marian Schubert           Seth Fowler
+  Matthew Todd              Steven Moazami
 
 As this was the first Vim plug-in I had ever written I was heavily influenced
 by the design of the LustyExplorer plug-in by Stephen Bach, which I understand
@@ -711,7 +739,7 @@ PayPal to win@wincent.com:
 
 LICENSE                                         *command-t-license*
 
-Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
+Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -736,6 +764,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.5 (18 September 2013)
+- don't scan "pathological" filesystem structures (ie. circular or
+  self-referential symlinks; patch from Marcus Brito)
+- gracefully handle files starting with "+" (patch from Ivan Ukhov)
+- switch default selection highlight color for better readability (suggestion
+  from André Arko), but make it possible to configure via the
+  |g:CommandTHighlightColor| setting
+- added a mapping to take the current matches and put then in the quickfix
+  window
+- performance improvements, particularly noticeable with large file
+  hierarchies
+- added |g:CommandTWildIgnore| setting (patch from Paul Jolly)
+
 1.4 (20 June 2012)
 
 - added |:CommandTTag| command (patches from Noon Silk)

data/doc/command-t.txt

@@ -158,7 +158,7 @@ of the following commands:
 
 Note: Make sure you compile targeting the same architecture Vim was built for.
 For instance, MacVim binaries are built for i386, but sometimes GCC compiles
-for x86_64. First you have to check the platfom Vim was built for:
+for x86_64. First you have to check the platform Vim was built for:
 
   vim --version
   ...
@@ -206,9 +206,9 @@ Or you can switch to a specific release with:
 
 After installing or updating you must build the extension:
 
-  cd ~/.vim/bundle/command-t
-  bundle install
-  rake make
+  cd ~/.vim/bundle/command-t/ruby/command-t
+  ruby extconf.rb
+  make
 
 While the Vimball installation automatically generates the help tags, under
 Pathogen it is necessary to do so explicitly from inside Vim:
@@ -323,6 +323,7 @@ has focus:
     <C-p>       select previous file in the file listing
     <Up>        select previous file in the file listing
     <C-f>       flush the cache (see |:CommandTFlush| for details)
+    <C-q>       place the current matches in the quickfix window
     <C-c>       cancel (dismisses file listing)
 
 The following is also available on terminals which support it:
@@ -420,7 +421,7 @@ changes via |:let|.
 Following is a list of all available options:
 
                                                *g:CommandTMaxFiles*
-  |g:CommandTMaxFiles|                           number (default 10000)
+  |g:CommandTMaxFiles|                           number (default 30000)
 
       The maximum number of files that will be considered when scanning the
       current directory. Upon reaching this number scanning stops. This
@@ -435,7 +436,7 @@ Following is a list of all available options:
       skipped.
 
                                                *g:CommandTMaxCachedDirectories*
-  |g:CommandTMaxCachedDirectories|                           number (default 1)
+  |g:CommandTMaxCachedDirectories|               number (default 1)
 
       The maximum number of directories whose contents should be cached when
       recursively scanning. With the default value of 1, each time you change
@@ -528,6 +529,23 @@ Following is a list of all available options:
       When this setting is off (the default) the matches in the |:CommandTTag|
       listing do not include filenames.
 
+                                                *g:CommandTHighlightColor*
+  |g:CommandTHighlightColor|                      string (default: 'PmenuSel')
+
+      Specifies the highlight color that will be used to show the currently
+      selected item in the match listing window.
+
+                                                *g:CommandTWildIgnore*
+  |g:CommandTWildIgnore|                          string (default: none)
+
+      Optionally override Vim's global |'wildignore'| setting during Command-T
+      seaches. If you wish to supplement rather than replace the global
+      setting, you can use a syntax like:
+
+        let g:CommandTWildIgnore=&wildignore . ",**/bower_components/*"
+
+      See also |command-t-wildignore|.
+
 As well as the basic options listed above, there are a number of settings that
 can be used to override the default key mappings used by Command-T. For
 example, to set <C-x> as the mapping for cancelling (dismissing) the Command-T
@@ -585,6 +603,9 @@ Following is a list of all map settings and their defaults:
                                       *g:CommandTRefreshMap*
                 |g:CommandTRefreshMap|  <C-f>
 
+                                      *g:CommandTQuickfixMap*
+               |g:CommandTQuickfixMap|  <C-q>
+
                                       *g:CommandTCursorLeftMap*
              |g:CommandTCursorLeftMap|  <Left>
                                       <C-h>
@@ -619,6 +640,11 @@ settings can be used to control behavior:
 
       See the |'wildignore'| documentation for more information.
 
+      If you want to influence Command-T's file exclusion behavior without
+      changing your global |'wildignore'| setting, you can use the
+      |g:CommandTWildIgnore| setting to apply an override that takes effect
+      only during Command-T searches.
+
 
 AUTHORS                                         *command-t-authors*
 
@@ -626,14 +652,16 @@ Command-T is written and maintained by Wincent Colaiuta <win@wincent.com>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
-  Anthony Panozzo           Mike Lundy                Steven Moazami
-  Daniel Hahler             Nate Kane                 Sung Pae
-  Felix Tjandrawibawa       Nicholas Alpi             Thomas Pelletier
-  Gary Bernhardt            Nadav Samet               Victor Hugo Borja
-  Jeff Kreeftmeijer         Noon Silk                 Woody Peterson
-  Lucas de Vries            Rainux Luo                Yan Pritzker
-  Marian Schubert           Scott Bronson             Zak Johnson
-  Matthew Todd              Seth Fowler
+  Anthony Panozzo           Mike Lundy                Sung Pae
+  Daniel Hahler             Nate Kane                 Thomas Pelletier
+  Felix Tjandrawibawa       Nicholas Alpi             Victor Hugo Borja
+  Gary Bernhardt            Nadav Samet               Woody Peterson
+  Ivan Ukhov                Noon Silk                 Yan Pritzker
+  Jeff Kreeftmeijer         Paul Jolly                Zak Johnson
+  Lucas de Vries            Rainux Luo
+  Marcus Brito              Scott Bronson
+  Marian Schubert           Seth Fowler
+  Matthew Todd              Steven Moazami
 
 As this was the first Vim plug-in I had ever written I was heavily influenced
 by the design of the LustyExplorer plug-in by Stephen Bach, which I understand
@@ -711,7 +739,7 @@ PayPal to win@wincent.com:
 
 LICENSE                                         *command-t-license*
 
-Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
+Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -736,6 +764,19 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.5 (18 September 2013)
+- don't scan "pathological" filesystem structures (ie. circular or
+  self-referential symlinks; patch from Marcus Brito)
+- gracefully handle files starting with "+" (patch from Ivan Ukhov)
+- switch default selection highlight color for better readability (suggestion
+  from André Arko), but make it possible to configure via the
+  |g:CommandTHighlightColor| setting
+- added a mapping to take the current matches and put then in the quickfix
+  window
+- performance improvements, particularly noticeable with large file
+  hierarchies
+- added |g:CommandTWildIgnore| setting (patch from Paul Jolly)
+
 1.4 (20 June 2012)
 
 - added |:CommandTTag| command (patches from Noon Silk)

data/doc/tags

@@ -0,0 +1,54 @@
+:CommandT	command-t.txt	/*:CommandT*
+:CommandTBuffer	command-t.txt	/*:CommandTBuffer*
+:CommandTFlush	command-t.txt	/*:CommandTFlush*
+:CommandTJumps	command-t.txt	/*:CommandTJumps*
+:CommandTTag	command-t.txt	/*:CommandTTag*
+command-t	command-t.txt	/*command-t*
+command-t-authors	command-t.txt	/*command-t-authors*
+command-t-commands	command-t.txt	/*command-t-commands*
+command-t-contents	command-t.txt	/*command-t-contents*
+command-t-development	command-t.txt	/*command-t-development*
+command-t-donations	command-t.txt	/*command-t-donations*
+command-t-history	command-t.txt	/*command-t-history*
+command-t-installation	command-t.txt	/*command-t-installation*
+command-t-intro	command-t.txt	/*command-t-intro*
+command-t-license	command-t.txt	/*command-t-license*
+command-t-mappings	command-t.txt	/*command-t-mappings*
+command-t-options	command-t.txt	/*command-t-options*
+command-t-pathogen	command-t.txt	/*command-t-pathogen*
+command-t-requirements	command-t.txt	/*command-t-requirements*
+command-t-trouble-shooting	command-t.txt	/*command-t-trouble-shooting*
+command-t-usage	command-t.txt	/*command-t-usage*
+command-t-website	command-t.txt	/*command-t-website*
+command-t-wildignore	command-t.txt	/*command-t-wildignore*
+command-t.txt	command-t.txt	/*command-t.txt*
+g:CommandTAcceptSelectionMap	command-t.txt	/*g:CommandTAcceptSelectionMap*
+g:CommandTAcceptSelectionSplitMap	command-t.txt	/*g:CommandTAcceptSelectionSplitMap*
+g:CommandTAcceptSelectionTabMap	command-t.txt	/*g:CommandTAcceptSelectionTabMap*
+g:CommandTAcceptSelectionVSplitMap	command-t.txt	/*g:CommandTAcceptSelectionVSplitMap*
+g:CommandTAlwaysShowDotFiles	command-t.txt	/*g:CommandTAlwaysShowDotFiles*
+g:CommandTBackspaceMap	command-t.txt	/*g:CommandTBackspaceMap*
+g:CommandTCancelMap	command-t.txt	/*g:CommandTCancelMap*
+g:CommandTClearMap	command-t.txt	/*g:CommandTClearMap*
+g:CommandTCursorEndMap	command-t.txt	/*g:CommandTCursorEndMap*
+g:CommandTCursorLeftMap	command-t.txt	/*g:CommandTCursorLeftMap*
+g:CommandTCursorRightMap	command-t.txt	/*g:CommandTCursorRightMap*
+g:CommandTCursorStartMap	command-t.txt	/*g:CommandTCursorStartMap*
+g:CommandTDeleteMap	command-t.txt	/*g:CommandTDeleteMap*
+g:CommandTHighlightColor	command-t.txt	/*g:CommandTHighlightColor*
+g:CommandTMatchWindowAtTop	command-t.txt	/*g:CommandTMatchWindowAtTop*
+g:CommandTMatchWindowReverse	command-t.txt	/*g:CommandTMatchWindowReverse*
+g:CommandTMaxCachedDirectories	command-t.txt	/*g:CommandTMaxCachedDirectories*
+g:CommandTMaxDepth	command-t.txt	/*g:CommandTMaxDepth*
+g:CommandTMaxFiles	command-t.txt	/*g:CommandTMaxFiles*
+g:CommandTMaxHeight	command-t.txt	/*g:CommandTMaxHeight*
+g:CommandTMinHeight	command-t.txt	/*g:CommandTMinHeight*
+g:CommandTNeverShowDotFiles	command-t.txt	/*g:CommandTNeverShowDotFiles*
+g:CommandTQuickfixMap	command-t.txt	/*g:CommandTQuickfixMap*
+g:CommandTRefreshMap	command-t.txt	/*g:CommandTRefreshMap*
+g:CommandTScanDotDirectories	command-t.txt	/*g:CommandTScanDotDirectories*
+g:CommandTSelectNextMap	command-t.txt	/*g:CommandTSelectNextMap*
+g:CommandTSelectPrevMap	command-t.txt	/*g:CommandTSelectPrevMap*
+g:CommandTTagIncludeFilenames	command-t.txt	/*g:CommandTTagIncludeFilenames*
+g:CommandTToggleFocusMap	command-t.txt	/*g:CommandTToggleFocusMap*
+g:CommandTWildIgnore	command-t.txt	/*g:CommandTWildIgnore*

data/plugin/command-t.vim

@@ -1,5 +1,5 @@
 " command-t.vim
-" Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
+" Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 "
 " Redistribution and use in source and binary forms, with or without
 " modification, are permitted provided that the following conditions are met:
@@ -120,6 +120,10 @@ function CommandTAcceptSelectionVSplit()
   ruby $command_t.accept_selection :command => 'vs'
 endfunction
 
+function CommandTQuickfix()
+  ruby $command_t.quickfix
+endfunction
+
 function CommandTRefresh()
   ruby $command_t.refresh
 endfunction

data/ruby/command-t/Makefile

@@ -4,65 +4,65 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Users/greg/.multiruby/install/1.8.7-p334/lib/ruby/1.8/i686-darwin10.6.0
+topdir = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/lib/ruby/1.8/universal-darwin12.0
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr
 exec_prefix = $(prefix)
-prefix = $(DESTDIR)/Users/greg/.multiruby/install/1.8.7-p334
-sharedstatedir = $(prefix)/com
-mandir = $(datarootdir)/man
-psdir = $(docdir)
-oldincludedir = $(DESTDIR)/usr/include
-localedir = $(datarootdir)/locale
-bindir = $(exec_prefix)/bin
-libexecdir = $(exec_prefix)/libexec
-sitedir = $(libdir)/ruby/site_ruby
-htmldir = $(docdir)
+archdir = $(rubylibdir)/$(arch)
 vendorarchdir = $(vendorlibdir)/$(sitearch)
+vendordir = $(libdir)/ruby/vendor_ruby
+sitearchdir = $(sitelibdir)/$(sitearch)
 includedir = $(prefix)/include
-infodir = $(datarootdir)/info
+libexecdir = $(exec_prefix)/libexec
+rubylibdir = $(libdir)/ruby/$(ruby_version)
 vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(prefix)/etc
+datarootdir = $(prefix)/share
 libdir = $(exec_prefix)/lib
-sbindir = $(exec_prefix)/sbin
-rubylibdir = $(libdir)/ruby/$(ruby_version)
 docdir = $(datarootdir)/doc/$(PACKAGE)
+localedir = $(datarootdir)/locale
+sitedir = $(DESTDIR)/Library/Ruby/Site
+sitelibdir = $(sitedir)/$(ruby_version)
+mandir = $(DESTDIR)/usr/share/man
 dvidir = $(docdir)
-vendordir = $(libdir)/ruby/vendor_ruby
-datarootdir = $(prefix)/share
-pdfdir = $(docdir)
-archdir = $(rubylibdir)/$(arch)
-sitearchdir = $(sitelibdir)/$(sitearch)
+oldincludedir = $(DESTDIR)/usr/include
 datadir = $(datarootdir)
+sysconfdir = $(prefix)/etc
 localstatedir = $(prefix)/var
-sitelibdir = $(sitedir)/$(ruby_version)
+sharedstatedir = $(prefix)/com
+infodir = $(DESTDIR)/usr/share/info
+sbindir = $(exec_prefix)/sbin
+psdir = $(docdir)
+htmldir = $(docdir)
+pdfdir = $(docdir)
+bindir = $(exec_prefix)/bin
 
-CC = gcc
+CC = xcrun cc
 LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -g -O2  -fno-common -pipe -fno-common $(cflags) 
+CFLAGS   =  -fno-common -arch i386 -arch x86_64 -g -Os -pipe -fno-common -DENABLE_DTRACE  -fno-common  -pipe -fno-common $(cflags) 
 INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
 DEFS     = 
 CPPFLAGS = -DHAVE_RUBY_H  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
 CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. 
+ldflags  = -L. -arch i386 -arch x86_64 
 dldflags = 
 archflag = 
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+LDSHARED = cc -arch i386 -arch x86_64 -pipe -bundle -undefined dynamic_lookup
 AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = i686-darwin10.6.0
-sitearch = i686-darwin10.6.0
+arch = universal-darwin12.0
+sitearch = universal-darwin12.0
 ruby_version = 1.8
-ruby = /Users/greg/.multiruby/install/1.8.7-p334/bin/ruby
+ruby = /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -86,7 +86,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED)  -ldl -lobjc  
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc  
 SRCS = ext.c match.c matcher.c
 OBJS = ext.o match.o matcher.o
 TARGET = ext

data/ruby/command-t/controller.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -79,6 +79,18 @@ module CommandT
       end
     end
 
+    # Take current matches and stick them in the quickfix window.
+    def quickfix
+      hide
+
+      matches = @matches.map do |match|
+        "{ 'filename': '#{VIM::escape_for_single_quotes match}' }"
+      end.join(', ')
+
+      ::VIM::command 'call setqflist([' + matches + '])'
+      ::VIM::command 'cope'
+    end
+
     def refresh
       return unless @active_finder && @active_finder.respond_to?(:flush)
       @active_finder.flush
@@ -175,10 +187,11 @@ module CommandT
       @initial_window   = $curwin
       @initial_buffer   = $curbuf
       @match_window     = MatchWindow.new \
-        :prompt               => @prompt,
+        :highlight_color      => get_string('g:CommandTHighlightColor'),
         :match_window_at_top  => get_bool('g:CommandTMatchWindowAtTop'),
         :match_window_reverse => get_bool('g:CommandTMatchWindowReverse'),
-        :min_height           => min_height
+        :min_height           => min_height,
+        :prompt               => @prompt
       @focus            = @prompt
       @prompt.focus
       register_for_key_presses
@@ -260,6 +273,7 @@ module CommandT
       selection = File.expand_path selection, @path
       selection = relative_path_under_working_directory selection
       selection = sanitize_path_string selection
+      selection = File.join('.', selection) if selection =~ /^\+/
       ensure_appropriate_window_selection
 
       @active_finder.open_selection command, selection, options
@@ -298,6 +312,7 @@ module CommandT
         'CursorRight'           => ['<Right>', '<C-l>'],
         'CursorStart'           => '<C-a>',
         'Delete'                => '<Del>',
+        'Quickfix'              => '<C-q>',
         'Refresh'               => '<C-f>',
         'SelectNext'            => ['<C-n>', '<C-j>', '<Down>'],
         'SelectPrev'            => ['<C-p>', '<C-k>', '<Up>'],
@@ -327,8 +342,8 @@ module CommandT
     end
 
     def list_matches
-      matches = @active_finder.sorted_matches_for @prompt.abbrev, :limit => match_limit
-      @match_window.matches = matches
+      @matches = @active_finder.sorted_matches_for @prompt.abbrev, :limit => match_limit
+      @match_window.matches = @matches
     end
 
     def buffer_finder
@@ -342,7 +357,8 @@ module CommandT
         :max_caches             => get_number('g:CommandTMaxCachedDirectories'),
         :always_show_dot_files  => get_bool('g:CommandTAlwaysShowDotFiles'),
         :never_show_dot_files   => get_bool('g:CommandTNeverShowDotFiles'),
-        :scan_dot_directories   => get_bool('g:CommandTScanDotDirectories')
+        :scan_dot_directories   => get_bool('g:CommandTScanDotDirectories'),
+        :wild_ignore            => get_string('g:CommandTWildIgnore')
     end
 
     def jump_finder

data/ruby/command-t/match.c

@@ -1,4 +1,4 @@
-// Copyright 2010 Wincent Colaiuta. All rights reserved.
+// Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -21,66 +21,79 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+#include "float.h"
 #include "match.h"
 #include "ext.h"
 #include "ruby_compat.h"
 
 // use a struct to make passing params during recursion easier
-typedef struct
-{
-    char    *str_p;                 // pointer to string to be searched
-    long    str_len;                // length of same
-    char    *abbrev_p;              // pointer to search string (abbreviation)
-    long    abbrev_len;             // length of same
+typedef struct {
+    char    *haystack_p;            // pointer to the path string to be searched
+    long    haystack_len;           // length of same
+    char    *needle_p;              // pointer to search string (needle)
+    long    needle_len;             // length of same
     double  max_score_per_char;
     int     dot_file;               // boolean: true if str is a dot-file
     int     always_show_dot_files;  // boolean
     int     never_show_dot_files;   // boolean
+    double  *memo;                  // memoization
 } matchinfo_t;
 
-double recursive_match(matchinfo_t *m,  // sharable meta-data
-                       long str_idx,    // where in the path string to start
-                       long abbrev_idx, // where in the search string to start
-                       long last_idx,   // location of last matched character
-                       double score)    // cumulative score so far
+double recursive_match(matchinfo_t *m,    // sharable meta-data
+                       long haystack_idx, // where in the path string to start
+                       long needle_idx,   // where in the needle string to start
+                       long last_idx,     // location of last matched character
+                       double score)      // cumulative score so far
 {
-    double seen_score = 0;      // remember best score seen via recursion
-    int dot_file_match = 0;     // true if abbrev matches a dot-file
-    int dot_search = 0;         // true if searching for a dot
+    double seen_score = 0;  // remember best score seen via recursion
+    int dot_file_match = 0; // true if needle matches a dot-file
+    int dot_search = 0;     // true if searching for a dot
+
+    // do we have a memoized result we can return?
+    double memoized = m->memo[needle_idx * m->needle_len + haystack_idx];
+    if (memoized != DBL_MAX)
+        return memoized;
 
-    for (long i = abbrev_idx; i < m->abbrev_len; i++)
-    {
-        char c = m->abbrev_p[i];
+    // bail early if not enough room (left) in haystack for (rest of) needle
+    if (m->haystack_len - haystack_idx < m->needle_len - needle_idx) {
+        score = 0.0;
+        goto memoize;
+    }
+
+    for (long i = needle_idx; i < m->needle_len; i++) {
+        char c = m->needle_p[i];
         if (c == '.')
             dot_search = 1;
         int found = 0;
-        for (long j = str_idx; j < m->str_len; j++, str_idx++)
-        {
-            char d = m->str_p[j];
-            if (d == '.')
-            {
-                if (j == 0 || m->str_p[j - 1] == '/')
-                {
+
+        // similar to above, we'll stop iterating when we know we're too close
+        // to the end of the string to possibly match
+        for (long j = haystack_idx;
+             j <= m->haystack_len - (m->needle_len - i);
+             j++, haystack_idx++) {
+            char d = m->haystack_p[j];
+            if (d == '.') {
+                if (j == 0 || m->haystack_p[j - 1] == '/') {
                     m->dot_file = 1;        // this is a dot-file
                     if (dot_search)         // and we are searching for a dot
                         dot_file_match = 1; // so this must be a match
                 }
-            }
-            else if (d >= 'A' && d <= 'Z')
+            } else if (d >= 'A' && d <= 'Z') {
                 d += 'a' - 'A'; // add 32 to downcase
-            if (c == d)
-            {
+            }
+
+            if (c == d) {
                 found = 1;
                 dot_search = 0;
 
                 // calculate score
                 double score_for_char = m->max_score_per_char;
                 long distance = j - last_idx;
-                if (distance > 1)
-                {
+
+                if (distance > 1) {
                     double factor = 1.0;
-                    char last = m->str_p[j - 1];
-                    char curr = m->str_p[j]; // case matters, so get again
+                    char last = m->haystack_p[j - 1];
+                    char curr = m->haystack_p[j]; // case matters, so get again
                     if (last == '/')
                         factor = 0.9;
                     else if (last == '-' ||
@@ -100,8 +113,7 @@ double recursive_match(matchinfo_t *m,  // sharable meta-data
                     score_for_char *= factor;
                 }
 
-                if (++j < m->str_len)
-                {
+                if (++j < m->haystack_len) {
                     // bump cursor one char to the right and
                     // use recursion to try and find a better match
                     double sub_score = recursive_match(m, j, i, last_idx, score);
@@ -110,66 +122,81 @@ double recursive_match(matchinfo_t *m,  // sharable meta-data
                 }
 
                 score += score_for_char;
-                last_idx = str_idx++;
+                last_idx = haystack_idx + 1;
                 break;
             }
         }
-        if (!found)
-            return 0.0;
+
+        if (!found) {
+            score = 0.0;
+            goto memoize;
+        }
     }
-    if (m->dot_file)
-    {
-        if (m->never_show_dot_files ||
-            (!dot_file_match && !m->always_show_dot_files))
-            return 0.0;
+
+    if (m->dot_file &&
+        (m->never_show_dot_files ||
+         (!dot_file_match && !m->always_show_dot_files))) {
+        score = 0.0;
+        goto memoize;
     }
-    return (score > seen_score) ? score : seen_score;
+    score = score > seen_score ? score : seen_score;
+
+memoize:
+    m->memo[needle_idx * m->needle_len + haystack_idx] = score;
+    return score;
 }
 
-// Match.new abbrev, string, options = {}
+// Match.new needle, string, options = {}
 VALUE CommandTMatch_initialize(int argc, VALUE *argv, VALUE self)
 {
     // process arguments: 2 mandatory, 1 optional
-    VALUE str, abbrev, options;
-    if (rb_scan_args(argc, argv, "21", &str, &abbrev, &options) == 2)
+    VALUE str, needle, options;
+    if (rb_scan_args(argc, argv, "21", &str, &needle, &options) == 2)
         options = Qnil;
-    str             = StringValue(str);
-    abbrev          = StringValue(abbrev); // already downcased by caller
+    str    = StringValue(str);
+    needle = StringValue(needle); // already downcased by caller
 
     // check optional options hash for overrides
     VALUE always_show_dot_files = CommandT_option_from_hash("always_show_dot_files", options);
     VALUE never_show_dot_files = CommandT_option_from_hash("never_show_dot_files", options);
 
     matchinfo_t m;
-    m.str_p                 = RSTRING_PTR(str);
-    m.str_len               = RSTRING_LEN(str);
-    m.abbrev_p              = RSTRING_PTR(abbrev);
-    m.abbrev_len            = RSTRING_LEN(abbrev);
-    m.max_score_per_char    = (1.0 / m.str_len + 1.0 / m.abbrev_len) / 2;
+    m.haystack_p            = RSTRING_PTR(str);
+    m.haystack_len          = RSTRING_LEN(str);
+    m.needle_p              = RSTRING_PTR(needle);
+    m.needle_len            = RSTRING_LEN(needle);
+    m.max_score_per_char    = (1.0 / m.haystack_len + 1.0 / m.needle_len) / 2;
     m.dot_file              = 0;
     m.always_show_dot_files = always_show_dot_files == Qtrue;
     m.never_show_dot_files  = never_show_dot_files == Qtrue;
 
     // calculate score
     double score = 1.0;
-    if (m.abbrev_len == 0) // special case for zero-length search string
-    {
+
+    // special case for zero-length search string
+    if (m.needle_len == 0) {
+
         // filter out dot files
-        if (!m.always_show_dot_files)
-        {
-            for (long i = 0; i < m.str_len; i++)
-            {
-                char c = m.str_p[i];
-                if (c == '.' && (i == 0 || m.str_p[i - 1] == '/'))
-                {
+        if (!m.always_show_dot_files) {
+            for (long i = 0; i < m.haystack_len; i++) {
+                char c = m.haystack_p[i];
+
+                if (c == '.' && (i == 0 || m.haystack_p[i - 1] == '/')) {
                     score = 0.0;
                     break;
                 }
             }
         }
-    }
-    else // normal case
+    } else if (m.haystack_len > 0) { // normal case
+
+        // prepare for memoization
+        double memo[m.haystack_len * m.needle_len];
+        for (long i = 0, max = m.haystack_len * m.needle_len; i < max; i++)
+            memo[i] = DBL_MAX;
+        m.memo = memo;
+
         score = recursive_match(&m, 0, 0, 0, 0.0);
+    }
 
     // clean-up and final book-keeping
     rb_iv_set(self, "@score", rb_float_new(score));

data/ruby/command-t/match_window.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -34,9 +34,10 @@ module CommandT
     @@buffer          = nil
 
     def initialize options = {}
-      @prompt = options[:prompt]
-      @reverse_list = options[:match_window_reverse]
-      @min_height = options[:min_height]
+      @highlight_color = options[:highlight_color] || 'PmenuSel'
+      @min_height      = options[:min_height]
+      @prompt          = options[:prompt]
+      @reverse_list    = options[:match_window_reverse]
 
       # save existing window dimensions so we can restore them later
       @windows = []
@@ -112,7 +113,7 @@ module CommandT
                          'gui=bold,underline'
         end
 
-        ::VIM::command 'highlight link CommandTSelection Visual'
+        ::VIM::command "highlight link CommandTSelection #{@highlight_color}"
         ::VIM::command 'highlight link CommandTNoEntries Error'
         ::VIM::evaluate 'clearmatches()'
 
@@ -227,7 +228,7 @@ module CommandT
       if @has_focus
         @has_focus = false
         if VIM::has_syntax?
-          ::VIM::command 'highlight link CommandTSelection Visual'
+          ::VIM::command "highlight link CommandTSelection #{@highlight_color}"
         end
       end
     end

data/ruby/command-t/matcher.c

@@ -1,4 +1,4 @@
-// Copyright 2010 Wincent Colaiuta. All rights reserved.
+// Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are met:
@@ -32,40 +32,39 @@ int comp_alpha(const void *a, const void *b)
 {
     VALUE a_val = *(VALUE *)a;
     VALUE b_val = *(VALUE *)b;
-    ID to_s = rb_intern("to_s");
-
+    ID    to_s  = rb_intern("to_s");
     VALUE a_str = rb_funcall(a_val, to_s, 0);
     VALUE b_str = rb_funcall(b_val, to_s, 0);
-    char *a_p = RSTRING_PTR(a_str);
-    long a_len = RSTRING_LEN(a_str);
-    char *b_p = RSTRING_PTR(b_str);
-    long b_len = RSTRING_LEN(b_str);
-    int order = 0;
-    if (a_len > b_len)
-    {
+    char  *a_p  = RSTRING_PTR(a_str);
+    long  a_len = RSTRING_LEN(a_str);
+    char  *b_p  = RSTRING_PTR(b_str);
+    long  b_len = RSTRING_LEN(b_str);
+    int   order = 0;
+
+    if (a_len > b_len) {
         order = strncmp(a_p, b_p, b_len);
         if (order == 0)
             order = 1; // shorter string (b) wins
-    }
-    else if (a_len < b_len)
-    {
+    } else if (a_len < b_len) {
         order = strncmp(a_p, b_p, a_len);
         if (order == 0)
             order = -1; // shorter string (a) wins
-    }
-    else
+    } else {
         order = strncmp(a_p, b_p, a_len);
+    }
+
     return order;
 }
 
 // comparison function for use with qsort
 int comp_score(const void *a, const void *b)
 {
-    VALUE a_val = *(VALUE *)a;
-    VALUE b_val = *(VALUE *)b;
-    ID score = rb_intern("score");
+    VALUE  a_val   = *(VALUE *)a;
+    VALUE  b_val   = *(VALUE *)b;
+    ID     score   = rb_intern("score");
     double a_score = RFLOAT_VALUE(rb_funcall(a_val, score, 0));
     double b_score = RFLOAT_VALUE(rb_funcall(b_val, score, 0));
+
     if (a_score > b_score)
         return -1; // a scores higher, a should appear sooner
     else if (a_score < b_score)
@@ -78,21 +77,26 @@ VALUE CommandTMatcher_initialize(int argc, VALUE *argv, VALUE self)
 {
     // process arguments: 1 mandatory, 1 optional
     VALUE scanner, options;
+
     if (rb_scan_args(argc, argv, "11", &scanner, &options) == 1)
         options = Qnil;
     if (NIL_P(scanner))
         rb_raise(rb_eArgError, "nil scanner");
+
     rb_iv_set(self, "@scanner", scanner);
 
     // check optional options hash for overrides
     VALUE always_show_dot_files = CommandT_option_from_hash("always_show_dot_files", options);
     if (always_show_dot_files != Qtrue)
         always_show_dot_files = Qfalse;
+
     VALUE never_show_dot_files = CommandT_option_from_hash("never_show_dot_files", options);
     if (never_show_dot_files != Qtrue)
         never_show_dot_files = Qfalse;
+
     rb_iv_set(self, "@always_show_dot_files", always_show_dot_files);
     rb_iv_set(self, "@never_show_dot_files", never_show_dot_files);
+
     return Qnil;
 }
 
@@ -119,8 +123,7 @@ VALUE CommandTMatcher_sorted_matches_for(VALUE self, VALUE abbrev, VALUE options
         limit = RARRAY_LEN(matches);
 
     // will return an array of strings, not an array of Match objects
-    for (long i = 0; i < limit; i++)
-    {
+    for (long i = 0; i < limit; i++) {
         VALUE str = rb_funcall(RARRAY_PTR(matches)[i], rb_intern("to_s"), 0);
         RARRAY_PTR(matches)[i] = str;
     }
@@ -129,6 +132,7 @@ VALUE CommandTMatcher_sorted_matches_for(VALUE self, VALUE abbrev, VALUE options
     if (limit < RARRAY_LEN(matches))
         (void)rb_funcall(matches, rb_intern("slice!"), 2, LONG2NUM(limit),
             LONG2NUM(RARRAY_LEN(matches) - limit));
+
     return matches;
 }
 
@@ -136,29 +140,30 @@ VALUE CommandTMatcher_matches_for(VALUE self, VALUE abbrev)
 {
     if (NIL_P(abbrev))
         rb_raise(rb_eArgError, "nil abbrev");
+
     VALUE matches = rb_ary_new();
     VALUE scanner = rb_iv_get(self, "@scanner");
     VALUE always_show_dot_files = rb_iv_get(self, "@always_show_dot_files");
     VALUE never_show_dot_files = rb_iv_get(self, "@never_show_dot_files");
     VALUE options = Qnil;
-    if (always_show_dot_files == Qtrue)
-    {
+
+    if (always_show_dot_files == Qtrue) {
         options = rb_hash_new();
         rb_hash_aset(options, ID2SYM(rb_intern("always_show_dot_files")), always_show_dot_files);
-    }
-    else if (never_show_dot_files == Qtrue)
-    {
+    } else if (never_show_dot_files == Qtrue) {
         options = rb_hash_new();
         rb_hash_aset(options, ID2SYM(rb_intern("never_show_dot_files")), never_show_dot_files);
     }
+
     abbrev = rb_funcall(abbrev, rb_intern("downcase"), 0);
     VALUE paths = rb_funcall(scanner, rb_intern("paths"), 0);
-    for (long i = 0, max = RARRAY_LEN(paths); i < max; i++)
-    {
+
+    for (long i = 0, max = RARRAY_LEN(paths); i < max; i++) {
         VALUE path = RARRAY_PTR(paths)[i];
         VALUE match = rb_funcall(cCommandTMatch, rb_intern("new"), 3, path, abbrev, options);
         if (rb_funcall(match, rb_intern("matches?"), 0) == Qtrue)
             rb_funcall(matches, rb_intern("push"), 1, match);
     }
+
     return matches;
 }

data/ruby/command-t/scanner/file_scanner.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2011 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,9 +35,11 @@ module CommandT
       @paths_keys           = []
       @path                 = path
       @max_depth            = options[:max_depth] || 15
-      @max_files            = options[:max_files] || 10_000
+      @max_files            = options[:max_files] || 30_000
       @max_caches           = options[:max_caches] || 1
       @scan_dot_directories = options[:scan_dot_directories] || false
+      @wild_ignore          = options[:wild_ignore]
+      @base_wild_ignore     = VIM::wild_ignore
     end
 
     def paths
@@ -48,8 +50,11 @@ module CommandT
         @depth        = 0
         @files        = 0
         @prefix_len   = @path.chomp('/').length
+        set_wild_ignore(@wild_ignore)
         add_paths_for_directory @path, @paths[@path]
       rescue FileLimitExceeded
+      ensure
+        set_wild_ignore(@base_wild_ignore)
       end
       @paths[@path]
     end
@@ -76,6 +81,17 @@ module CommandT
       ::VIM::evaluate("empty(expand(fnameescape('#{path}')))").to_i == 1
     end
 
+    def looped_symlink? path
+      if File.symlink?(path)
+        target = File.expand_path(File.readlink(path), File.dirname(path))
+        target.include?(@path) || @path.include?(target)
+      end
+    end
+
+    def set_wild_ignore(ignore)
+      ::VIM::command("set wildignore=#{ignore}") if @wild_ignore
+    end
+
     def add_paths_for_directory dir, accumulator
       Dir.foreach(dir) do |entry|
         next if ['.', '..'].include?(entry)
@@ -88,6 +104,7 @@ module CommandT
           elsif File.directory?(path)
             next if @depth >= @max_depth
             next if (entry.match(/\A\./) && !@scan_dot_directories)
+            next if looped_symlink?(path)
             @depth += 1
             add_paths_for_directory path, accumulator
             @depth -= 1

data/ruby/command-t/vim.rb

@@ -1,4 +1,4 @@
-# Copyright 2010-2012 Wincent Colaiuta. All rights reserved.
+# Copyright 2010-2013 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -42,6 +42,10 @@ module CommandT
       ::VIM::evaluate 'getcwd()'
     end
 
+    def self.wild_ignore
+      exists?('&wildignore') && ::VIM::evaluate('&wildignore').to_s
+    end
+
     # Execute cmd, capturing the output into a variable and returning it.
     def self.capture cmd
       ::VIM::command 'silent redir => g:command_t_captured_output'

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  version: "1.4"
+  - 5
+  version: "1.5"
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -61,6 +61,7 @@ files:
 - ruby/command-t/vim/window.rb
 - ruby/command-t/vim.rb
 - doc/command-t.txt
+- doc/tags
 - plugin/command-t.vim
 has_rdoc: true
 homepage: https://wincent.com/products/command-t