command-t 1.11 → 1.11.1

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

@@ -7,34 +7,27 @@ 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
+      def paths!
+        Dir.chdir(@path) do
+          stdin, stdout, stderr = Open3.popen3(*[
+            'git',
+            'ls-files',
+            '--exclude-standard',
+            @path
+          ])
 
-            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
 
-            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)
+          # 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
       end
     end # class GitFileScanner
   end # class FileScanner

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

@@ -1,37 +1,32 @@
 # 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/file_scanner'
 
 module CommandT
   class FileScanner
     # Pure Ruby implementation of a file scanner.
     class RubyFileScanner < FileScanner
-      def paths
-        super || begin
-          @paths[@path] = []
-          @depth        = 0
-          @files        = 0
-          set_wild_ignore(@wild_ignore)
-          add_paths_for_directory @path, @paths[@path]
-        rescue FileLimitExceeded
-        ensure
-          set_wild_ignore(@base_wild_ignore)
-        end
-        @paths[@path]
+      def paths!
+        accumulator = []
+        @depth = 0
+        @files = 0
+        add_paths_for_directory(@path, accumulator)
+        accumulator
+      rescue FileLimitExceeded
+        accumulator
       end
 
     private
 
-      def looped_symlink? path
+      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 add_paths_for_directory dir, accumulator
+      def add_paths_for_directory(dir, accumulator)
         Dir.foreach(dir) do |entry|
           next if ['.', '..'].include?(entry)
           path = File.join(dir, entry)
@@ -39,13 +34,13 @@ module CommandT
             if File.file?(path)
               @files += 1
               raise FileLimitExceeded if @files > @max_files
-              accumulator << path[@prefix_len + 1..-1]
+              accumulator << path[@prefix_len..-1]
             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
+              add_paths_for_directory(path, accumulator)
               @depth -= 1
             end
           end

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

@@ -3,7 +3,6 @@
 
 require 'pathname'
 require 'socket'
-require 'command-t/vim'
 require 'command-t/vim/path_utilities'
 require 'command-t/scanner/file_scanner'
 require 'command-t/scanner/file_scanner/find_file_scanner'
@@ -20,43 +19,38 @@ module CommandT
       # requested path.
       class WatchmanUnavailable < RuntimeError; end
 
-      def paths
-        @paths[@path] ||= begin
-          prepare_paths
-          sockname = Watchman::Utils.load(
-            %x{watchman --output-encoding=bser get-sockname}
-          )['sockname']
-          raise WatchmanUnavailable unless $?.exitstatus.zero?
-
-          UNIXSocket.open(sockname) do |socket|
-            root = Pathname.new(@path).realpath.to_s
-            roots = Watchman::Utils.query(['watch-list'], socket)['roots']
-            if !roots.include?(root)
-              # this path isn't being watched yet; try to set up watch
-              result = Watchman::Utils.query(['watch', root], socket)
-
-              # root_restrict_files setting may prevent Watchman from working
-              raise WatchmanUnavailable if result.has_key?('error')
-            end
-
-            query = ['query', root, {
-              'expression' => ['type', 'f'],
-              'fields'     => ['name'],
-            }]
-            paths = Watchman::Utils.query(query, socket)
-
-            # could return error if watch is removed
-            raise WatchmanUnavailable if paths.has_key?('error')
-
-            @paths[@path] = paths['files']
+      def paths!
+        sockname = Watchman::Utils.load(
+          %x{watchman --output-encoding=bser get-sockname}
+        )['sockname']
+        raise WatchmanUnavailable unless $?.exitstatus.zero?
+
+        UNIXSocket.open(sockname) do |socket|
+          root = Pathname.new(@path).realpath.to_s
+          roots = Watchman::Utils.query(['watch-list'], socket)['roots']
+          if !roots.include?(root)
+            # this path isn't being watched yet; try to set up watch
+            result = Watchman::Utils.query(['watch', root], socket)
+
+            # root_restrict_files setting may prevent Watchman from working
+            raise WatchmanUnavailable if result.has_key?('error')
           end
-        end
 
-        @paths[@path]
-      rescue Errno::ENOENT, WatchmanUnavailable
-        # watchman executable not present, or unable to fulfil request
-        super
+          query = ['query', root, {
+            'expression' => ['type', 'f'],
+            'fields'     => ['name'],
+          }]
+          paths = Watchman::Utils.query(query, socket)
+
+          # could return error if watch is removed
+          raise WatchmanUnavailable if paths.has_key?('error')
+
+          paths['files']
+        end
       end
+    rescue Errno::ENOENT, WatchmanUnavailable
+      # watchman executable not present, or unable to fulfil request
+      super
     end # class WatchmanFileScanner
   end # class FileScanner
 end # module CommandT

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

@@ -1,7 +1,6 @@
 # Copyright 2011-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'
 
@@ -23,7 +22,7 @@ module CommandT
 
   private
 
-    def line_contains_filename? line
+    def line_contains_filename?(line)
       line.split.count > 3
     end
 

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

@@ -1,14 +1,13 @@
 # Copyright 2011-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
   class TagScanner < Scanner
     attr_reader :include_filenames
 
-    def initialize options = {}
+    def initialize(options = {})
       @include_filenames = options[:include_filenames] || false
       @cached_tags = nil
     end

data/ruby/command-t/settings.rb

@@ -1,6 +1,8 @@
 # Copyright 2010-2014 Greg Hurrell. All rights reserved.
 # Licensed under the terms of the BSD 2-clause license.
 
+require 'command-t/vim'
+
 module CommandT
   # Convenience class for saving and restoring global settings.
   class Settings
@@ -52,13 +54,13 @@ module CommandT
 
       case value
       when TrueClass, FalseClass
-        @settings.push([setting, get_bool(setting)]) if global?(setting)
+        @settings.push([setting, VIM::get_bool("&#{setting}")]) if global?(setting)
         set_bool setting, value
       when Numeric
-        @settings.push([setting, get_number(setting)]) if global?(setting)
+        @settings.push([setting, VIM::get_number("&#{setting}")]) if global?(setting)
         set_number setting, value
       when String
-        @settings.push([setting, get_string(setting)]) if global?(setting)
+        @settings.push([setting, VIM::get_string("&#{setting}")]) if global?(setting)
         set_string setting, value
       end
     end
@@ -82,18 +84,6 @@ module CommandT
       GLOBAL_SETTINGS.include?(setting)
     end
 
-    def get_bool(setting)
-      ::VIM::evaluate("&#{setting}").to_i == 1
-    end
-
-    def get_number(setting)
-      ::VIM::evaluate("&#{setting}").to_i
-    end
-
-    def get_string(name)
-      ::VIM::evaluate("&#{name}").to_s
-    end
-
     def set_bool(setting, value)
       command = global?(setting) ? 'set' : 'setlocal'
       setting = value ? setting : "no#{setting}"

data/ruby/command-t/stub.rb

@@ -3,9 +3,10 @@
 
 module CommandT
   class Stub
+    @@patch_level = defined?(RUBY_PATCHLEVEL) ? RUBY_PATCHLEVEL : '[unknown]'
     @@load_error = ['command-t.vim could not load the C extension',
                     'Please see INSTALLATION and TROUBLE-SHOOTING in the help',
-                    "Vim Ruby version: #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}",
+                    "Vim Ruby version: #{RUBY_VERSION}-p#{@@patch_level}",
                     'For more information type:    :help command-t']
 
     [
@@ -21,7 +22,7 @@ module CommandT
 
   private
 
-    def warn *msg
+    def warn(*msg)
       ::VIM::command 'echohl WarningMsg'
       msg.each { |m| ::VIM::command "echo '#{m}'" }
       ::VIM::command 'echohl none'

data/ruby/command-t/vim.rb

@@ -6,42 +6,66 @@ require 'command-t/vim/window'
 
 module CommandT
   module VIM
-    def self.has_syntax?
-      ::VIM::evaluate('has("syntax")').to_i != 0
-    end
+    class << self
+      # Check for the existence of a feature such as "conceal" or "syntax".
+      def has?(feature)
+        ::VIM::evaluate(%{has("#{feature}")}).to_i != 0
+      end
 
-    def self.exists? str
-      ::VIM::evaluate(%{exists("#{str}")}).to_i != 0
-    end
+      # Check for the presence of a setting such as:
+      #
+      #   - g:CommandTSmartCase (plug-in setting)
+      #   - &wildignore         (Vim setting)
+      #   - +cursorcolumn       (Vim setting, that works)
+      #
+      def exists?(str)
+        ::VIM::evaluate(%{exists("#{str}")}).to_i != 0
+      end
 
-    def self.has_conceal?
-      ::VIM::evaluate('has("conceal")').to_i != 0
-    end
+      def get_number(name)
+        exists?(name) ? ::VIM::evaluate("#{name}").to_i : nil
+      end
 
-    def self.pwd
-      ::VIM::evaluate 'getcwd()'
-    end
+      def get_bool(name)
+        exists?(name) ? ::VIM::evaluate("#{name}").to_i != 0 : nil
+      end
 
-    def self.wild_ignore
-      exists?('&wildignore') && ::VIM::evaluate('&wildignore').to_s
-    end
+      def get_string(name)
+        exists?(name) ? ::VIM::evaluate("#{name}").to_s : nil
+      end
 
-    def self.current_file_dir
-      ::VIM::evaluate 'expand("%:p:h")'
-    end
+      # expect a string or a list of strings
+      def get_list_or_string(name)
+        return nil unless exists?(name)
+        list_or_string = ::VIM::evaluate("#{name}")
+        if list_or_string.kind_of?(Array)
+          list_or_string.map { |item| item.to_s }
+        else
+          list_or_string.to_s
+        end
+      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'
-      ::VIM::command cmd
-      ::VIM::command 'silent redir END'
-      ::VIM::evaluate 'g:command_t_captured_output'
-    end
+      def pwd
+        ::VIM::evaluate 'getcwd()'
+      end
+
+      def current_file_dir
+        ::VIM::evaluate 'expand("%:p:h")'
+      end
+
+      # Execute cmd, capturing the output into a variable and returning it.
+      def capture(cmd)
+        ::VIM::command 'silent redir => g:command_t_captured_output'
+        ::VIM::command cmd
+        ::VIM::command 'silent redir END'
+        ::VIM::evaluate 'g:command_t_captured_output'
+      end
 
-    # Escape a string for safe inclusion in a Vim single-quoted string
-    # (single quotes escaped by doubling, everything else is literal)
-    def self.escape_for_single_quotes str
-      str.gsub "'", "''"
+      # Escape a string for safe inclusion in a Vim single-quoted string
+      # (single quotes escaped by doubling, everything else is literal)
+      def escape_for_single_quotes(str)
+        str.gsub "'", "''"
+      end
     end
   end # module VIM
 end # module CommandT

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

@@ -9,7 +9,7 @@ module CommandT
 
     private
 
-      def relative_path_under_working_directory path
+      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) + '/'

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

@@ -4,8 +4,10 @@
 module CommandT
   module VIM
     module Screen
-      def self.lines
-        ::VIM::evaluate('&lines').to_i
+      class << self
+        def lines
+          ::VIM::evaluate('&lines').to_i
+        end
       end
     end # module Screen
   end # module VIM

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

@@ -3,16 +3,18 @@
 
 module CommandT
   module VIM
-    class Window
-      def self.select window
-        return true if $curwin == window
-        initial = $curwin
-        while true do
-          ::VIM::command 'wincmd w'           # cycle through windows
-          return true if $curwin == window    # have selected desired window
-          return false if $curwin == initial  # have already looped through all
+    module Window
+      class << self
+        def select(window)
+          return true if $curwin == window
+          initial = $curwin
+          while true do
+            ::VIM::command 'wincmd w'          # cycle through windows
+            return true if $curwin == window   # have selected desired window
+            return false if $curwin == initial # have already looped through all
+          end
         end
       end
-    end # class Window
+    end # module Window
   end # module VIM
 end # module CommandT