ver 2009.10.14 → 2009.11.28

data/lib/ver/methods/shortcuts.rb

@@ -0,0 +1,21 @@
+module VER
+  module Methods
+    module Shortcuts
+      include Move, Save, Open, Views, Insert
+
+      alias q view_close
+      alias q! quit
+      alias w file_save
+      alias r insert_file_contents
+      alias e open_path
+      alias o view_find_or_create
+      alias bn view_focus_next
+      alias bp view_focus_prev
+      alias bd view_close
+
+      def wq
+        w and q
+      end
+    end
+  end
+end

data/lib/ver/methods/views.rb

@@ -1,6 +1,10 @@
 module VER
   module Methods
     module Views
+      def view_find_or_create(file)
+        view.find_or_create(file)
+      end
+
       def view_create
         view.create
       end
@@ -16,6 +20,57 @@ module VER
       def view_focus_prev
         view.focus_prev
       end
+
+      def view_push_up
+        view.push_up
+      end
+
+      def view_push_down
+        view.push_down
+      end
+
+      def view_push_top
+        view.push_top
+      end
+
+      def view_push_bottom
+        view.push_bottom
+      end
+
+      def view_one
+        layout.options.merge! master: 1, stacking: 0
+        layout.apply
+      end
+
+      def view_two
+        layout.options.merge! master: 1, stacking: 1
+        layout.apply
+      end
+
+      def view_slave_inc
+        stacking = layout.options[:stacking]
+        unless stacking >= layout.views.size
+          layout.options[:stacking] += 1
+          layout.apply
+        end
+      end
+
+      def view_slave_dec
+        stacking = layout.options[:stacking]
+        layout.options[:stacking] -= 1 if stacking > 0
+        layout.apply
+      end
+
+      def view_master_inc
+        layout.options[:master] += 1
+        layout.apply
+      end
+
+      def view_master_dec
+        master = layout.options[:master]
+        layout.options[:master] -= 1 if master > 0
+        layout.apply
+      end
     end
   end
-end
+end

data/lib/ver/mode.rb

@@ -10,6 +10,10 @@ module VER
 
     attr_accessor :callback, :name, :arguments
 
+    def inspect
+      "#<Mode #@name>"
+    end
+
     def initialize(name, callback)
       @name, @callback = name, callback
       @stack = []
@@ -28,7 +32,11 @@ module VER
     end
 
     def find_ancestor(name)
-      callback.modes[name.to_sym]
+      if found = callback.modes[name.to_sym]
+        return found
+      else
+        raise "Mode #{name} is not specified yet"
+      end
     end
 
     def ancestors(*done, &block)
@@ -57,12 +65,16 @@ module VER
       total = hash = {}
 
       while key = keychain.shift
-        register key
+        if key.is_a?(Symbol)
+          canonical = callback.modes[key]
+        else
+          canonical = register(key)
+        end
 
         if keychain.empty?
-          hash[key] = block || action_name
+          hash[canonical] = block || action_name
         else
-          hash = hash[key] = {}
+          hash = hash[canonical] = {}
         end
       end
 
@@ -81,7 +93,7 @@ module VER
       @stack << key
 
       ancestors do |ancestor|
-        result = ancestor.attempt_execute(@stack)
+        result = ancestor.attempt_execute(@stack.dup)
 
         case result
         when nil # nothing matched yet, but possible in future
@@ -100,7 +112,7 @@ module VER
       @stack.clear
       enter_missing(key)
     rescue => ex
-      puts ex, *ex.backtrace
+      VER.error(ex)
       @stack.clear
     end
 
@@ -108,7 +120,7 @@ module VER
       execute(@missing, key) if @missing
     end
 
-    def attempt_execute(original_stack)
+    def attempt_execute(original_stack, lookup = false)
       if arguments
         stack, arg = Mode.split_stack(original_stack)
       else
@@ -118,15 +130,44 @@ module VER
       if stack.empty?
         arg ? nil : false
       else
-        executable = stack.inject(@map){|keys, key| keys.fetch(key) }
+        executable = @map
+        while key = stack.shift
+          previous = executable
+          executable = executable[key]
+
+          case executable
+          when nil
+            # FIXME: this allows only one mode
+            if found = previous.find{|prev_key, prev_value| prev_key.is_a?(Mode) }
+              mode, action = found
+              looked = mode.attempt_execute([key, *stack], true)
+
+              case looked
+              when false
+                return false
+              when nil
+                return nil
+              else
+                cmd, cmd_arg = looked
+                return nil if cmd.is_a?(Hash)
+                return execute(action, cmd, arg)
+              end
+            else
+              return false
+            end
+          end
+        end
 
-        execute(executable, *arg)
+        if lookup
+          return executable, arg
+        else
+          execute(executable, *arg)
+        end
       end
-    rescue KeyError
-      false
     end
 
     def execute(executable, *arg)
+      arg = [*arg].compact # doesn't allow nil
       case executable
       when Hash
         return nil
@@ -140,18 +181,23 @@ module VER
         return false
       end
 
+      true
+    rescue ArgumentError => ex
+      callback.message("#{executable} : #{ex}")
       true
     end
 
     def self.split_stack(stack)
-      return stack, nil if stack[0] == '0'
+      first = stack[0]
+      return stack, nil if first == '0' || first == '<KeyPress-0>'
 
-      pivot = stack.index{|c| c !~ /\d/ }
+      pivot = stack.index{|c| c !~ /^(<KeyPress-\d+>|\d+)$/ }
 
       if pivot == 0
         return stack, nil
       elsif pivot
-        return stack[pivot..-1], stack[0..pivot].join.to_i
+        keys, args = stack[pivot..-1], stack[0..pivot]
+        return keys, args.join.scan(/\d+/).join.to_i
       else
         return [], stack.join.to_i
       end

data/lib/ver/status.rb

@@ -4,12 +4,15 @@ module VER
     attr_accessor :keymap, :view
     attr_reader :mode
 
+    HISTORY = Hash.new{|k,v| k[v] = [] }
+
     def initialize(view, options = {})
       options[:style] ||= self.class.obtain_style_name
       super
       self.view = view
+      @question = ''
 
-      keymap_name = VER.options.fetch(:keymap)
+      keymap_name = VER.options.keymap
       self.keymap = Keymap.get(name: keymap_name, receiver: self)
     end
 
@@ -28,40 +31,115 @@ module VER
       view.text
     end
 
-    def ask(question, &callback)
-      @question, @backup_value, @callback = question, value, callback
+    def ask(question, options = {}, &callback)
+      @backup_value, @callback = value, callback
+      @history_idx = -1
 
-      message @question
+      self.question = question
+      submit_when_taken(options[:take])
       focus
     end
 
+    def submit_when_taken(length)
+      return unless length
+      target = value.size + length
+
+      bind '<<Modified>>' do |event|
+        if value.size >= target
+          bind('<<Modified>>'){}
+          ask_submit
+        end
+      end
+    end
+
     def ask_submit
-      answer = value.sub(@question, '')
-      result = @callback.call(answer)
-      message result.inspect
+      answer = value
+      history = HISTORY[@question]
+      history.uniq!
+      history << answer
+      self.question = ''
+
+      case result = @callback.call(answer)
+      when String
+        message result
+      when Symbol
+        result
+      else
+        message result.inspect
+      end
     end
 
     def ask_abort
-      message @backup_value
+      self.question = ''
+      self.value = @backup_value
       text.focus
     end
 
-    def delete_char_left
-      return if @question.size == cursor
-      super
+    def delete(from, to = Tk::None)
+      if from < @question.size
+        from = @question.size
+      end
+
+      super(from, to)
+    end
+
+    def value=(string)
+      super([@question, string].join)
+    end
+
+    def value
+      regex = Regexp.escape(@question)
+      get.sub(/^#{regex}/, '')
+    end
+
+    def question=(string)
+      execute_only(:delete, 0, :end)
+      execute_only(:insert, 0, string)
+      @question = string.to_s
+      Tk::Event.generate(self, '<<Modified>>')
     end
 
-    def go_char_left
-      return if @question.size == cursor
+    def cursor=(pos)
+      return if pos < @question.size
       super
     end
 
-    def go_word_left
-      if index = value.rindex(/.\b\s/, cursor - 1)
-        self.cursor = index
-      else
-        self.cursor = @question.size
+    def history_prev
+      @history_idx -= 1
+      history = HISTORY[@question]
+
+      if @history_idx < 0
+        @history_idx = history.size - 1
+      end
+
+      p prev: [history, @history_idx]
+      answer = history[@history_idx]
+      return unless answer
+      self.value = answer
+    end
+
+    def history_next
+      @history_idx += 1
+      history = HISTORY[@question]
+
+      if @history_idx > history.size
+        @history_idx = 0
       end
+
+      p next: [history, @history_idx]
+      answer = history[@history_idx]
+      return unless answer
+      self.value = answer
+    end
+
+    def history_complete
+      history = HISTORY[@question]
+      so_far = value.sub(@question, '')
+      needle = Regexp.escape(so_far)
+      list = history.grep(/#{needle}/i)
+      return if list.empty?
+
+      self.value = answer
     end
   end
-end
+end

data/lib/ver/syntax.rb

@@ -11,7 +11,7 @@ module VER
       if syntax_name = Detector.detect(filename)
         return new(syntax_name)
       else
-        new 'Plain text'
+        new(VER.options.filetype)
       end
     end
 
@@ -40,7 +40,7 @@ module VER
       @theme  = theme || Theme.find_and_load(VER.options[:theme])
     end
 
-    def highlight(textarea, code, lineno = 0)
+    def highlight(textarea, code, lineno = nil, from = '1.0', to = 'end')
       if @old_theme
         @old_theme.delete_tags_on(textarea)
         @old_theme = nil
@@ -51,12 +51,20 @@ module VER
         @theme.apply_default_on(textarea)
         @first_highlight = false
       else
-        @theme.remove_tags_on(textarea)
+        @theme.remove_tags_on(textarea, from, to)
       end
 
-      pr = Processor.new(textarea, @theme, lineno)
+      pr = Processor.new(textarea, @theme, lineno || 0)
 
-      parser.parse(code, pr)
+      if lineno
+        pr.start_parsing(parser.scopeName)
+        stack = [[parser, nil]]
+        parser.parse_line(stack, code, pr)
+        pr.end_parsing(parser.scopeName)
+      else
+        @theme.remove_tags_on(textarea, from, to)
+        parser.parse(code, pr)
+      end
     end
 
     def theme=(theme)
@@ -65,4 +73,4 @@ module VER
       @first_highlight = true
     end
   end
-end
+end

data/lib/ver/syntax/detector.rb

@@ -22,8 +22,6 @@ module VER
         path = Pathname(filename.to_s)
         path = path.readlink if path.symlink?
 
-        return unless path.file?
-
         VER.load('detect')
 
         override_name || detect_ext(path) || detect_head(path)
@@ -33,11 +31,23 @@ module VER
         basename = path.basename.to_s
         return unless basename =~ /\./
 
-        EXTS_LIST.find do |name, exts|
+        scores = {}
+
+        EXTS_LIST.each do |name, exts|
+          lowest = nil
           exts.find do |ext|
-            return name if basename.end_with?(ext)
+            if basename.end_with?(ext)
+              distance = Levenshtein.distance(basename, ext)
+              lowest ||= distance
+              lowest = distance if lowest > distance
+            end
+            # return name if basename.end_with?(ext)
           end
+          scores[name] = lowest if lowest
         end
+
+        found = scores.sort_by{|k,v| v }.first
+        return found.first if found
       end
 
       def detect_head(path)
@@ -47,7 +57,8 @@ module VER
         HEAD_LIST.find do |name, head|
           return name if line =~ head
         end
+      rescue Errno::ENOENT
       end
     end
   end
-end
+end