command-t 1.11 → 1.11.1

data/ruby/command-t/extconf.rb

@@ -21,6 +21,7 @@ if have_header('fcntl.h') &&
   have_header('stdint.h') &&
   have_header('sys/errno.h') &&
   have_header('sys/socket.h')
+  RbConfig::MAKEFILE_CONFIG['DEFS'] ||= ''
   RbConfig::MAKEFILE_CONFIG['DEFS'] += ' -DWATCHMAN_BUILD'
 
   have_header('ruby/st.h') # >= 1.9; sets HAVE_RUBY_ST_H

data/ruby/command-t/finder.rb

@@ -13,21 +13,21 @@ module CommandT
   class Finder
     include VIM::PathUtilities
 
-    def initialize path = Dir.pwd, options = {}
+    def initialize(path = Dir.pwd, options = {})
       raise RuntimeError, 'Subclass responsibility'
     end
 
     # Options:
     #   :limit (integer): limit the number of returned matches
-    def sorted_matches_for str, options = {}
+    def sorted_matches_for(str, options = {})
       @matcher.sorted_matches_for str, options
     end
 
-    def open_selection command, selection, options = {}
+    def open_selection(command, selection, options = {})
       ::VIM::command "silent #{command} #{selection}"
     end
 
-    def path= path
+    def path=(path)
       @scanner.path = path
     end
   end # class Finder

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

@@ -7,24 +7,24 @@ 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
+
     # Override sorted_matches_for to prevent MRU ordered matches from being
     # ordered alphabetically.
-    def sorted_matches_for str, options = {}
+    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.stack.last &&
-        relative_path_under_working_directory(MRU.stack.last.name) == matches.first
+      if MRU.last &&
+        relative_path_under_working_directory(MRU.last.name) == matches.first
         matches[1..-1] + [matches.first]
       else
         matches
       end
     end
-
-    def initialize
-      @scanner = MRUBufferScanner.new
-      @matcher = Matcher.new @scanner, :always_show_dot_files => true
-    end
   end # class MRUBufferFinder
 end # CommandT

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

@@ -7,12 +7,12 @@ require 'command-t/finder'
 
 module CommandT
   class TagFinder < Finder
-    def initialize options = {}
+    def initialize(options = {})
       @scanner = TagScanner.new options
       @matcher = Matcher.new @scanner, :always_show_dot_files => true
     end
 
-    def open_selection command, selection, options = {}
+    def open_selection(command, selection, options = {})
       if @scanner.include_filenames
         selection = selection[0, selection.index(':')]
       end

data/ruby/command-t/match.c

@@ -13,7 +13,6 @@ typedef struct {
     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
     int     case_sensitive;         // boolean
@@ -26,12 +25,10 @@ double recursive_match(matchinfo_t *m,    // sharable meta-data
                        long last_idx,     // location of last matched character
                        double score)      // cumulative score so far
 {
+    double score_for_char;
     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
-    long i, j, distance;
     int found;
-    double score_for_char;
+    long i, j, distance;
     long memo_idx = haystack_idx;
 
     // do we have a memoized result we can return?
@@ -47,8 +44,6 @@ double recursive_match(matchinfo_t *m,    // sharable meta-data
 
     for (i = needle_idx; i < m->needle_len; i++) {
         char c = m->needle_p[i];
-        if (c == '.')
-            dot_search = 1;
         found = 0;
 
         // similar to above, we'll stop iterating when we know we're too close
@@ -58,10 +53,12 @@ double recursive_match(matchinfo_t *m,    // sharable meta-data
              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
+                if (j == 0 || m->haystack_p[j - 1] == '/') { // this is a dot-file
+                    int dot_search = (i == 0 && c == '.'); // searching for a dot
+                    if (m->never_show_dot_files || (!dot_search && !m->always_show_dot_files)) {
+                        score = 0.0;
+                        goto memoize;
+                    }
                 }
             } else if (d >= 'A' && d <= 'Z' && !m->case_sensitive) {
                 d += 'a' - 'A'; // add 32 to downcase
@@ -69,7 +66,6 @@ double recursive_match(matchinfo_t *m,    // sharable meta-data
 
             if (c == d) {
                 found = 1;
-                dot_search = 0;
 
                 // calculate score
                 score_for_char = m->max_score_per_char;
@@ -117,12 +113,6 @@ double recursive_match(matchinfo_t *m,    // sharable meta-data
         }
     }
 
-    if (m->dot_file &&
-        (m->never_show_dot_files ||
-         (!dot_file_match && !m->always_show_dot_files))) {
-        score = 0.0;
-        goto memoize;
-    }
     score = score > seen_score ? score : seen_score;
 
 memoize:
@@ -145,7 +135,6 @@ void calculate_match(VALUE 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;
     m.case_sensitive        = case_sensitive;

data/ruby/command-t/match_window.rb

@@ -13,7 +13,7 @@ module CommandT
     MH_END            = '</commandt>'
     @@buffer          = nil
 
-    def initialize options = {}
+    def initialize(options = {})
       @highlight_color = options[:highlight_color] || 'PmenuSel'
       @min_height      = options[:min_height]
       @prompt          = options[:prompt]
@@ -74,13 +74,13 @@ module CommandT
       end
 
       # syntax coloring
-      if VIM::has_syntax?
+      if VIM::has?('syntax')
         ::VIM::command "syntax match CommandTSelection \"^#{SELECTION_MARKER}.\\+$\""
         ::VIM::command 'syntax match CommandTNoEntries "^-- NO MATCHES --$"'
         ::VIM::command 'syntax match CommandTNoEntries "^-- NO SUCH FILE OR DIRECTORY --$"'
         set 'synmaxcol', 9999
 
-        if VIM::has_conceal?
+        if VIM::has?('conceal')
           set 'conceallevel', 2
           set 'concealcursor', 'nvic'
           ::VIM::command 'syntax region CommandTCharMatched ' \
@@ -151,7 +151,7 @@ module CommandT
       show_cursor
     end
 
-    def add! char
+    def add!(char)
       @abbrev += char
     end
 
@@ -167,7 +167,7 @@ module CommandT
       @reverse_list ? _next : _prev
     end
 
-    def matches= matches
+    def matches=(matches)
       if matches != @matches
         @matches = matches
         @selection = 0
@@ -179,7 +179,7 @@ module CommandT
     def focus
       unless @has_focus
         @has_focus = true
-        if VIM::has_syntax?
+        if VIM::has?('syntax')
           ::VIM::command 'highlight link CommandTSelection Search'
         end
       end
@@ -188,7 +188,7 @@ module CommandT
     def unfocus
       if @has_focus
         @has_focus = false
-        if VIM::has_syntax?
+        if VIM::has?('syntax')
           ::VIM::command "highlight link CommandTSelection #{@highlight_color}"
         end
       end
@@ -264,7 +264,7 @@ module CommandT
       @window.cursor = [line(@selection), 0]
     end
 
-    def print_error msg
+    def print_error(msg)
       return unless VIM::Window.select(@window)
       unlock
       clear
@@ -296,13 +296,13 @@ module CommandT
       end
     end
 
-    def match_text_for_idx idx
+    def match_text_for_idx(idx)
       match = truncated_match @matches[idx].to_s
       if idx == @selection
         prefix = SELECTION_MARKER
         suffix = padding_for_selected_match match
       else
-        if VIM::has_syntax? && VIM::has_conceal?
+        if VIM::has?('syntax') && VIM::has?('conceal')
           match = match_with_syntax_highlight match
         end
         prefix = UNSELECTED_MARKER
@@ -318,9 +318,9 @@ module CommandT
     # were used by the matching/scoring algorithm to determine the best score
     # for the match.
     #
-    def match_with_syntax_highlight match
-      highlight_chars = @prompt.abbrev.downcase.chars.to_a
-      match.chars.inject([]) do |output, char|
+    def match_with_syntax_highlight(match)
+      highlight_chars = @prompt.abbrev.downcase.scan(/./mu)
+      match.scan(/./mu).inject([]) do |output, char|
         if char.downcase == highlight_chars.first
           highlight_chars.shift
           output.concat [MH_START, char, MH_END]
@@ -373,7 +373,7 @@ module CommandT
 
     # Prepare padding for match text (trailing spaces) so that selection
     # highlighting extends all the way to the right edge of the window.
-    def padding_for_selected_match str
+    def padding_for_selected_match(str)
       len = str.length
       if len >= @window_width - MARKER_LENGTH
         ''
@@ -384,7 +384,7 @@ module CommandT
 
     # Convert "really/long/path" into "really...path" based on available
     # window width.
-    def truncated_match str
+    def truncated_match(str)
       len = str.length
       available_width = @window_width - MARKER_LENGTH
       return str if len <= available_width

data/ruby/command-t/mru.rb

@@ -10,6 +10,11 @@ module CommandT
         @stack ||= []
       end
 
+      # The (last) most recent buffer in the stack, if any.
+      def last
+        stack.last
+      end
+
       # Mark the current buffer as having been used, effectively moving it to
       # the top of the stack.
       def touch

data/ruby/command-t/prompt.rb

@@ -43,7 +43,7 @@ module CommandT
     end
 
     # Insert a character at (before) the current cursor position.
-    def add! char
+    def add!(char)
       left, cursor, right = abbrev_segments
       @abbrev = left + char + cursor + right
       @col += 1
@@ -97,6 +97,22 @@ module CommandT
       end
     end
 
+    def focus
+      unless @has_focus
+        @has_focus = true
+        redraw
+      end
+    end
+
+    def unfocus
+      if @has_focus
+        @has_focus = false
+        redraw
+      end
+    end
+
+  private
+
     def redraw
       if @has_focus
         prompt_highlight = 'Comment'
@@ -116,22 +132,6 @@ module CommandT
       set_status *components
     end
 
-    def focus
-      unless @has_focus
-        @has_focus = true
-        redraw
-      end
-    end
-
-    def unfocus
-      if @has_focus
-        @has_focus = false
-        redraw
-      end
-    end
-
-  private
-
     # Returns the @abbrev string divided up into three sections, any of
     # which may actually be zero width, depending on the location of the
     # cursor:
@@ -145,7 +145,7 @@ module CommandT
       [left, cursor, right]
     end
 
-    def set_status *args
+    def set_status(*args)
       # see ':help :echo' for why forcing a redraw here helps
       # prevent the status line from getting inadvertantly cleared
       # after our echo commands

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

@@ -1,7 +1,6 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/vim'
 require 'command-t/vim/path_utilities'
 require 'command-t/scanner'
 

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

@@ -1,7 +1,6 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
-require 'command-t/vim'
 require 'command-t/scanner'
 
 module CommandT
@@ -23,18 +22,14 @@ module CommandT
       @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 prepare_paths
-      ensure_cache_under_limit
-      @prefix_len = @path.chomp('/').length
+      @base_wild_ignore     = wild_ignore
     end
 
     def paths
-      @paths[@path] || begin
-        prepare_paths
-        nil
+      @paths[@path] ||= begin
+        ensure_cache_under_limit
+        @prefix_len = @path.chomp('/').length + 1
+        set_wild_ignore { paths! }
       end
     end
 
@@ -44,6 +39,14 @@ module CommandT
 
   private
 
+    def wild_ignore
+      VIM::exists?('&wildignore') && ::VIM::evaluate('&wildignore').to_s
+    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
@@ -54,18 +57,29 @@ module CommandT
     end
 
     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?
+      if apply_wild_ignore?
         # first strip common prefix (@path) from path to match VIM's behavior
-        path = path[(prefix_len + 1)..-1]
+        path = path[prefix_len..-1]
         path = VIM::escape_for_single_quotes path
         ::VIM::evaluate("empty(expand(fnameescape('#{path}')))").to_i == 1
       end
     end
 
-    def set_wild_ignore(ignore)
-      ::VIM::command("set wildignore=#{ignore}") if @wild_ignore
+    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
+
+    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 # module CommandT

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

@@ -2,7 +2,6 @@
 # Licensed under the terms of the BSD 2-clause license.
 
 require 'open3'
-require 'command-t/vim'
 require 'command-t/vim/path_utilities'
 require 'command-t/scanner/file_scanner'
 
@@ -12,45 +11,39 @@ module CommandT
     class FindFileScanner < FileScanner
       include VIM::PathUtilities
 
-      def paths
-        super || begin
-          set_wild_ignore(@wild_ignore)
+      def paths!
+        # temporarily set field separator to NUL byte; this setting is
+        # respected by both `readlines` and `chomp!` below, and makes it easier
+        # to parse the output of `find -print0`
+        separator = $/
+        $/ = "\x00"
 
-          # temporarily set field separator to NUL byte; this setting is
-          # respected by both `readlines` and `chomp!` below, and makes it easier
-          # to parse the output of `find -print0`
-          separator = $/
-          $/ = "\x00"
-
-          unless @scan_dot_directories
-            dot_directory_filter = [
-              '-not', '-path', "#{@path}/.*/*",           # top-level dot dir
-              '-and', '-not', '-path', "#{@path}/*/.*/*"  # lower-level dot dir
-            ]
-          end
+        unless @scan_dot_directories
+          dot_directory_filter = [
+            '-not', '-path', "#{@path}/.*/*",           # top-level dot dir
+            '-and', '-not', '-path', "#{@path}/*/.*/*"  # lower-level dot dir
+          ]
+        end
 
-          Open3.popen3(*([
-            'find', '-L',                 # follow symlinks
-            @path,                        # anchor search here
-            '-maxdepth', @max_depth.to_s, # limit depth of DFS
-            '-type', 'f',                 # only show regular files (not dirs etc)
-            dot_directory_filter,         # possibly skip out dot directories
-            '-print0'                     # NUL-terminate results
-          ].flatten.compact)) do |stdin, stdout, stderr|
-            counter = 1
-            paths = []
-            stdout.readlines.each do |line|
-              next if path_excluded?(line.chomp!)
-              paths << line[@prefix_len + 1..-1]
-              break if (counter += 1) > @max_files
-            end
-            @paths[@path] = paths
+        paths = []
+        Open3.popen3(*([
+          'find', '-L',                 # follow symlinks
+          @path,                        # anchor search here
+          '-maxdepth', @max_depth.to_s, # limit depth of DFS
+          '-type', 'f',                 # only show regular files (not dirs etc)
+          dot_directory_filter,         # possibly skip out dot directories
+          '-print0'                     # NUL-terminate results
+        ].flatten.compact)) do |stdin, stdout, stderr|
+          counter = 1
+          stdout.readlines.each do |line|
+            next if path_excluded?(line.chomp!)
+            paths << line[@prefix_len..-1]
+            break if (counter += 1) > @max_files
           end
-        ensure
-          $/ = separator
-          set_wild_ignore(@base_wild_ignore)
         end
-        @paths[@path]
+        paths
+      ensure
+        $/ = separator
       end
     end # class FindFileScanner
   end # class FileScanner