command-t 1.11.4 → 1.12

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

@@ -1,15 +1,13 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/ext' # CommandT::Matcher
-require 'command-t/scanner/buffer_scanner'
-require 'command-t/finder'
-
 module CommandT
-  class BufferFinder < Finder
-    def initialize
-      @scanner = BufferScanner.new
-      @matcher = Matcher.new @scanner, :always_show_dot_files => true
-    end
-  end # class BufferFinder
+  class Finder
+    class BufferFinder < Finder
+      def initialize
+        @scanner = Scanner::BufferScanner.new
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
+      end
+    end # class BufferFinder
+  end # class Finder
 end # CommandT

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

@@ -1,34 +1,29 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/ext' # CommandT::Matcher
-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
-    def initialize(path = Dir.pwd, options = {})
-      case options.delete(:scanner)
-      when 'ruby', nil # ruby is the default
-        @scanner = FileScanner::RubyFileScanner.new(path, options)
-      when 'find'
-        @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
+  class Finder
+    class FileFinder < Finder
+      def initialize(path = Dir.pwd, options = {})
+        case options.delete(:scanner)
+        when 'ruby', nil # ruby is the default
+          @scanner = Scanner::FileScanner::RubyFileScanner.new(path, options)
+        when 'find'
+          @scanner = Scanner::FileScanner::FindFileScanner.new(path, options)
+        when 'watchman'
+          @scanner = Scanner::FileScanner::WatchmanFileScanner.new(path, options)
+        when 'git'
+          @scanner = Scanner::FileScanner::GitFileScanner.new(path, options)
+        else
+          raise ArgumentError, "unknown scanner type '#{options[:scanner]}'"
+        end
 
-      @matcher = Matcher.new @scanner, options
-    end
+        @matcher = Matcher.new @scanner, options
+      end
 
-    def flush
-      @scanner.flush
-    end
-  end # class FileFinder
+      def flush
+        @scanner.flush
+      end
+    end # class FileFinder
+  end # class Finder
 end # module CommandT

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

@@ -1,15 +1,13 @@
 # Copyright 2011-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/ext' # CommandT::Matcher
-require 'command-t/scanner/jump_scanner'
-require 'command-t/finder'
-
 module CommandT
-  class JumpFinder < Finder
-    def initialize
-      @scanner = JumpScanner.new
-      @matcher = Matcher.new @scanner, :always_show_dot_files => true
-    end
-  end # class JumpFinder
+  class Finder
+    class JumpFinder < Finder
+      def initialize
+        @scanner = Scanner::JumpScanner.new
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
+      end
+    end # class JumpFinder
+  end # class Finder
 end # module CommandT

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

@@ -1,30 +1,28 @@
 # Copyright 2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/ext' # CommandT::Matcher
-require 'command-t/scanner/mru_buffer_scanner'
-require 'command-t/finder/buffer_finder'
-
 module CommandT
-  class MRUBufferFinder < BufferFinder
-    def initialize
-      @scanner = MRUBufferScanner.new
-      @matcher = Matcher.new @scanner, :always_show_dot_files => true
-    end
+  class Finder
+    class MRUBufferFinder < BufferFinder
+      def initialize
+        @scanner = Scanner::MRUBufferScanner.new
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
+      end
 
-    # Override sorted_matches_for to prevent MRU ordered matches from being
-    # ordered alphabetically.
-    def sorted_matches_for(str, options = {})
-      matches = super(str, options.merge(:sort => false))
+      # Override sorted_matches_for to prevent MRU ordered matches from being
+      # ordered alphabetically.
+      def sorted_matches_for(str, options = {})
+        matches = super(str, options.merge(:sort => false))
 
-      # take current buffer (by definition, the most recently used) and move it
-      # to the end of the results
-      if MRU.last &&
-        relative_path_under_working_directory(MRU.last.name) == matches.first
-        matches[1..-1] + [matches.first]
-      else
-        matches
+        # take current buffer (by definition, the most recently used) and move it
+        # to the end of the results
+        if MRU.last &&
+          relative_path_under_working_directory(MRU.last.name) == matches.first
+          matches[1..-1] + [matches.first]
+        else
+          matches
+        end
       end
-    end
-  end # class MRUBufferFinder
+    end # class MRUBufferFinder
+  end # class Finder
 end # CommandT

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

@@ -1,28 +1,26 @@
 # Copyright 2011-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/ext' # CommandT::Matcher
-require 'command-t/scanner/tag_scanner'
-require 'command-t/finder'
-
 module CommandT
-  class TagFinder < Finder
-    def initialize(options = {})
-      @scanner = TagScanner.new options
-      @matcher = Matcher.new @scanner, :always_show_dot_files => true
-    end
-
-    def open_selection(command, selection, options = {})
-      if @scanner.include_filenames
-        selection = selection[0, selection.index(':')]
+  class Finder
+    class TagFinder < Finder
+      def initialize(options = {})
+        @scanner = Scanner::TagScanner.new options
+        @matcher = Matcher.new @scanner, :always_show_dot_files => true
       end
 
-      #  open the tag and center the screen on it
-      ::VIM::command "silent! tag #{selection} | :normal zz"
-    end
+      def open_selection(command, selection, options = {})
+        if @scanner.include_filenames
+          selection = selection[0, selection.index(':')]
+        end
 
-    def flush
-      @scanner.flush
-    end
-  end # class TagFinder
+        #  open the tag and center the screen on it
+        ::VIM::command "silent! tag #{selection} | :normal zz"
+      end
+
+      def flush
+        @scanner.flush
+      end
+    end # class TagFinder
+  end # class Finder
 end # module CommandT

data/ruby/command-t/match_window.rb

@@ -1,8 +1,7 @@
-# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Copyright 2010-2015 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
 require 'ostruct'
-require 'command-t/settings'
 
 module CommandT
   class MatchWindow
@@ -13,6 +12,8 @@ module CommandT
     MH_END            = '</commandt>'
     @@buffer          = nil
 
+    Highlight = Struct.new(:highlight, :bang)
+
     def initialize(options = {})
       @highlight_color = options[:highlight_color] || 'PmenuSel'
       @min_height      = options[:min_height]
@@ -102,15 +103,21 @@ module CommandT
       # perform cleanup using an autocmd to ensure we don't get caught out
       # by some unexpected means of dismissing or leaving the Command-T window
       # (eg. <C-W q>, <C-W k> etc)
-      ::VIM::command 'autocmd! * <buffer>'
+      ::VIM::command 'augroup CommandTMatchWindow'
+      ::VIM::command 'autocmd!'
       ::VIM::command 'autocmd BufLeave <buffer> silent! ruby $command_t.leave'
       ::VIM::command 'autocmd BufUnload <buffer> silent! ruby $command_t.unload'
+      ::VIM::command 'augroup END'
 
       @has_focus  = false
       @abbrev     = ''
       @window     = $curwin
     end
 
+    def buffer_number
+      @@buffer && @@buffer.number
+    end
+
     def close
       # Unlisted buffers like those provided by Netrw, NERDTree and Vim's help
       # don't actually appear in the buffer list; if they are the only such
@@ -197,7 +204,7 @@ module CommandT
     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)
+      if @last_key_time.nil? || @last_key_time < (now - 0.5)
         @find_string = char
       else
         @find_string += char
@@ -401,21 +408,28 @@ module CommandT
     end
 
     def get_cursor_highlight
-      # there are 3 possible formats to check for, each needing to be
+      # there are 4 possible formats to check for, each needing to be
       # transformed in a certain way in order to reapply the highlight:
       #   Cursor xxx guifg=bg guibg=fg      -> :hi! Cursor guifg=bg guibg=fg
       #   Cursor xxx links to SomethingElse -> :hi! link Cursor SomethingElse
+      #   Cursor xxx [definition]
+      #              links to VisualNOS     -> both of the above
       #   Cursor xxx cleared                -> :hi! clear Cursor
       highlight = VIM::capture 'silent! 0verbose highlight Cursor'
 
-      if highlight =~ /^Cursor\s+xxx\s+links to (\w+)/
-        "link Cursor #{$~[1]}"
-      elsif highlight =~ /^Cursor\s+xxx\s+cleared/
-        'clear Cursor'
-      elsif highlight =~ /Cursor\s+xxx\s+(.+)/
-        "Cursor #{$~[1]}"
+      if highlight =~ /^Cursor\s+xxx\s+(.+)\blinks to (\w+)/m
+        [
+          Highlight.new("Cursor #{$~[1]}"),
+          Highlight.new("link Cursor #{$~[2]}", '!')
+        ]
+      elsif highlight =~ /^Cursor\s+xxx\s+links to (\w+)/m
+        [Highlight.new("link Cursor #{$~[1]}")]
+      elsif highlight =~ /^Cursor\s+xxx\s+cleared/m
+        [Highlight.new('clear Cursor')]
+      elsif highlight =~ /Cursor\s+xxx\s+(.+)/m
+        [Highlight.new("Cursor #{$~[1]}")]
       else # likely cause E411 Cursor highlight group not found
-        nil
+        []
       end
     end
 
@@ -427,7 +441,10 @@ module CommandT
 
     def show_cursor
       if @cursor_highlight
-        ::VIM::command "highlight #{@cursor_highlight}"
+        @cursor_highlight.each do |highlight|
+          config = highlight.highlight.gsub(/\s+/, ' ')
+          ::VIM::command "highlight#{highlight.bang} #{config}"
+        end
       end
     end
 

data/ruby/command-t/path_utilities.rb

@@ -0,0 +1,17 @@
+# Copyright 2010-2014 Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  module PathUtilities
+
+  private
+
+    def relative_path_under_working_directory(path)
+      # any path under the working directory will be specified as a relative
+      # path to improve the readability of the buffer list etc
+      pwd = File.expand_path(VIM::pwd) + '/'
+      path.index(pwd) == 0 ? path[pwd.length..-1] : path
+    end
+
+  end # module PathUtilities
+end # module CommandT

data/ruby/command-t/prompt.rb

@@ -150,7 +150,7 @@ module CommandT
       # prevent the status line from getting inadvertantly cleared
       # after our echo commands
       ::VIM::command 'redraw'
-      while (highlight = args.shift) and  (text = args.shift) do
+      while (highlight = args.shift) && (text = args.shift)
         text = VIM::escape_for_single_quotes text
         ::VIM::command "echohl #{highlight}"
         ::VIM::command "echon '#{text}'"

data/ruby/command-t/scanner.rb

@@ -1,8 +1,12 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/vim'
-
 module CommandT
-  class Scanner; end
+  class Scanner
+    autoload :BufferScanner,    'command-t/scanner/buffer_scanner'
+    autoload :FileScanner,      'command-t/scanner/file_scanner'
+    autoload :JumpScanner,      'command-t/scanner/jump_scanner'
+    autoload :MRUBufferScanner, 'command-t/scanner/mru_buffer_scanner'
+    autoload :TagScanner,       'command-t/scanner/tag_scanner'
+  end # class Scanner
 end # module CommandT

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

@@ -1,21 +1,20 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/vim/path_utilities'
-require 'command-t/scanner'
-
 module CommandT
-  # Returns a list of all open buffers.
-  class BufferScanner < Scanner
-    include VIM::PathUtilities
+  class Scanner
+    # Returns a list of all open buffers.
+    class BufferScanner < Scanner
+      include PathUtilities
 
-    def paths
-      (0..(::VIM::Buffer.count - 1)).map do |n|
-        buffer = ::VIM::Buffer[n]
-        if buffer.name # beware, may be nil
-          relative_path_under_working_directory buffer.name
-        end
-      end.compact
-    end
-  end # class BufferScanner
+      def paths
+        (0..(::VIM::Buffer.count - 1)).map do |n|
+          buffer = ::VIM::Buffer[n]
+          if buffer.name # beware, may be nil
+            relative_path_under_working_directory buffer.name
+          end
+        end.compact
+      end
+    end # class BufferScanner
+  end # class Scanner
 end # module CommandT

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

@@ -1,85 +1,94 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/scanner'
-
 module CommandT
-  # Reads the current directory recursively for the paths to all regular files.
-  #
-  # This is an abstract superclass; the real work is done by subclasses which
-  # obtain file listings via different strategies (for examples, see the
-  # RubyFileScanner and FindFileScanner subclasses).
-  class FileScanner < Scanner
-    class FileLimitExceeded < ::RuntimeError; end
-    attr_accessor :path
+  class Scanner
+    # Reads the current directory recursively for the paths to all regular files.
+    #
+    # This is an abstract superclass; the real work is done by subclasses which
+    # obtain file listings via different strategies (for examples, see the
+    # RubyFileScanner and FindFileScanner subclasses).
+    class FileScanner < Scanner
+      # Errors
+      autoload :FileLimitExceeded,   'command-t/scanner/file_scanner/file_limit_exceeded'
+
+      # Subclasses
+      autoload :FindFileScanner,     'command-t/scanner/file_scanner/find_file_scanner'
+      autoload :GitFileScanner,      'command-t/scanner/file_scanner/git_file_scanner'
+      autoload :RubyFileScanner,     'command-t/scanner/file_scanner/ruby_file_scanner'
+      autoload :WatchmanFileScanner, 'command-t/scanner/file_scanner/watchman_file_scanner'
 
-    def initialize(path = Dir.pwd, options = {})
-      @paths                = {}
-      @paths_keys           = []
-      @path                 = path
-      @max_depth            = options[:max_depth] || 15
-      @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     = wild_ignore
-    end
+      attr_accessor :path
 
-    def paths
-      @paths[@path] ||= begin
-        ensure_cache_under_limit
-        @prefix_len = @path.chomp('/').length + 1
-        set_wild_ignore { paths! }
+      def initialize(path = Dir.pwd, options = {})
+        @paths                = {}
+        @paths_keys           = []
+        @path                 = path
+        @max_depth            = options[:max_depth] || 15
+        @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]
+        @scan_submodules      = options[:git_scan_submodules] || false
+        @base_wild_ignore     = wild_ignore
       end
-    end
 
-    def flush
-      @paths = {}
-    end
+      def paths
+        @paths[@path] ||= begin
+          ensure_cache_under_limit
+          @prefix_len = @path.chomp('/').length + 1
+          set_wild_ignore { paths! }
+        end
+      end
+
+      def flush
+        @paths = {}
+      end
 
-  private
+    private
 
-    def wild_ignore
-      VIM::exists?('&wildignore') && ::VIM::evaluate('&wildignore').to_s
-    end
+      def wild_ignore
+        VIM::exists?('&wildignore') && ::VIM::evaluate('&wildignore').to_s
+      end
 
-    def paths!
-      raise RuntimeError, 'Subclass responsibility'
-    end
+      def paths!
+        raise RuntimeError, 'Subclass responsibility'
+      end
 
-    def ensure_cache_under_limit
-      # Ruby 1.8 doesn't have an ordered hash, so use a separate stack to
-      # track and expire the oldest entry in the cache
-      if @max_caches > 0 && @paths_keys.length >= @max_caches
-        @paths.delete @paths_keys.shift
+      def ensure_cache_under_limit
+        # Ruby 1.8 doesn't have an ordered hash, so use a separate stack to
+        # track and expire the oldest entry in the cache
+        if @max_caches > 0 && @paths_keys.length >= @max_caches
+          @paths.delete @paths_keys.shift
+        end
+        @paths_keys << @path
       end
-      @paths_keys << @path
-    end
 
-    def path_excluded?(path, prefix_len = @prefix_len)
-      if apply_wild_ignore?
-        # first strip common prefix (@path) from path to match VIM's behavior
-        path = path[prefix_len..-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 apply_wild_ignore?
+          # first strip common prefix (@path) from path to match VIM's behavior
+          path = path[prefix_len..-1]
+          path = VIM::escape_for_single_quotes path
+          ::VIM::evaluate("empty(expand(fnameescape('#{path}')))").to_i == 1
+        end
       end
-    end
 
-    def has_custom_wild_ignore?
-      @wild_ignore && !@wild_ignore.empty?
-    end
+      def has_custom_wild_ignore?
+        @wild_ignore && !@wild_ignore.empty?
+      end
 
-    # Used to skip expensive calls to `expand()` when there is no applicable
-    # wildignore.
-    def apply_wild_ignore?
-      has_custom_wild_ignore? || @base_wild_ignore
-    end
+      # Used to skip expensive calls to `expand()` when there is no applicable
+      # wildignore.
+      def apply_wild_ignore?
+        has_custom_wild_ignore? || @base_wild_ignore
+      end
 
-    def set_wild_ignore(&block)
-      ::VIM::command("set wildignore=#{@wild_ignore}") if has_custom_wild_ignore?
-      yield
-    ensure
-      ::VIM::command("set wildignore=#{@base_wild_ignore}") if has_custom_wild_ignore?
-    end
-  end # class FileScanner
+      def set_wild_ignore(&block)
+        ::VIM::command("set wildignore=#{@wild_ignore}") if has_custom_wild_ignore?
+        yield
+      ensure
+        ::VIM::command("set wildignore=#{@base_wild_ignore}") if has_custom_wild_ignore?
+      end
+    end # class FileScanner
+  end # class Scanner
 end # module CommandT