command-t 3.0.2 → 4.0

data/ruby/command-t/metadata/fallback.rb

@@ -8,5 +8,5 @@ module CommandT
     EXPECTED_RUBY_VERSION = '[unknown]'
     EXPECTED_RUBY_PATCHLEVEL = '[unknown]'
     UNKNOWN = true
-  end # module Metadata
-end # module CommandT
+  end
+end

data/ruby/command-t/mru.rb

@@ -39,5 +39,5 @@ module CommandT
         stack.include?(buffer)
       end
     end
-  end # module MRU
-end # module CommandT
+  end
+end

data/ruby/command-t/path_utilities.rb

@@ -13,5 +13,5 @@ module CommandT
       path.index(pwd) == 0 ? path[pwd.length..-1] : path
     end
 
-  end # module PathUtilities
-end # module CommandT
+  end
+end

data/ruby/command-t/progress_reporter.rb

@@ -0,0 +1,38 @@
+# Copyright 2010-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  # Simple class for displaying scan progress to the user.
+  #
+  # The active scanner calls the `#update` method with a `count` to inform it of
+  # progress, the reporter updates the UI and then returns a suggested count at
+  # which to invoke `#update` again in the future (the suggested count is based
+  # on a heuristic that seeks to update the UI about 5 times per second).
+  class ProgressReporter
+    SPINNER = %w[^ > v <]
+
+    def initialize
+      @spinner ||= SPINNER.first
+    end
+
+    def update(count)
+      @spinner = SPINNER[(SPINNER.index(@spinner) + 1) % SPINNER.length]
+
+      ::VIM::command "echon '#{@spinner}  #{count}'"
+      ::VIM::command 'redraw'
+
+      # Aim for 5 updates per second.
+      now = Time.now.to_f
+      if @last_time
+        time_diff = now - @last_time
+        count_diff = count - @last_count
+        next_count = count + ((0.2 / time_diff) * count_diff).to_i
+      else
+        next_count = count + 100
+      end
+      @last_time = now
+      @last_count = count
+      next_count
+    end
+  end
+end

data/ruby/command-t/prompt.rb

@@ -112,8 +112,6 @@ module CommandT
       end
     end
 
-  private
-
     def redraw
       if @has_focus
         prompt_highlight = 'Comment'
@@ -133,6 +131,8 @@ module CommandT
       set_status *components
     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:
@@ -158,5 +158,5 @@ module CommandT
       end
       ::VIM::command 'echohl None'
     end
-  end # class Prompt
-end # module CommandT
+  end
+end

data/ruby/command-t/scanner.rb

@@ -4,9 +4,29 @@
 module CommandT
   class Scanner
     autoload :BufferScanner,    'command-t/scanner/buffer_scanner'
+    autoload :CommandScanner,   'command-t/scanner/command_scanner'
     autoload :FileScanner,      'command-t/scanner/file_scanner'
+    autoload :HelpScanner,      'command-t/scanner/help_scanner'
+    autoload :HistoryScanner,   'command-t/scanner/history_scanner'
     autoload :JumpScanner,      'command-t/scanner/jump_scanner'
+    autoload :LineScanner,      'command-t/scanner/line_scanner'
     autoload :MRUBufferScanner, 'command-t/scanner/mru_buffer_scanner'
     autoload :TagScanner,       'command-t/scanner/tag_scanner'
-  end # class Scanner
-end # module CommandT
+
+    # Subclasses implement this method to return the list of paths that should
+    # be searched.
+    #
+    # Note that as an optimization, the C extension will record the
+    # `Object#object_id` of the returned array and assumes it will not be
+    # mutated.
+    def paths
+      raise RuntimeError, 'Subclass responsibility'
+    end
+
+  private
+
+    def progress_reporter
+      @progress_reporter ||= ProgressReporter.new
+    end
+  end
+end

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

@@ -15,6 +15,6 @@ module CommandT
           end
         end.compact
       end
-    end # class BufferScanner
-  end # class Scanner
-end # module CommandT
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Scanner
+    class CommandScanner < Scanner
+      def paths
+        @paths ||= paths!
+      end
+
+    private
+
+      def paths!
+        # Get user commands.
+        commands = VIM.capture('silent command').split("\n")[2..-1].map do |line|
+          line.sub(/\A.{4}(\S+).+/, '\1')
+        end
+
+        # Get built-in commands from `ex-cmd-index`.
+        ex_cmd_index = ::VIM.evaluate('expand(findfile("doc/index.txt", &runtimepath))')
+        if File.readable?(ex_cmd_index)
+          File.readlines(ex_cmd_index).each do |line|
+            if line =~ %r{\A\|:([^|]+)\|\s+}
+              commands << $~[1]
+            end
+          end
+        end
+
+        commands.uniq
+      end
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module CommandT
         @paths_keys           = []
         @path                 = path
         @max_depth            = options[:max_depth] || 15
-        @max_files            = options[:max_files] || 30_000
+        @max_files            = options[:max_files] || 100_000
         @max_caches           = options[:max_caches] || 1
         @scan_dot_directories = options[:scan_dot_directories] || false
         @wild_ignore          = options[:wild_ignore]
@@ -44,6 +44,26 @@ module CommandT
 
     private
 
+      def show_max_files_warning
+        unless VIM::get_bool('g:CommandTSuppressMaxFilesWarning', false)
+          ::VIM::command('redraw!')
+          ::VIM::command('echohl ErrorMsg')
+          warning =
+            "Warning: maximum file limit reached\n" +
+            "\n" +
+            "Increase it by setting a higher value in $MYVIMRC; eg:\n" +
+            "  let g:CommandTMaxFiles=#{@max_files * 2}\n" +
+            "Or suppress this warning by setting:\n" +
+            "  let g:CommandTSuppressMaxFilesWarning=1\n" +
+            "For best performance, consider using a fast scanner; see:\n" +
+            "  :help g:CommandTFileScanner\n" +
+            "\n" +
+            "Press ENTER to continue."
+          ::VIM::evaluate(%{input("#{warning}")})
+          ::VIM::command('echohl None')
+        end
+      end
+
       def wild_ignore
         VIM::exists?('&wildignore') && ::VIM::evaluate('&wildignore').to_s
       end
@@ -71,13 +91,17 @@ module CommandT
       end
 
       def has_custom_wild_ignore?
-        @wild_ignore && !@wild_ignore.empty?
+        !!@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
+        if has_custom_wild_ignore?
+          !@wild_ignore.empty?
+        else
+          !!@base_wild_ignore
+        end
       end
 
       def set_wild_ignore(&block)
@@ -86,6 +110,6 @@ module CommandT
       ensure
         ::VIM::command("set wildignore=#{@base_wild_ignore}") if has_custom_wild_ignore?
       end
-    end # class FileScanner
-  end # class Scanner
-end # module CommandT
+    end
+  end
+end

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

@@ -12,7 +12,7 @@ module CommandT
 
         def paths!
           # temporarily set field separator to NUL byte; this setting is
-          # respected by both `readlines` and `chomp!` below, and makes it easier
+          # respected by both `each_line` and `chomp!` below, and makes it easier
           # to parse the output of `find -print0`
           separator = $/
           $/ = "\x00"
@@ -34,17 +34,22 @@ module CommandT
             '-print0'                     # NUL-terminate results
           ].flatten.compact)) do |stdin, stdout, stderr|
             counter = 1
-            stdout.readlines.each do |line|
+            next_progress = progress_reporter.update(counter)
+            stdout.each_line do |line|
               next if path_excluded?(line.chomp!)
               paths << line[@prefix_len..-1]
-              break if (counter += 1) > @max_files
+              next_progress = progress_reporter.update(counter) if counter == next_progress
+              if (counter += 1) > @max_files
+                show_max_files_warning
+                break
+              end
             end
           end
           paths
         ensure
           $/ = separator
         end
-      end # class FindFileScanner
-    end # class FileScanner
-  end # class Scanner
-end # module CommandT
+      end
+    end
+  end
+end

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

@@ -26,11 +26,14 @@ module CommandT
               end
             end
 
-            all_files.
+            filtered = all_files.
               map { |path| path.chomp }.
-              reject { |path| path_excluded?(path, 0) }.
-              take(@max_files).
-              to_a
+              reject { |path| path_excluded?(path, 0) }
+            truncated = filtered.take(@max_files)
+            if truncated.count < filtered.count
+              show_max_files_warning
+            end
+            truncated.to_a
           end
         rescue LsFilesError
           super
@@ -48,7 +51,7 @@ module CommandT
           raise LsFilesError if stderr && stderr.gets
         end
 
-      end # class GitFileScanner
-    end # class FileScanner
-  end # class Scanner
-end # module CommandT
+      end
+    end
+  end
+end

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

@@ -12,9 +12,11 @@ module CommandT
           accumulator = []
           @depth = 0
           @files = 0
+          @next_progress = progress_reporter.update(@files)
           add_paths_for_directory(@path, accumulator)
           accumulator
         rescue FileLimitExceeded
+          show_max_files_warning
           accumulator
         end
 
@@ -34,6 +36,7 @@ module CommandT
             unless path_excluded?(path)
               if File.file?(path)
                 @files += 1
+                @next_progress = progress_reporter.update(@files) if @files == @next_progress
                 raise FileLimitExceeded if @files > @max_files
                 accumulator << path[@prefix_len..-1]
               elsif File.directory?(path)
@@ -51,7 +54,7 @@ module CommandT
         rescue ArgumentError
           # skip over bad file names
         end
-      end # class RubyFileScanner
-    end # class FileScanner
-  end # class Scanner
-end # module CommandT
+      end
+    end
+  end
+end

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

@@ -42,7 +42,15 @@ module CommandT
             paths = Watchman::Utils.query(query, socket)
 
             # could return error if watch is removed
-            extract_value(paths, 'files')
+            extracted = extract_value(paths, 'files')
+            if (
+              apply_wild_ignore? &&
+              (regex = VIM::wildignore_to_regexp(@wild_ignore || @base_wild_ignore))
+            )
+              extracted.select { |path| path !~ regex }
+            else
+              extracted
+            end
           end
         rescue Errno::ENOENT, WatchmanError
           # watchman executable not present, or unable to fulfil request
@@ -61,7 +69,7 @@ module CommandT
           raise WatchmanError, 'get-sockname failed' if !$?.exitstatus.zero?
           raw_sockname
         end
-      end # class WatchmanFileScanner
-    end # class FileScanner
-  end # class Scanner
-end # module CommandT
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Scanner
+    class HelpScanner < Scanner
+      def paths
+        @cached_tags ||= paths!
+      end
+
+      def flush
+        @cached_tags = nil
+      end
+
+    private
+
+      def paths!
+        # Vim doesn't provide an easy way to get a list of all help tags.
+        # `tagfiles()` only shows the tagfiles for the current buffer, so you
+        # need to already be in a buffer of `'buftype'` `help` for that to work.
+        # Likewise, `taglist()` only shows tags that apply to the current file
+        # type, and `:tag` has the same restriction.
+        #
+        # So, we look for a "doc/tags" file at every location in the
+        # `'runtimepath'` and try to manually parse it.
+        tags = []
+
+        ::VIM::evaluate('findfile("doc/tags", &runtimepath, -1)').each do |path|
+          if File.readable?(path)
+            File.readlines(path).each do |tag|
+              tags << tag.split.first if tag.split.first
+            end
+          end
+        end
+
+        tags
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Scanner
+    class HistoryScanner < Scanner
+      def initialize(history_command)
+        @history_command = history_command
+      end
+
+      def paths
+        @paths ||= paths!
+      end
+
+    private
+
+      def paths!
+        VIM.capture(@history_command).split("\n")[2..-1].map do |line|
+          line.sub(/\A>?\s*\d+\s*(.+)/, '\1').strip
+        end.uniq
+      end
+    end
+  end
+end

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

@@ -27,6 +27,6 @@ module CommandT
       def jumps
         VIM::capture 'silent jumps'
       end
-    end # class JumpScanner
-  end # class Scanner
-end # module CommandT
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+# Copyright 2011-present Greg Hurrell. All rights reserved.
+# Licensed under the terms of the BSD 2-clause license.
+
+module CommandT
+  class Scanner
+    class LineScanner < Scanner
+      def paths
+        @lines ||= paths!
+      end
+
+    private
+
+      def paths!
+        # $curbuf is the Command-T match listing; we actually want the last
+        # buffer, but passing `$`, `#`, `%` etc to `bufnr()` returns the wrong
+        # value.
+        number = ::VIM.evaluate("g:CommandTCurrentBuffer").to_i
+        return [] unless number > 0
+        buffer = nil
+        (0...(::VIM::Buffer.count)).each do |n|
+          buffer = ::VIM::Buffer[n]
+          if buffer_number(buffer) == number
+            break
+          else
+            buffer = nil
+          end
+        end
+        return [] unless buffer
+
+        (1..(buffer.length)).map do |n|
+          line = buffer[n]
+          unless line.match(/\A\s*\z/)
+            line.sub(/\A\s*/, '') + ':' + n.to_s
+          end
+        end.compact
+      end
+
+      def buffer_number(buffer)
+        buffer && buffer.number
+      rescue Vim::DeletedBufferError
+        # Beware of people manually deleting Command-T's hidden, unlisted buffer.
+      end
+    end
+  end
+end