ver 2009.11.29 → 2009.12.14

data/config/rc.rb

@@ -1,10 +1,28 @@
 VER.options.dsl do
-  o "Default Font for all widgets",
-    :font, "TkFixedFont 10"
+  o "Use automatic indentation",
+    :autoindent, true
+
+  o "Sequence to comment a line, may change through file type preferences",
+    :comment_line, '#'
+
+  o "Start and end sequence to comment a region, may change through file type preferences",
+    :comment_region, ['=begin', '=end']
 
   o "Internal:External encoding",
     :encoding, "UTF-8:UTF-8"
 
+  o "Expand all tabs into spaces",
+    :expandtab, true
+
+  o "In case of a total failure, this key binding should bail you out",
+    :emergency_exit, "<Control-q>"
+
+  o "Default Font for all widgets",
+    :font, "TkFixedFont 10"
+
+  o "Fork off on startup to avoid dying with the terminal",
+    :fork, true
+
   o "Tk Tile Theme",
     :tk_theme, 'clam'
 
@@ -14,12 +32,6 @@ VER.options.dsl do
   o "Keymap used",
     :keymap, 'vim'
 
-  o "Expand all tabs into spaces",
-    :expandtab, true
-
-  o "Use automatic indentation",
-    :autoindent, true
-
   o "Number of spaces used in autoindent",
     :shiftwidth, 2
 
@@ -29,11 +41,14 @@ VER.options.dsl do
   o "Number of characters after which wrap commands will wrap",
     :textwidth, 80
 
-  o "In case of a total failure, this key binding should bail you out",
-    :emergency_exit, "<Control-q>"
+  o "Minimum size of search term to start incremental highlighting",
+    :search_incremental_min, 1
 
-  o "Fork off on startup to avoid dying with the terminal",
-    :fork, true
+  o "Show vertical scrollbar",
+    :vertical_scrollbar, false
+
+  o "Show horizontal scrollbar",
+    :horizontal_scrollbar, false
 
   o "Milliseconds that the cursor is visible when blinking",
     :insertontime, 500
@@ -41,8 +56,8 @@ VER.options.dsl do
   o "Milliseconds that the cursor is invisible when blinking",
     :insertofftime, 0
 
-  o "Width of one tab in pixel",
-    :tabs, 10
+  o "Format for Statusline",
+    :statusline, '%r\t%4l,%c %P\t[%m%_s%_e]'
 
   o "Default filetype if no matching syntax can be found",
     :filetype, "Plain Text"

data/config/syntax/Nemerle.json

@@ -2,8 +2,8 @@
   "fileTypes": [
     "n"
   ],
-  "foldingStartMarker": "(\\{|(|<\\[)",
-  "foldingStopMarker": "(\\}|)|]>)",
+  "foldingStartMarker": "(\\{|\\(|<\\[)",
+  "foldingStopMarker": "(\\}|\\)|\\]>)",
   "keyEquivalent": "^~N",
   "name": "Nemerle",
   "patterns": [
@@ -125,4 +125,4 @@
   ],
   "scopeName": "source.nemerle",
   "uuid": "F563968D-4CB3-11DB-9F95-00112474B8F0"
-}
+}

data/lib/ver.rb

@@ -1,5 +1,5 @@
-# Well begun is half done.
-#             -- Aristotle
+# Man must shape his tools lest they shape him.
+#               -- Arthur R. Miller
 
 # lazy stdlib
 autoload :Benchmark, 'benchmark'
@@ -14,6 +14,9 @@ require 'json'
 # require 'pp'
 require 'securerandom'
 require 'set'
+require 'pathname'
+
+autoload :SizedArray, 'ver/vendor/sized_array'
 
 module VER
   autoload :Entry,               'ver/entry'
@@ -31,62 +34,35 @@ module VER
   autoload :Levenshtein,         'ver/vendor/levenshtein'
   autoload :Theme,               'ver/theme'
   autoload :View,                'ver/view'
+  autoload :ExceptionView,       'ver/exception_view'
+  autoload :Bookmarks,           'ver/methods/bookmark'
+  autoload :Bookmark,            'ver/methods/bookmark'
+  autoload :Undo,                'ver/undo'
 
   require 'ver/options'
   @options = Options.new(:ver)
 
   class << self
-    attr_reader :root, :layout, :status, :paths, :options
+    attr_reader(:root, :layout, :status, :paths, :options, :bookmarks,
+                :ctag_stack)
   end
 
+  # the rest of the options are in config/rc.rb
   options.dsl do
-    o "Default Font for all widgets",
-      :font, "TkFixedFont 10"
+    o "Fork off on startup to avoid dying with the terminal",
+      :fork, true
 
     o "Internal:External encoding",
       :encoding, "UTF-8:UTF-8"
 
-    o "Tk Tile Theme",
-      :tk_theme, 'clam'
-
-    o "Syntax highlighting theme",
-      :theme, "Blackboard"
-
     o "Keymap used",
       :keymap, 'vim'
 
-    o "Expand all tabs into spaces",
-      :expandtab, true
-
-    o "Use automatic indentation",
-      :autoindent, true
-
-    o "Number of spaces used in autoindent",
-      :shiftwidth, 2
-
-    o "Number of spaces a tab stands for",
-      :tabstop, 8
-
-    o "Number of characters after which wrap commands will wrap",
-      :textwidth, 80
-
-    o "In case of a total failure, this key binding should bail you out",
-      :emergency_exit, "<Control-q>"
-
-    o "Fork off on startup to avoid dying with the terminal",
-      :fork, true
-
-    o "Milliseconds that the cursor is visible when blinking",
-      :insertontime, 500
-
-    o "Milliseconds that the cursor is invisible when blinking",
-      :insertofftime, 0
-
     o "Width of one tab in pixel",
       :tabs, 10
 
-    o "Default filetype if no matching syntax can be found",
-      :filetype, "Plain Text"
+    o "Minimum size of search term to start incremental highlighting",
+      :search_incremental_min, 1
 
     o "Location of personal configuration",
       :home_conf_dir,  Pathname('~/.config/ver').expand_path
@@ -104,39 +80,56 @@ module VER
     options.loadpath
   end
 
-  def run(given_options = {})
-    @options.merge!(given_options)
-
+  def run(given_options = {}, &block)
     setup_tk
+    run_startup(given_options)
 
-    if Tk::RUN_EVENTLOOP_ON_MAIN_THREAD
-      run_aqua
-    else
-      run_x11
+    forking do
+      if Tk::RUN_EVENTLOOP_ON_MAIN_THREAD
+        run_aqua(&block)
+      else
+        run_x11(&block)
+      end
     end
   rescue => exception
     VER.error(exception)
     exit
   end
 
-  def run_aqua
+  def run_aqua(&block)
     run_core
-    EM.run{ Tk.mainloop }
+    EM.defer(&block) if block
+    Tk.mainloop
+  end
+
+  def run_x11(&block)
+    EM.defer do
+      run_core
+      EM.defer(&block) if block
+      Tk.mainloop
+    end
   end
 
-  def run_x11
-    EM.run do
-      EM.defer do
-        run_core
-        Tk.mainloop
+  def forking
+    if options.fork
+      fork do
+        trap(:HUP){ 'terminal disconnected' }
+        EM.run{ yield }
       end
+    else
+      EM.run{ yield }
     end
   end
 
-  def run_core
+  def run_startup(given_options)
     first_startup unless options.home_conf_dir.directory?
     load 'rc'
+    @options.merge!(given_options)
+  end
+
+  def run_core
     sanitize_options
+    # dump_options
     setup_widgets
     open_argv || open_welcome
     emergency_bindings
@@ -151,13 +144,20 @@ module VER
     Tk::Tile.set_theme options.tk_theme
 
     @paths = Set.new
+
     @root = Tk.root
     @root.wm_geometry = '160x80'
+
     @layout = Layout.new(@root)
     @layout.strategy = Layout::VerticalTiling
+
     @status = Entry.new(@root, font: options.font)
     @status.insert :end, 'For information about VER, type F1'
     @status.pack(fill: :x)
+
+    @exception_view = nil
+    @bookmarks = Bookmarks.new
+    @ctag_stack = []
   end
 
   def sanitize_options
@@ -268,9 +268,30 @@ module VER
     @paths << text.filename
   end
 
+  def dump_options
+    out = []
+
+    options.each_pair do |key, value|
+      out << [key,
+        case value
+        when Tk::Font
+          "VER::Font[%p]" % [value.actual_hash]
+        when Pathname
+          value.to_s
+        else
+          value
+        end
+        ]
+    end
+
+    out.each do |pair|
+      puts("VER.options.%s = %p" % pair)
+    end
+  end
+
   def error(exception)
     @status.value = exception.message if @status
-    error_tree(exception) if @root
+    exception_view(exception) if @root
     $stderr.puts("#{exception.class}: #{exception}", *exception.backtrace)
   rescue Errno::EIO
     # The original terminal has disappeared, the $stderr pipe was closed on the
@@ -281,87 +302,20 @@ module VER
     # in a nicer way, maybe let it bubble up to Tk handling.
   end
 
-  def error_tree(exception)
-    @tree ||= Tk::Tile::Treeview.new(@root)
-    @tree.clear
-
-    @tree.configure(
-      columns:        %w[line method],
-      displaycolumns: %w[line method]
-    )
-    @tree.heading('#0',     text: 'File')
-    @tree.heading('line',   text: 'Line')
-    @tree.heading('method', text: 'Method')
-    @tree.tag_configure('error', background: '#f88')
-    @tree.tag_configure('backtrace', background: '#8f8')
-
-    context_size = 7
-    frames = {}
-    error_tags = ['error']
-    backtrace_tags = ['backtrace']
-
-    # from Rack::ShowExceptions
-    exception.backtrace.each do |line|
-      next unless line =~ /(.*?):(\d+)(:in `(.*)')?/
-      filename, lineno, function = $1, $2.to_i, $4
-
-      item = @tree.insert(nil, :end,
-        text: filename, values: [lineno, function], tags: error_tags)
+  def exception_view(exception)
+    unless @exception_view
+      @exception_view ||= ExceptionView.new(@root)
 
-      begin
-        lines = ::File.readlines(filename)
-        _lineno = lineno - 1
-
-        first_lineno = [_lineno - context_size, 0].max
-        last_lineno  = [_lineno + context_size, lines.size].min
-        context = lines[first_lineno..last_lineno]
-
-        frames[item.id] = {
-          filename: filename,
-          lineno: lineno,
-          function: function,
-          first_lineno: first_lineno,
-          last_lineno: last_lineno,
-          context: context,
-        }
-      rescue => ex
-        puts ex, ex.backtrace
+      @exception_view.bind '<<TreeviewOpen>>' do
+        @exception_view.on_treeview_open
       end
-    end
-
-    @tree.focus
-    @tree.pack expand: true, fill: :both
 
-    @tree.bind('<<TreeviewOpen>>'){|event|
-      begin
-        item = @tree.focus_item
-        frame = frames[item.id]
-
-        case frame
-        when Hash
-          filename, lineno, first_lineno, context =
-            frame.values_at(:filename, :lineno, :first_lineno, :context)
-
-          context.each_with_index{|line, idx|
-            line_lineno = first_lineno + idx + 1
-            tags = line_lineno == lineno ? error_tags : backtrace_tags
-            line_item = item.insert(:end,
-              text: line, values: [line_lineno], tags: tags)
-            frames[line_item.id] = [filename, lineno]
-          }
-        when Array
-          filename, lineno = frame
-          @layout.views.first.find_or_create(filename, lineno){|view|
-            @tree.pack_forget
-          }
-        end
-      rescue => ex
-        puts ex, ex.backtrace
+      @exception_view.bind '<Escape>' do
+        @exception_view.pack_forget
+        @layout.views.first.focus
       end
-    }
-    @tree.bind('<Escape>'){
-      @tree.pack_forget
-      @layout.views.first.focus
-    }
+    end
+
+    @exception_view.show(exception)
   end
 end

data/lib/ver/entry.rb

@@ -53,6 +53,7 @@ module VER
       Tk::Event.generate(self, '<<Deleted>>')
       Tk::Event.generate(self, '<<Modified>>')
     end
+    alias kill delete # nobody wants to copy that way, right? ;)
 
     def insert(*args)
       super
@@ -198,6 +199,10 @@ module VER
       delete(*virtual_movement(motion, count))
     end
 
+    def kill_motion(motion, count = 1)
+      kill(*virtual_movement(motion, count))
+    end
+
     private
 
     def virtual_movement(name, count = 1)

data/lib/ver/exception_view.rb

@@ -0,0 +1,97 @@
+module VER
+  class ExceptionView < Tk::Tile::Treeview
+    OPTIONS = {
+      context: 7,
+    }
+
+    attr_reader :tree, :frames, :context_size, :error_tags, :backtrace_tags
+
+    def initialize(parent, options = {})
+      super
+
+      @frames = {}
+      @context_size = OPTIONS[:context]
+      @error_tags = ['error']
+      @backtrace_tags = ['backtrace']
+
+      setup_config
+    end
+
+    def setup_config
+      configure(
+        columns:        %w[line method],
+        displaycolumns: %w[line method]
+      )
+
+      heading('#0',     text: 'File')
+      heading('line',   text: 'Line')
+      heading('method', text: 'Method')
+
+      tag_configure('error', background: '#f88')
+      tag_configure('backtrace', background: '#8f8')
+    end
+
+    def on_treeview_open
+      item = focus_item
+      frame = frames[item.id]
+
+      case frame
+      when Hash
+        filename, lineno, first_lineno, context =
+          frame.values_at(:filename, :lineno, :first_lineno, :context)
+
+        context.each_with_index{|line, idx|
+          line_lineno = first_lineno + idx + 1
+          tags = line_lineno == lineno ? error_tags : backtrace_tags
+          line_item = item.insert(:end,
+            text: line, values: [line_lineno], tags: tags)
+          frames[line_item.id] = [filename, lineno]
+        }
+      when Array
+        filename, lineno = frame
+        VER.layout.views.first.find_or_create(filename, lineno){|view|
+          pack_forget
+        }
+      end
+    rescue => ex # careful here, don't want infinite loop
+      puts ex, ex.backtrace
+    end
+
+    def show(exception)
+      clear
+
+      # from Rack::ShowExceptions
+      exception.backtrace.each do |line|
+        next unless line =~ /(.*?):(\d+)(:in `(.*)')?/
+        show_line($1, $2.to_i, $4)
+      end
+
+      focus
+      pack expand: true, fill: :both
+    end
+
+    def show_line(filename, lineno, function)
+      item = insert(nil, :end,
+        text: filename, values: [lineno, function], tags: error_tags)
+
+      # may fail from here on without issues.
+      lines = ::File.readlines(filename)
+      _lineno = lineno - 1
+
+      first_lineno = [_lineno - context_size, 0].max
+      last_lineno  = [_lineno + context_size, lines.size].min
+      context = lines[first_lineno..last_lineno]
+
+      frames[item.id] = {
+        filename: filename,
+        lineno: lineno,
+        function: function,
+        first_lineno: first_lineno,
+        last_lineno: last_lineno,
+        context: context,
+      }
+    rescue => ex
+      puts ex, ex.backtrace
+    end
+  end
+end