command-t 1.10 → 1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d8531502158d735acade5b00128048555140f7
-  data.tar.gz: a344dfa12e20fc81e159531b2e4623e0f8625642
+  metadata.gz: e542a39c30001daa8498a0dadc7e646fa5c9d342
+  data.tar.gz: 4a1aedd0bc94d9afae2fa03c6ded35a8e1e4b9c1
 SHA512:
-  metadata.gz: d242333088628804ddd1dada59c44b3237e2c3448a2c3aaf8a9295c2f01375e5f99a3f1cebb42e6dee45e4abbc1901e26f507380290cccaf1ea86f9e50e6538a
-  data.tar.gz: 3172d42364bf309754fe8cfdb766f3df78b313186549cdec8a0ce523d8581a0cf2dc53452773063db7b2a1e4a8dd35645393c7015ff8b6f3dec10543d61218bd
+  metadata.gz: 6ee44802106f493bc3138703b3b86c9b615c2d44a6fecfa348a22da310213605452c9205151c023ea65717c620b288885e546720b80de497019cc9cf639763e2
+  data.tar.gz: e27e0fe5744d7f5b6833ad767ec8f04f2540c84d80f1d90464a26a6f9cd16981bf0ca985ca4fc8206b57a4a231eb06514eeb866a6d55dd542e22d03cd7004c8a

data/README.txt

@@ -302,6 +302,17 @@ repository with:
 
   su -c 'yum install vim-command-t'
 
+                                                       *command-t-appstream*
+AppStream Metadata ~
+
+When preparing a Command-T package for distribution on Linux using Gnome
+Software or another AppStream compatible application, there is a metafile in
+appstream directory.
+
+You can find more about AppStream specification at:
+
+  http://www.freedesktop.org/software/appstream/docs/
+
 
 TROUBLE-SHOOTING                                *command-t-trouble-shooting*
 
@@ -311,12 +322,11 @@ linked against at compile time. For example, if one is 32-bit and the other is
 64-bit, or one is from the Ruby 1.9 series and the other is from the 1.8
 series, then the plug-in is not likely to work.
 
-As such, on OS X, I recommend using the standard Ruby that comes with the
-system (currently 1.8.7) along with the latest version of MacVim (currently
-version 7.3). If you wish to use custom builds of Ruby or of MacVim (not
-recommmended) then you will have to take extra care to ensure that the exact
-same Ruby environment is in effect when building Ruby, Vim and the Command-T
-extension.
+On OS X, Apple tends to change the version of Ruby that comes with the system
+with each major release. See |command-t-requirements| above for details about
+specific versions. If you wish to use custom builds of Ruby or of MacVim then
+you will have to take extra care to ensure that the exact same Ruby
+environment is in effect when building Ruby, Vim and the Command-T extension.
 
 For Windows, the following combination is known to work:
 
@@ -342,6 +352,17 @@ flags or architecture flags are different then it is likely that something
 has changed in your Ruby environment and the extension may not work until
 you eliminate the discrepancy.
 
+From inside Vim, you can confirm the version of Ruby that it is using by
+issuing this command:
+
+  :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+
+Finally, beware that if you change your installation method for Command-T (for
+example, switching from one plugin manager to another) you should verify that
+you remove all of the files installed by the previous installation method; if
+you fail to do this, Vim may end up executing the old code, invalidating all
+your attempts to get Vim and Command-T using the same version of Ruby.
+
 
 USAGE                                           *command-t-usage*
 
@@ -573,6 +594,10 @@ Following is a list of all available options:
         work on systems without the tool or with an incompatible version of
         the tool.
 
+      - "git": uses `git ls-files` to quickly produce a list of files; when
+        Git isn't available or the path being searched is not inside a Git
+        repository falls back to "find".
+
       - "watchman": uses Watchman (https://github.com/facebook/watchman) if
         available; otherwise falls back to "find". Note that this scanner is
         intended for use with very large hierarchies (hundreds of thousands of
@@ -581,6 +606,34 @@ Following is a list of all available options:
         Command-T would usually consult, such as 'wildignore' and
         |g:CommandTScanDotDirectories| are ignored.
 
+                                               *g:CommandTTraverseSCM*
+  |g:CommandTTraverseSCM|                        string (default: 'file')
+
+      Instructs Command-T how to chose a root path when opening a file finder
+      without an explicit path argument. Possible values are:
+
+      - "file": starting from the file currently being edited, traverse
+        upwards through the filesystem hierarchy until you find an SCM root
+        (as indicated by the presence of a ".git", ".hg" or similar directory)
+        and use that as the base path. If no such root is found, fallback to
+        using Vim's present working directory as a root. The list of SCM
+        directories that Command-T uses to detect an SCM root can be
+        customized with the |g:CommandTSCMDirectories| option.
+
+      - "dir": traverse upwards looking for an SCM root just like the "file"
+        setting (above), but instead of starting from the file currently being
+        edited, start from Vim's present working directory instead.
+
+      - "pwd": use Vim's present working directory as a root (ie. attempt no
+        traversal).
+
+                                               *g:CommandTSCMDirectories*
+  |g:CommandTSCMDirectories|    string (default: '.git,.hg,.svn,.bzr,_darcs')
+
+      The marker directories that Command-T will use to identify SCM roots
+      during traversal (see |g:CommandTTraverseSCM| above).
+
+
                                                *g:CommandTMinHeight*
   |g:CommandTMinHeight|                          number (default: 0)
 
@@ -712,7 +765,7 @@ Following is a list of all available options:
 
           function! GotoOrOpen(...)
             for file in a:000
-              if bufexists(file)
+              if bufwinnr(file) != -1
                 exec "sb " . file
               else
                 exec "tabe " . file
@@ -724,6 +777,8 @@ Following is a list of all available options:
 
           let g:CommandTAcceptSelectionTabCommand = 'GotoOrOpen'
 
+      For a slightly more comprehensive example, see: https://wt.pe/e
+
                                         *g:CommandTAcceptSelectionSplitCommand*
   |g:CommandTAcceptSelectionSplitCommand| string (default: 'sp')
 
@@ -1020,19 +1075,21 @@ Command-T is written and maintained by Greg Hurrell <greg@hurrell.net>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
+  Abhinav Gupta           Marian Schubert         Scott Bronson
   Andy Waite              Matthew Todd            Seth Fowler
   Anthony Panozzo         Mike Lundy              Shlomi Fish
   Artem Nezvigin          Nadav Samet             Steven Moazami
-  Daniel Hahler           Nate Kane               Sung Pae
-  Felix Tjandrawibawa     Nicholas Alpi           Thomas Pelletier
-  Gary Bernhardt          Noon Silk               Ton van den Heuvel
-  Ivan Ukhov              Ole Petter Bang         Victor Hugo Borja
-  Jacek Wysocki           Paul Jolly              Vít Ondruch
-  Jeff Kreeftmeijer       Pavel Sergeev           Woody Peterson
-  Kevin Webster           Rainux Luo              Yan Pritzker
-  Lucas de Vries          Roland Puntaier         Yiding Jia
-  Marcus Brito            Ross Lagerwall          Zak Johnson
-  Marian Schubert         Scott Bronson
+  Ben Osheroff            Nate Kane               Sung Pae
+  Daniel Hahler           Nicholas Alpi           Thomas Pelletier
+  David Szotten           Noon Silk               Ton van den Heuvel
+  Felix Tjandrawibawa     Ole Petter Bang         Victor Hugo Borja
+  Gary Bernhardt          Patrick Hayes           Vít Ondruch
+  Ivan Ukhov              Paul Jolly              Woody Peterson
+  Jacek Wysocki           Pavel Sergeev           Yan Pritzker
+  Jeff Kreeftmeijer       Rainux Luo              Yiding Jia
+  Kevin Webster           Richard Feldman         Zak Johnson
+  Lucas de Vries          Roland Puntaier
+  Marcus Brito            Ross Lagerwall
 
 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
@@ -1126,6 +1183,17 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.11 (15 August 2014)
+
+- improve edge-case handling in match results window code (patches from
+  Richard Feldman)
+- add "git" file scanner (patch from Patrick Hayes)
+- speed-up when 'wildignore' is unset (patch from Patrick Hayes)
+- add |g:CommandTTraverseSCM| setting which anchors Command-T's file finder to
+  the nearest SCM directory (based on patches from David Szotten and Ben
+  Osheroff)
+- add AppStream metadata (patch from Vít Ondruch)
+
 1.10 (15 July 2014)
 
 - improve tag finder performance by caching tag lists (patch from Artem

data/Rakefile

@@ -86,24 +86,14 @@ The general release sequence is:
   rake prerelease
   rake gem
   rake push
-  bundle exec rake upload:all
+  rake upload:all
 
-Most of the Rake tasks run fine without Bundler, and in fact, we
-don't want Bundler in the prerelease task because it will tamper
-with the environment in a way that breaks multiruby.
-
-We use Bundler for the upload task because the www.vim.org
-uploader uses Bundler to ensure that the Mechanize gem is available.
+Note: the upload task depends on the Mechanize gem; and may require a
+prior `gem install mechanize`
 
   END
 end
 
-task :check_bundler do
-  unless ENV.has_key? 'BUNDLE_GEMFILE'
-    warn 'warning: Bundler is not loaded; try running with `bundle exec rake`'
-  end
-end
-
 desc 'Run specs'
 task :spec do
   system 'bundle exec rspec spec'
@@ -179,7 +169,7 @@ namespace :upload do
   end
 
   desc 'Upload current vimball to www.vim.org'
-  task :vim => [:check_bundler, :vimball] do
+  task :vim => :vimball do
     prepare_release_notes
     sh "vendor/vimscriptuploader/vimscriptuploader.rb \
             --id 3025 \

data/doc/command-t.txt

@@ -302,6 +302,17 @@ repository with:
 
   su -c 'yum install vim-command-t'
 
+                                                       *command-t-appstream*
+AppStream Metadata ~
+
+When preparing a Command-T package for distribution on Linux using Gnome
+Software or another AppStream compatible application, there is a metafile in
+appstream directory.
+
+You can find more about AppStream specification at:
+
+  http://www.freedesktop.org/software/appstream/docs/
+
 
 TROUBLE-SHOOTING                                *command-t-trouble-shooting*
 
@@ -311,12 +322,11 @@ linked against at compile time. For example, if one is 32-bit and the other is
 64-bit, or one is from the Ruby 1.9 series and the other is from the 1.8
 series, then the plug-in is not likely to work.
 
-As such, on OS X, I recommend using the standard Ruby that comes with the
-system (currently 1.8.7) along with the latest version of MacVim (currently
-version 7.3). If you wish to use custom builds of Ruby or of MacVim (not
-recommmended) then you will have to take extra care to ensure that the exact
-same Ruby environment is in effect when building Ruby, Vim and the Command-T
-extension.
+On OS X, Apple tends to change the version of Ruby that comes with the system
+with each major release. See |command-t-requirements| above for details about
+specific versions. If you wish to use custom builds of Ruby or of MacVim then
+you will have to take extra care to ensure that the exact same Ruby
+environment is in effect when building Ruby, Vim and the Command-T extension.
 
 For Windows, the following combination is known to work:
 
@@ -342,6 +352,17 @@ flags or architecture flags are different then it is likely that something
 has changed in your Ruby environment and the extension may not work until
 you eliminate the discrepancy.
 
+From inside Vim, you can confirm the version of Ruby that it is using by
+issuing this command:
+
+  :ruby puts "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+
+Finally, beware that if you change your installation method for Command-T (for
+example, switching from one plugin manager to another) you should verify that
+you remove all of the files installed by the previous installation method; if
+you fail to do this, Vim may end up executing the old code, invalidating all
+your attempts to get Vim and Command-T using the same version of Ruby.
+
 
 USAGE                                           *command-t-usage*
 
@@ -573,6 +594,10 @@ Following is a list of all available options:
         work on systems without the tool or with an incompatible version of
         the tool.
 
+      - "git": uses `git ls-files` to quickly produce a list of files; when
+        Git isn't available or the path being searched is not inside a Git
+        repository falls back to "find".
+
       - "watchman": uses Watchman (https://github.com/facebook/watchman) if
         available; otherwise falls back to "find". Note that this scanner is
         intended for use with very large hierarchies (hundreds of thousands of
@@ -581,6 +606,34 @@ Following is a list of all available options:
         Command-T would usually consult, such as 'wildignore' and
         |g:CommandTScanDotDirectories| are ignored.
 
+                                               *g:CommandTTraverseSCM*
+  |g:CommandTTraverseSCM|                        string (default: 'file')
+
+      Instructs Command-T how to chose a root path when opening a file finder
+      without an explicit path argument. Possible values are:
+
+      - "file": starting from the file currently being edited, traverse
+        upwards through the filesystem hierarchy until you find an SCM root
+        (as indicated by the presence of a ".git", ".hg" or similar directory)
+        and use that as the base path. If no such root is found, fallback to
+        using Vim's present working directory as a root. The list of SCM
+        directories that Command-T uses to detect an SCM root can be
+        customized with the |g:CommandTSCMDirectories| option.
+
+      - "dir": traverse upwards looking for an SCM root just like the "file"
+        setting (above), but instead of starting from the file currently being
+        edited, start from Vim's present working directory instead.
+
+      - "pwd": use Vim's present working directory as a root (ie. attempt no
+        traversal).
+
+                                               *g:CommandTSCMDirectories*
+  |g:CommandTSCMDirectories|    string (default: '.git,.hg,.svn,.bzr,_darcs')
+
+      The marker directories that Command-T will use to identify SCM roots
+      during traversal (see |g:CommandTTraverseSCM| above).
+
+
                                                *g:CommandTMinHeight*
   |g:CommandTMinHeight|                          number (default: 0)
 
@@ -712,7 +765,7 @@ Following is a list of all available options:
 
           function! GotoOrOpen(...)
             for file in a:000
-              if bufexists(file)
+              if bufwinnr(file) != -1
                 exec "sb " . file
               else
                 exec "tabe " . file
@@ -724,6 +777,8 @@ Following is a list of all available options:
 
           let g:CommandTAcceptSelectionTabCommand = 'GotoOrOpen'
 
+      For a slightly more comprehensive example, see: https://wt.pe/e
+
                                         *g:CommandTAcceptSelectionSplitCommand*
   |g:CommandTAcceptSelectionSplitCommand| string (default: 'sp')
 
@@ -1020,19 +1075,21 @@ Command-T is written and maintained by Greg Hurrell <greg@hurrell.net>.
 Other contributors that have submitted patches include (in alphabetical
 order):
 
+  Abhinav Gupta           Marian Schubert         Scott Bronson
   Andy Waite              Matthew Todd            Seth Fowler
   Anthony Panozzo         Mike Lundy              Shlomi Fish
   Artem Nezvigin          Nadav Samet             Steven Moazami
-  Daniel Hahler           Nate Kane               Sung Pae
-  Felix Tjandrawibawa     Nicholas Alpi           Thomas Pelletier
-  Gary Bernhardt          Noon Silk               Ton van den Heuvel
-  Ivan Ukhov              Ole Petter Bang         Victor Hugo Borja
-  Jacek Wysocki           Paul Jolly              Vít Ondruch
-  Jeff Kreeftmeijer       Pavel Sergeev           Woody Peterson
-  Kevin Webster           Rainux Luo              Yan Pritzker
-  Lucas de Vries          Roland Puntaier         Yiding Jia
-  Marcus Brito            Ross Lagerwall          Zak Johnson
-  Marian Schubert         Scott Bronson
+  Ben Osheroff            Nate Kane               Sung Pae
+  Daniel Hahler           Nicholas Alpi           Thomas Pelletier
+  David Szotten           Noon Silk               Ton van den Heuvel
+  Felix Tjandrawibawa     Ole Petter Bang         Victor Hugo Borja
+  Gary Bernhardt          Patrick Hayes           Vít Ondruch
+  Ivan Ukhov              Paul Jolly              Woody Peterson
+  Jacek Wysocki           Pavel Sergeev           Yan Pritzker
+  Jeff Kreeftmeijer       Rainux Luo              Yiding Jia
+  Kevin Webster           Richard Feldman         Zak Johnson
+  Lucas de Vries          Roland Puntaier
+  Marcus Brito            Ross Lagerwall
 
 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
@@ -1126,6 +1183,17 @@ POSSIBILITY OF SUCH DAMAGE.
 
 HISTORY                                         *command-t-history*
 
+1.11 (15 August 2014)
+
+- improve edge-case handling in match results window code (patches from
+  Richard Feldman)
+- add "git" file scanner (patch from Patrick Hayes)
+- speed-up when 'wildignore' is unset (patch from Patrick Hayes)
+- add |g:CommandTTraverseSCM| setting which anchors Command-T's file finder to
+  the nearest SCM directory (based on patches from David Szotten and Ben
+  Osheroff)
+- add AppStream metadata (patch from Vít Ondruch)
+
 1.10 (15 July 2014)
 
 - improve tag finder performance by caching tag lists (patch from Artem

data/ruby/command-t/Makefile

@@ -81,7 +81,7 @@ CCDLFLAGS = -fno-common
 CFLAGS   = $(CCDLFLAGS)  -O3 -Wno-error=shorten-64-to-32  -pipe $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     =  -DWATCHMAN_BUILD
-CPPFLAGS = -DHAVE_FCNTL_H -DHAVE_SYS_ERRNO_H -DHAVE_SYS_SOCKET_H -DHAVE_RUBY_ST_H -DHAVE_ST_H -I/Users/glh/.rbenv/versions/2.0.0-p451/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
+CPPFLAGS = -DHAVE_FCNTL_H -DHAVE_STDINT_H -DHAVE_SYS_ERRNO_H -DHAVE_SYS_SOCKET_H -DHAVE_RUBY_ST_H -DHAVE_ST_H -I/Users/glh/.rbenv/versions/2.0.0-p451/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
 CXXFLAGS = $(CCDLFLAGS) $(cxxflags) $(ARCH_FLAG)
 ldflags  = -L. -L/Users/glh/.rbenv/versions/2.0.0-p451/lib 
 dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
@@ -236,27 +236,7 @@ $(DLLIB): $(OBJS) Makefile
 
 
 ###
-# Copyright 2010-2014 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:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
 
 CFLAGS += -Wall -Wextra -Wno-unused-parameter

data/ruby/command-t/controller.rb

@@ -45,7 +45,21 @@ module CommandT
 
     def show_file_finder
       # optional parameter will be desired starting directory, or ""
-      @path             = File.expand_path(::VIM::evaluate('a:arg'), VIM::pwd)
+
+      arg = ::VIM::evaluate('a:arg')
+      if arg && arg.size > 0
+        @path = File.expand_path(arg, VIM::pwd)
+      else
+        traverse = get_string('g:CommandTTraverseSCM') || 'file'
+        case traverse
+        when 'file'
+          @path = nearest_ancestor(VIM::current_file_dir, scm_markers)
+        when 'dir'
+          @path = nearest_ancestor(VIM::pwd, scm_markers)
+        end
+      end
+
+      @path             = VIM::pwd unless @path
       @active_finder    = file_finder
       file_finder.path  = @path
       show
@@ -202,6 +216,13 @@ module CommandT
 
   private
 
+    def scm_markers
+      markers = get_string('g:CommandTSCMDirectories')
+      markers = markers && markers.split(/\s*,\s*/)
+      markers = %w[.git .hg .svn .bzr _darcs] unless markers && markers.length
+      markers
+    end
+
     def list_matches!
       list_matches(:force => true)
     end
@@ -387,11 +408,14 @@ module CommandT
       ::VIM::command 'augroup END'
     end
 
-    # Returns the desired maximum number of matches, based on available
-    # vertical space and the g:CommandTMaxHeight option.
+    # Returns the desired maximum number of matches, based on available vertical
+    # space and the g:CommandTMaxHeight option.
+    #
+    # Note the "available" space is actually a theoretical upper bound; it takes
+    # into account screen dimensions but not things like existing splits which
+    # may reduce the amount of space in practice.
     def match_limit
-      limit = VIM::Screen.lines - 5
-      limit = 1 if limit < 0
+      limit = [1, VIM::Screen.lines - 5].max
       limit = [limit, max_height].min if max_height > 0
       limit
     end

data/ruby/command-t/extconf.rb

@@ -18,6 +18,7 @@ header('string.h')
 
 # optional headers (for CommandT::Watchman::Utils)
 if have_header('fcntl.h') &&
+  have_header('stdint.h') &&
   have_header('sys/errno.h') &&
   have_header('sys/socket.h')
   RbConfig::MAKEFILE_CONFIG['DEFS'] += ' -DWATCHMAN_BUILD'

data/ruby/command-t/finder/file_finder.rb

@@ -6,6 +6,7 @@ require 'command-t/finder'
 require 'command-t/scanner/file_scanner/ruby_file_scanner'
 require 'command-t/scanner/file_scanner/find_file_scanner'
 require 'command-t/scanner/file_scanner/watchman_file_scanner'
+require 'command-t/scanner/file_scanner/git_file_scanner'
 
 module CommandT
   class FileFinder < Finder
@@ -17,6 +18,8 @@ module CommandT
         @scanner = FileScanner::FindFileScanner.new(path, options)
       when 'watchman'
         @scanner = FileScanner::WatchmanFileScanner.new(path, options)
+      when 'git'
+        @scanner = FileScanner::GitFileScanner.new(path, options)
       else
         raise ArgumentError, "unknown scanner type '#{options[:scanner]}'"
       end

data/ruby/command-t/match_window.rb

@@ -35,6 +35,7 @@ module CommandT
       set 'equalalways', false   # don't auto-balance window sizes
       set 'timeoutlen', 0        # respond immediately to mappings
       set 'report', 9999         # don't show "X lines changed" reports
+      set 'scrolloff', 0         # don't scroll near buffer edges
       set 'sidescroll', 0        # don't sidescroll in jumps
       set 'sidescrolloff', 0     # don't sidescroll automatically
       set 'updatetime', options[:debounce_interval]
@@ -106,7 +107,6 @@ module CommandT
       ::VIM::command 'autocmd BufUnload <buffer> silent! ruby $command_t.unload'
 
       @has_focus  = false
-      @selection  = nil
       @abbrev     = ''
       @window     = $curwin
     end
@@ -160,32 +160,17 @@ module CommandT
     end
 
     def select_next
-      if @selection < @matches.length - 1
-        @selection += 1
-        print_match(@selection - 1) # redraw old selection (removes marker)
-        print_match(@selection)     # redraw new selection (adds marker)
-        move_cursor_to_selected_line
-      else
-        # (possibly) loop or scroll
-      end
+      @reverse_list ? _prev : _next
     end
 
     def select_prev
-      if @selection > 0
-        @selection -= 1
-        print_match(@selection + 1) # redraw old selection (removes marker)
-        print_match(@selection)     # redraw new selection (adds marker)
-        move_cursor_to_selected_line
-      else
-        # (possibly) loop or scroll
-      end
+      @reverse_list ? _next : _prev
     end
 
     def matches= matches
-      matches = matches.reverse if @reverse_list
       if matches != @matches
         @matches = matches
-        @selection = @reverse_list ? @matches.length - 1 : 0
+        @selection = 0
         print_matches
         move_cursor_to_selected_line
       end
@@ -209,7 +194,7 @@ module CommandT
       end
     end
 
-    def find char
+    def find(char)
       # is this a new search or the continuation of a previous one?
       now = Time.now
       if @last_key_time.nil? or @last_key_time < (now - 0.5)
@@ -220,10 +205,11 @@ module CommandT
       @last_key_time = now
 
       # see if there's anything up ahead that matches
-      @matches.each_with_index do |match, idx|
+      matches = @reverse_list ? @matches.reverse : @matches
+      matches.each_with_index do |match, idx|
         if match[0, @find_string.length].casecmp(@find_string) == 0
           old_selection = @selection
-          @selection = idx
+          @selection = @reverse_list ? matches.length - idx - 1 : idx
           print_match(old_selection)  # redraw old selection (removes marker)
           print_match(@selection)     # redraw new selection (adds marker)
           break
@@ -242,6 +228,30 @@ module CommandT
 
   private
 
+    def _next
+      if @selection < [@window.height, @matches.length].min - 1
+        @selection += 1
+        print_match(@selection - 1) # redraw old selection (removes marker)
+        print_match(@selection)     # redraw new selection (adds marker)
+        move_cursor_to_selected_line
+      end
+    end
+
+    def _prev
+      if @selection > 0
+        @selection -= 1
+        print_match(@selection + 1) # redraw old selection (removes marker)
+        print_match(@selection)     # redraw new selection (adds marker)
+        move_cursor_to_selected_line
+      end
+    end
+
+    # Translate from a 0-indexed match index to a 1-indexed Vim line number.
+    # Also takes into account reversed listings.
+    def line(match_index)
+      @reverse_list ? @window.height - match_index : match_index + 1
+    end
+
     def set(setting, value)
       @settings ||= Settings.new
       @settings.set(setting, value)
@@ -251,14 +261,14 @@ module CommandT
       # on some non-GUI terminals, the cursor doesn't hide properly
       # so we move the cursor to prevent it from blinking away in the
       # upper-left corner in a distracting fashion
-      @window.cursor = [@selection + 1, 0]
+      @window.cursor = [line(@selection), 0]
     end
 
     def print_error msg
       return unless VIM::Window.select(@window)
       unlock
       clear
-      @window.height = @min_height > 0 ? @min_height : 1
+      @window.height = [1, @min_height].min
       @@buffer[1] = "-- #{msg} --"
       lock
     end
@@ -321,13 +331,17 @@ module CommandT
     end
 
     # Print just the specified match.
-    def print_match idx
+    def print_match(idx)
       return unless VIM::Window.select(@window)
       unlock
-      @@buffer[idx + 1] = match_text_for_idx idx
+      @@buffer[line(idx)] = match_text_for_idx idx
       lock
     end
 
+    def max_lines
+      [1, VIM::Screen.lines - 5].max
+    end
+
     # Print all matches.
     def print_matches
       match_count = @matches.length
@@ -337,19 +351,20 @@ module CommandT
         return unless VIM::Window.select(@window)
         unlock
         clear
-        actual_lines = 1
         @window_width = @window.width # update cached value
-        max_lines = VIM::Screen.lines - 5
-        max_lines = 1 if max_lines < 0
-        actual_lines = match_count < @min_height ? @min_height : match_count
-        actual_lines = max_lines if actual_lines > max_lines
-        @window.height = actual_lines
-        (1..actual_lines).each do |line|
-          idx = line - 1
-          if @@buffer.count >= line
-            @@buffer[line] = match_text_for_idx idx
+        desired_lines = [match_count, @min_height].max
+        desired_lines = [max_lines, desired_lines].min
+        @window.height = desired_lines
+        matches = []
+        (0...@window.height).each do |idx|
+          text = match_text_for_idx(idx)
+          @reverse_list ? matches.unshift(text) : matches.push(text)
+        end
+        matches.each_with_index do |match, idx|
+          if @@buffer.count > idx
+            @@buffer[idx + 1] = match
           else
-            @@buffer.append line - 1, match_text_for_idx(idx)
+            @@buffer.append(idx, match)
           end
         end
         lock

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

@@ -26,10 +26,14 @@ module CommandT
       @base_wild_ignore     = VIM::wild_ignore
     end
 
+    def prepare_paths
+      ensure_cache_under_limit
+      @prefix_len = @path.chomp('/').length
+    end
+
     def paths
       @paths[@path] || begin
-        ensure_cache_under_limit
-        @prefix_len = @path.chomp('/').length
+        prepare_paths
         nil
       end
     end
@@ -49,11 +53,15 @@ module CommandT
       @paths_keys << @path
     end
 
-    def path_excluded?(path)
-      # first strip common prefix (@path) from path to match VIM's behavior
-      path = path[(@prefix_len + 1)..-1]
-      path = VIM::escape_for_single_quotes path
-      ::VIM::evaluate("empty(expand(fnameescape('#{path}')))").to_i == 1
+    def path_excluded?(path, prefix_len = @prefix_len)
+      # if there is no wild_ignore, skip the call to evaluate which can be
+      # expensive for large file lists
+      if @wild_ignore && !@wild_ignore.empty?
+        # first strip common prefix (@path) from path to match VIM's behavior
+        path = path[(prefix_len + 1)..-1]
+        path = VIM::escape_for_single_quotes path
+        ::VIM::evaluate("empty(expand(fnameescape('#{path}')))").to_i == 1
+      end
     end
 
     def set_wild_ignore(ignore)

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

@@ -0,0 +1,41 @@
+# Copyright 2014 Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+require 'command-t/scanner/file_scanner/find_file_scanner'
+
+module CommandT
+  class FileScanner
+    # Uses git ls-files to scan for files
+    class GitFileScanner < FindFileScanner
+      def paths
+        @paths[@path] ||= begin
+          Dir.chdir(@path) do
+            set_wild_ignore(@wild_ignore)
+            prepare_paths
+
+            stdin, stdout, stderr = Open3.popen3(*[
+              'git',
+              'ls-files',
+              '--exclude-standard',
+              @path
+            ])
+
+            all_files = stdout.readlines.
+              map { |path| path.chomp }.
+              reject { |path| path_excluded?(path, 0) }.
+              take(@max_files).
+              to_a
+
+            # will fall back to find if not a git repository or there's an error
+            stderr.gets ? super : all_files
+          end
+        rescue Errno::ENOENT => e
+          # git executable not present and executable
+          super
+        ensure
+          set_wild_ignore(@base_wild_ignore)
+        end
+      end
+    end # class GitFileScanner
+  end # class FileScanner
+end # module CommandT

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

@@ -22,7 +22,7 @@ module CommandT
 
       def paths
         @paths[@path] ||= begin
-          ensure_cache_under_limit
+          prepare_paths
           sockname = Watchman::Utils.load(
             %x{watchman --output-encoding=bser get-sockname}
           )['sockname']

data/ruby/command-t/settings.rb

@@ -11,6 +11,7 @@ module CommandT
       insertmode
       report
       showcmd
+      scrolloff
       sidescroll
       sidescrolloff
       timeout

data/ruby/command-t/vim.rb

@@ -26,6 +26,10 @@ module CommandT
       exists?('&wildignore') && ::VIM::evaluate('&wildignore').to_s
     end
 
+    def self.current_file_dir
+      ::VIM::evaluate 'expand("%:p:h")'
+    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'

data/ruby/command-t/vim/path_utilities.rb

@@ -15,6 +15,19 @@ module CommandT
         pwd = File.expand_path(VIM::pwd) + '/'
         path.index(pwd) == 0 ? path[pwd.length..-1] : path
       end
+
+      def nearest_ancestor(starting_directory, markers)
+        path = File.expand_path(starting_directory)
+        while !markers.
+          map { |dir| File.join(path, dir) }.
+          map { |dir| File.exist?(dir) }.
+          any?
+          return nil if path == '/'
+          path = File.expand_path(File.join(path, '..'))
+        end
+        path
+      end
+
     end # module PathUtilities
   end # module VIM
 end # module CommandT

data/ruby/command-t/watchman.c

@@ -13,6 +13,7 @@
 #error no st.h header found
 #endif
 
+#include <stdint.h>     /* for uint8_t */
 #include <fcntl.h>      /* for fcntl() */
 #include <sys/errno.h>  /* for errno */
 #include <sys/socket.h> /* for recv(), MSG_PEEK */

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command-t
 version: !ruby/object:Gem::Version
-  version: '1.10'
+  version: '1.11'
 platform: ruby
 authors:
 - Greg Hurrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Command-T provides a fast, intuitive mechanism for opening files with a
@@ -48,6 +48,7 @@ files:
 - ruby/command-t/ruby_compat.h
 - ruby/command-t/scanner/buffer_scanner.rb
 - ruby/command-t/scanner/file_scanner/find_file_scanner.rb
+- ruby/command-t/scanner/file_scanner/git_file_scanner.rb
 - ruby/command-t/scanner/file_scanner/ruby_file_scanner.rb
 - ruby/command-t/scanner/file_scanner/watchman_file_scanner.rb
 - ruby/command-t/scanner/file_scanner.rb