ver 2010.02 → 2010.08

data/lib/ver/status/buffer_position.rb

@@ -6,9 +6,9 @@ module VER
       end
 
       def to_s
-        buffers = VER.buffers.values
+        buffers = VER.buffers.to_a
         format % [
-          buffers.index(status.buffer).to_i + 1,
+          buffers.index(buffer).to_i + 1,
           buffers.size
         ]
       end

data/lib/ver/status/diakonos_position.rb

@@ -7,9 +7,9 @@ module VER
 
       def to_s
         format % [
-          text.count('1.0', 'insert', :lines) + 1,
-          text.count('1.0', 'end', :lines),
-          text.count('insert linestart', 'insert', :displaychars) + 1,
+          buffer.count('1.0', 'insert', :lines) + 1,
+          buffer.count('1.0', 'end', :lines),
+          buffer.count('insert linestart', 'insert', :displaychars) + 1,
         ]
       end
     end

data/lib/ver/status/encoding.rb

@@ -6,7 +6,7 @@ module VER
       end
 
       def to_s
-        text.encoding.name
+        buffer.encoding.name
       end
     end
   end

data/lib/ver/status/filename.rb

@@ -6,7 +6,7 @@ module VER
       end
 
       def to_s
-        text.filename.to_s
+        buffer.filename.to_s
       end
     end
   end

data/lib/ver/status/label.rb

@@ -1,6 +1,8 @@
 module VER
   class Status
     class Label < Tk::Tile::Label
+      include LabelToggle
+
       attr_reader :status, :variable, :weight, :row, :column, :sticky, :format
 
       def initialize(status, options = {})
@@ -10,7 +12,7 @@ module VER
         @column = options.delete(:column)
         @sticky = options.delete(:sticky)
         @format = options.delete(:format) || '%s'
-        options[:font] ||= options.delete(:font) || text.options.font
+        options[:font] ||= options.delete(:font) || buffer.options.font
 
         super
 
@@ -18,15 +20,30 @@ module VER
         name = self.class.name[/::([^:]+)$/, 1]
         @variable = Tk::Variable.new("#{name}_#{id}")
         configure(textvariable: @variable)
+        @destroyed = false
+
+        bind('<Destroy>', &method(:on_destroy))
 
         setup
       end
 
+      def destroyed?
+        @destroyed
+      end
+
+      def on_destroy(event)
+        @destroyed = true
+      end
+
       def setup
       end
 
+      def buffer
+        status.buffer
+      end
+
       def update(event)
-        variable.set(to_s)
+        variable.set(to_s) unless destroyed?
       end
 
       def register(*events)
@@ -34,29 +51,12 @@ module VER
       end
 
       def style=(config)
-        configure(config)
-      end
-
-      def text
-        status.text
+        configure(config) unless destroyed?
       end
 
       def to_s
         ''
       end
-
-      def toggle
-        info = grid_info
-
-        if info.empty?
-          grid_configure(@last_grid_info)
-          true
-        else
-          @last_grid_info = info
-          grid_forget
-          false
-        end
-      end
     end
   end
 end

data/lib/ver/status/mode.rb

@@ -6,7 +6,7 @@ module VER
       end
 
       def to_s
-        major = text.major_mode
+        major = buffer.major_mode
         string = [ major.name, *major.minors.map(&:name) ].join(', ')
         "[#{string}]"
       end

data/lib/ver/status/nano_help.rb

@@ -1,6 +1,8 @@
 module VER
   class Status
     class NanoHelp < Tk::Tile::Frame
+      include LabelToggle
+
       attr_reader :status, :weight, :row, :column, :sticky
 
       def initialize(status, options = {})
@@ -9,7 +11,7 @@ module VER
         @row = options.delete(:row)
         @column = options.delete(:column)
         @sticky = options.delete(:sticky)
-        @font = status.text.options.font
+        @font = status.buffer.options.font
 
         super
 
@@ -53,19 +55,6 @@ module VER
       def style=(config)
         # @long_labels.each{|label| label.configure(config) }
       end
-
-      def toggle
-        info = grid_info
-
-        if info.empty?
-          grid_configure(@last_grid_info)
-          true
-        else
-          @last_grid_info = info
-          grid_forget
-          false
-        end
-      end
     end
   end
 end

data/lib/ver/status/nano_position.rb

@@ -10,18 +10,18 @@ module VER
       end
 
       def to_s
-        line_now     = text.count(1.0, :insert, :lines) + 1
-        line_total   = text.count(1.0, :end, :lines)
+        line_now     = buffer.count(1.0, :insert, :lines) + 1
+        line_total   = buffer.count(1.0, :end, :lines)
         line_percent = ((100.0 / line_total) * line_now)
         line_percent = 0 if line_percent.nan?
 
-        col_now     = text.count('insert linestart', :insert, :chars) + 1
-        col_total   = text.count('insert linestart', 'insert lineend', :chars) + 1
+        col_now     = buffer.count('insert linestart', :insert, :chars) + 1
+        col_total   = buffer.count('insert linestart', 'insert lineend', :chars) + 1
         col_percent = ((100.0 / col_total) * col_now)
         col_percent = 0 if col_percent.nan?
 
-        char_now   = text.count(1.0, :insert, :chars)
-        char_total = text.count(1.0, :end, :chars) - 1
+        char_now   = buffer.count(1.0, :insert, :chars)
+        char_total = buffer.count(1.0, :end, :chars) - 1
         char_percent = ((100.0 / char_total) * char_now)
         char_percent = 0 if char_percent.nan?
 

data/lib/ver/status/percent.rb

@@ -2,8 +2,8 @@ module VER
   class Status
     class Percent < Position
       def to_s
-        here = text.count(1.0, :insert, :lines)
-        total = text.count(1.0, :end, :lines)
+        here = buffer.count(1.0, :insert, :lines)
+        total = buffer.count(1.0, :end, :lines)
         percent = ((100.0 / total) * here).round
 
         case percent

data/lib/ver/status/position.rb

@@ -7,8 +7,8 @@ module VER
 
       def to_s
         "%4d,%3d" % [
-          text.count('1.0', 'insert', :lines) + 1,
-          text.count('insert linestart', 'insert', :displaychars)
+          buffer.count('1.0', 'insert', :lines) + 1,
+          buffer.count('insert linestart', 'insert', :displaychars)
         ]
       end
     end

data/lib/ver/status/short_filename.rb

@@ -6,7 +6,7 @@ module VER
       end
 
       def to_s
-        text.short_filename
+        buffer.short_filename
       end
     end
   end

data/lib/ver/status/syntax.rb

@@ -6,7 +6,7 @@ module VER
       end
 
       def to_s
-        format % text.syntax.name
+        format % buffer.syntax.name
       end
     end
   end

data/lib/ver/struct.rb

@@ -0,0 +1,28 @@
+module VER
+  # A caching wrapper for Struct from Ruby core.
+  #
+  # When reloading source in VER, sometimes a file will contain a class that
+  # inherits from Struct.new
+  # The issue is that Struct.new always returns a new class, even if the members
+  # are the same.
+  # This results in a "TypeError: superclass mismatch" exception.
+  # There are workarounds that use the defined? keyword to check whether the
+  # subclass has been defined yet, but that's not very intuitive and results in
+  # issues for documentation.
+  # Not to mention it's more mental overhead and more to type.
+  #
+  # This class simply defines its own {VER::Struct.new} method, which uses a
+  # constant Hash to keep all the Struct superclasses created so far along with
+  # the parameters used to create them.
+  # When it receives the same arguments, it returns the same superclass, problem solved.
+  #
+  # Of course, if you change the arguments, source reloading will fail again
+  # until you restart VER or undefine the constant that holds the subclass.
+  class Struct < ::Struct
+    CACHE = {}
+
+    def self.new(*args)
+      CACHE[args] ||= super
+    end
+  end
+end

data/lib/ver/syntax/processor.rb

@@ -5,6 +5,7 @@ module VER
         self.stack = []
         self.tags = Hash.new{|h,k| h[k] = [] }
         @tag_stack = []
+        tags[syntax_name] << "1.0" << "end"
       end
 
       def end_parsing(syntax_name)
@@ -45,7 +46,7 @@ module VER
         # cannot be closed because the contents of the textarea changed since
         # the last highlight was issued.
         # this will cause Tk to raise an error that doesn't have a message and
-        #  is of no major consequences.
+        #  is of no major conpatterns.
         # We swallow that exception to avoid confusion.
         raise exception unless exception.message.empty?
       end

data/lib/ver/text.rb

@@ -1,562 +1,90 @@
 module VER
+  # Common funcionality for Tk::Text widgets, mostly with shortcuts and helpers
+  # for VER.
   class Text < Tk::Text
-    autoload :Index, 'ver/text/index'
-    include Keymapped
+    autoload :Index,     'ver/text/index'
+    autoload :Mark,      'ver/text/mark'
+    autoload :Position,  'ver/text/position'
+    autoload :Range,     'ver/text/range'
+    autoload :Selection, 'ver/text/selection'
+    autoload :Tag,       'ver/text/tag'
+    autoload :Insert,    'ver/text/insert'
+    autoload :End,       'ver/text/end'
 
-    None = Object.new
-    MATCH_WORD_RIGHT =  /[^a-zA-Z0-9]+[a-zA-Z0-9'"{}\[\]\n-]/
-    MATCH_WORD_LEFT =  /(^|\b)\S+(\b|$)/
-    MODE_STYLES = {
-      :insert   => {insertbackground: 'red', blockcursor: false},
-      /select/  => {insertbackground: 'yellow', blockcursor: true},
-      /replace/ => {insertbackground: 'orange', blockcursor: true},
-    }
+    attr_reader :lock
 
-    attr_accessor(:buffer, :status, :project_root, :project_repo,
-                  :undoer, :pristine, :prefix_arg, :readonly)
-    attr_reader(:filename, :options, :snippets, :preferences, :store_hash,
-                :default_theme_config, :encoding, :syntax, :name)
-
-    def initialize(buffer, options = {})
-      @project_repo = @project_root = @highlighter = nil
-
-      if peer = options.delete(:peer)
-        @tag_commands = {}
-        @tk_parent = buffer
-        @store_hash = peer.store_hash
-        @default_theme_config = peer.default_theme_config
-        Tk.execute(peer.tk_pathname, 'peer', 'create', assign_pathname, options)
-        self.filename = peer.filename
-        configure(peer.configure)
-      else
-        @default_theme_config = nil
-        @store_hash = Hash.new{|h,k| h[k] = {} }
-        super
-      end
-
-      widget_setup(buffer)
+    def execute(*args, &block)
+      super unless lock
     end
 
-    # This is a noop, it simply provides a target with a sane name.
-    def update_prefix_arg(widget)
-      numbers = []
-
-      major_mode.event_history.reverse_each do |event|
-        break unless event[:sequence] =~ /^(\d+)$/
-        numbers << $1
-      end
-
-      if numbers.any? && numbers != ['0']
-        self.prefix_arg = numbers.reverse.join.to_i
-      else
-        self.prefix_arg = nil
-      end
+    def execute_only(*args, &block)
+      super unless lock
     end
 
-    # Same as [prefix_arg], but returns 1 if there is no argument.
-    # Useful for [Move] methods and the like.
-    # Please note that calling this method is destructive.
-    # It will reset the state of the prefix_arg in order to avoid persistent
-    # arguments.
-    # So use it only once while your action is running, and store the result in a
-    # variable if you need it more than once.
-    def prefix_count
-      count = prefix_arg || 1
-      update_prefix_arg(self)
-      count
+    def focus(*args)
+      super unless lock
     end
 
-    def persisted?
-      return false unless filename
-      return false unless filename.file?
-      require 'digest/md5'
-
-      on_disk = Digest::MD5.hexdigest(filename.read)
-      in_memory = Digest::MD5.hexdigest(value)
-      on_disk == in_memory
-    end
-
-    def store(namespace, key, value = None)
-      if None == value
-        @store_hash[namespace][key]
-      else
-        @store_hash[namespace][key] = value
-      end
+    def place_forget(*args)
+      super unless lock
     end
 
     def inspect
-      details = {
-        mode: major_mode
-      }.map{|key, value| "%s=%p" % [key, value ] }.join(' ')
-      "#<VER::Text #{details}>"
-    end
-
-    def value=(string)
-      super
-      touch!('1.0', 'end')
-    end
-
-    def peer_create(buffer)
-      self.class.new(buffer, peer: self)
-    end
-
-    def widget_setup(buffer)
-      self.buffer = buffer
-      @options = Options.new(:text, VER.options)
-
-      @undoer = VER::Undo::Tree.new(self)
-
-      self.major_mode = :Fundamental
-
-      sync_mode_style
-      setup_tags
-
-      @pristine = true
-      @syntax = nil
-      self.encoding = Encoding.default_internal
-
-      event_setup
-    end
-
-    def event_setup
-      bind '<<EnterMinorMode>>' do |event|
-        sync_mode_status
-        sync_mode_style(event.detail)
-      end
-
-      bind '<<Modified>>' do |event|
-        see :insert
-        sync_position_status
-      end
-
-      bind '<<Movement>>' do |event|
-        see :insert
-        Methods::Selection.refresh(self)
-        show_matching_brace
-        sync_position_status
-      end
-
-      bind('<FocusIn>') do |event|
-        on_focus_in(event)
-        Tk.callback_break
-      end
-
-      bind('<FocusOut>') do |event|
-        on_focus_out(event)
-        Tk.callback_break
-      end
-
-      bind '<Destroy>' do |event|
-        VER.cancel_block(@highlighter)
-      end
-    end
-
-    def on_focus_in(event)
-      Dir.chdir(filename.dirname.to_s) if options.auto_chdir
-      set_window_title
-      see(:insert)
-      Tk::Tile::Style.configure(buffer.style, border: 1, background: '#f00')
-    end
-
-    def on_focus_out(event)
-      Tk::Tile::Style.configure(buffer.style, border: 1, background: '#fff')
-    end
-
-    def pristine?
-      @pristine
+      "#<VER::Text %p>" % [tk_pathname]
     end
 
     def index(idx)
       Index.new(self, execute('index', idx).to_s)
     end
 
-    def message(*args)
-      VER.message(*args)
-    end
-
-    def noop(*args)
-      # message "Noop %p in mode %p" % [args, keymap.mode]
-    end
-
-    def short_filename
-      if filename
-        if root = @project_root
-          filename.relative_path_from(root).to_s
-        else
-          filename.sub(Dir.pwd + '/', '').to_s
-        end
-      elsif name
-        name.to_s
-      end
-    end
-
-    def name=(name)
-      @name = name
-      status.event :filename if status
-    end
-
-    def filename=(path)
-      @filename = Pathname(path.to_s).expand_path
-      status.event :filename if status
-    end
-
-    def syntax=(syn)
-      @syntax = syn
-      status.event :syntax if syn && status
-    end
-
-    def encoding=(enc)
-      @encoding = enc
-      status.event :encoding if enc && status
-    end
-
-    def layout
-      buffer.layout
-    end
-
-    def sync_mode_status
-      status.event :mode
-    end
-
-    def sync_position_status
-      status.event :position, :percent
-    end
-
-    def sync_encoding_status
-      status.event :encoding
-    end
-
-    def sync_percent_status
-      status.event :percent
-    end
-
-    TAG_ALL_MATCHING_OPTIONS = { from: '1.0', to: 'end - 1 chars' }
-
-    def tag_all_matching(name, regexp, options = {})
-      name = name.to_s
-      options = TAG_ALL_MATCHING_OPTIONS.merge(options)
-      from, to = options.values_at(:from, :to)
-
-      if tag_exists?(name)
-        tag_remove(name, from, to)
-      else
-        fg, bg = options.values_at(:foreground, :background)
-        tag_configure(name, foreground: fg, background: bg)
-      end
-
-      search_all(regexp, from, to) do |match, match_from, match_to|
-        name = yield(match, match_from, match_to) if block_given?
-        tag_add name, match_from, match_to
-      end
-    end
-
-    def search_all(regexp, start = '1.0', stop = 'end - 1 chars')
-      unless block_given?
-        return Enumerator.new(self, :search_all, regexp, start, stop)
-      end
-
-      while result = search(regexp, start, stop, :count)
-        pos, len = result
-        return if !pos || len == 0
-
-        from  = index(pos)
-        to    = index("#{pos} + #{len} chars")
-        match = get(from, to)
-
-        yield(match, from, to)
-
-        start = to
-      end
-    end
-
-    def rsearch_all(regexp, start = 'end', stop = '1.0')
-      unless block_given?
-        return Enumerator.new(self, :rsearch_all, regexp, start, stop)
-      end
-
-      while result = rsearch(regexp, start, stop, :count)
-        pos, len = result
-        break if !pos || len == 0
-
-        from = index(pos)
-        to   = index("#{pos} + #{len} chars")
-        match = get(from, to)
-
-        yield(match, from, to)
-
-        start = from
-      end
-    end
-
-    def up_down_line(count)
-      insert = index(:insert)
-
-      @udl_pos_orig = insert if @udl_pos_prev != insert
-
-      lines = count(@udl_pos_orig, insert, :displaylines)
-      target = index("#@udl_pos_orig + #{lines + count} displaylines")
-      @udl_pos_prev = target
-
-      @udl_pos_orig = target if target.x == @udl_pos_orig.x
-      target
-    end
-
-    def tag_exists?(given_path)
-      tag_names.include?(given_path)
-    rescue RuntimeError => ex
-      false
-    end
-
-    # Wrap Tk methods to behave as we want and to generate events
-    def mark_set(mark_name, index)
-      super
-      return unless mark_name == :insert
-      Tk::Event.generate(self, '<<Movement>>')
-    end
-
-    def insert(index, string, tag = Tk::None)
-      index = index(index) unless index.respond_to?(:to_index)
-
-      Methods::Undo.record self do |record|
-        record.insert(index, string, tag)
-      end
-    end
-
-    # Replaces the range of characters between index1 and index2 with the given
-    # characters and tags.
-    # See the section on [insert] for an explanation of the handling of the
-    # tag_list arguments, and the section on [delete] for an explanation
-    # of the handling of the indices.
-    # If index2 corresponds to an index earlier in the text than index1, an
-    # error will be generated.
-    # The deletion and insertion are arranged so that no unnecessary scrolling
-    # of the window or movement of insertion cursor occurs.
-    # In addition the undo/redo stack are correctly modified, if undo operations
-    # are active in the text widget.
-    #
-    # replace index1 index2 chars ?tagList chars tagList ...?
-    def replace(index1, index2, string)
-      index1 = index(index1) unless index1.respond_to?(:to_index)
-      index2 = index(index2) unless index2.respond_to?(:to_index)
-      return if index1 == index2
-
-      Methods::Undo.record self do |record|
-        record.replace(index1, index2, string)
-      end
+    def index(position)
+      Index.new(self, super.to_s)
     end
 
-    def delete(*indices)
-      Methods::Delete.delete(self, *indices)
+    def insert=(position)
+      at_insert.index = position
     end
 
-    def set_window_title
-      if filename
-        home = Pathname(ENV['HOME'])
-        dir, file = filename.split
-        dir_relative_to_home = dir.relative_path_from(home)
-
-        if dir_relative_to_home.to_s.start_with?('../')
-          title = "#{file} (#{dir}) - VER"
-        else
-          title = "#{file} (#{dir_relative_to_home}) - VER"
-        end
-      elsif name
-        title = "[#{name}] - VER"
+    def tag(name, *indices)
+      if indices.empty?
+        Tag.new(self, name)
       else
-        title = "[No Name] - VER"
+        tag = Tag.new(self, name)
+        tag.add(*indices)
+        tag
       end
-
-      VER.root.wm_title = title
     end
 
-    def setup_highlight
-      setup_highlight_for(Syntax.from_filename(filename)) if filename
+    def tags(index = Tk::None)
+      tag_names(index).map{|name| Tag.new(self, name) }
     end
 
-    def setup_highlight_for(syntax)
-      return if encoding == Encoding::BINARY
-      return unless syntax
-
-      self.syntax = syntax
-      VER.cancel_block(@highlighter)
-
-      interval = options.syntax_highlight_interval.to_int
-      @highlighter = VER.when_inactive_for(interval){
-        handle_pending_syntax_highlights
-      }
-
-      touch!('1.0', 'end')
-
-      sync_mode_status
+    def tag_ranges(tag_name)
+      super(tag_name).map{|first, last| range(first, last) }
     end
 
-    # TODO: maybe we can make this one faster when many lines are going to be
-    #       highlighted at once by bundling them.
-    def touch!(*indices)
-      tag_add('ver.highlight.pending', *indices) if @syntax
-      Tk::Event.generate(self, '<<Modified>>')
+    def range(first, last)
+      Range.new(self, Index.new(self, first), Index.new(self, last))
     end
 
-    def load_theme(name)
-      return unless syntax
-      return unless found = Theme.find(name)
-
-      syntax.theme = Theme.load(found)
-      touch!('1.0', 'end')
-
-      message "Theme #{found} loaded"
+    def mark(name, index = nil, gravity = nil)
+      mark = Mark.new(self, name, index)
+      mark.gravity = gravity if gravity
+      mark
     end
 
-    def load_syntax(name)
-      return false unless syntax
-
-      theme = syntax.theme
-
-      if name.is_a?(Syntax)
-        self.syntax = Syntax.new(name.name, theme)
-      elsif found = Syntax.find(name)
-        self.syntax = Syntax.new(name, theme)
-      else
-        return false
-      end
-
-      message "Syntax #{syntax.name} loaded"
+    def marks
+      mark_names.map{|name| Mark.new(self, name) }
     end
 
-    def handle_pending_syntax_highlights
-      ignore_tags = %w[ver.highlight.pending sel]
-      tag_ranges('ver.highlight.pending').each do |from, to|
-        (tag_names(from) - ignore_tags).each do |tag_name|
-          tag_from, _ = tag_prevrange(tag_name, from)
-          from = tag_from if tag_from && from > tag_from
-        end
-
-        (tag_names(to) - ignore_tags).each do |tag_name|
-          _, tag_to = tag_nextrange(tag_name, to)
-          to = tag_to if tag_to && to < tag_to
-        end
-
-        from, to = index(from).linestart, index(to).lineend
-        lineno = from.y - 1
-        syntax.highlight(self, lineno, from, to)
-        tag_all_trailing_whitespace(from: from, to: to)
-        tag_all_uris(from: from, to: to)
-        tag_remove('ver.highlight.pending', from, to)
-      end
+    def mark_next(index)
+      name = super
+      Mark.new(self, name) if name
     end
 
-    def default_theme_config=(config)
-      @default_theme_config = config
-      sync_mode_style
-    end
-
-    def ask(prompt, options = {}, &action)
-      options[:caller] ||= self
-      VER.minibuf.ask(prompt, options, &action)
-    end
-
-    def load_preferences
-      return unless syntax
-
-      name = syntax.name
-      return unless file = VER.find_in_loadpath("preferences/#{name}.rb")
-      @preferences = eval(file.read)
-    rescue Errno::ENOENT, TypeError => ex
-      VER.error(ex)
-    end
-
-    def load_snippets
-      return unless syntax
-
-      name = syntax.name
-      return unless file = VER.find_in_loadpath("snippets/#{name}.rb")
-      @snippets = eval(file.read)
-    rescue Errno::ENOENT, TypeError => ex
-      VER.error(ex)
-    end
-
-    def sync_mode_style(given_mode = nil)
-      config = (default_theme_config || {}).merge(blockcursor: false)
-
-      modes = given_mode ? [given_mode] : major_mode.minors
-
-      modes.each do |mode|
-        mode = MinorMode[mode]
-
-        MODE_STYLES.each do |pattern, style|
-          config.merge!(style) if pattern === mode.name
-        end
-      end
-
-      configure(config)
-      return unless status && color = config[:insertbackground]
-
-      status.style = {
-        background: cget(:background),
-        foreground: color,
-      }
-    end
-
-    private
-
-    def setup_tags
-      setup_highlight_trailing_whitespace
-      setup_highlight_links
-      setup_highlight_pending
-    end
-
-    def setup_highlight_pending
-      # tag_configure 'ver.highlight.pending', underline: true
-    end
-
-    def setup_highlight_trailing_whitespace
-      tag_configure 'invalid.trailing-whitespace', background: '#400'
-    end
-
-    def setup_highlight_links
-      tag_configure 'markup.underline.link' , underline: true, foreground: '#0ff'
-
-      tag_bind('markup.underline.link', '<1>') do |event|
-        pos = index("@#{event.x},#{event.y}")
-
-        uri = tag_ranges('markup.underline.link').find{|from, to|
-          if index(from) <= pos && index(to) >= pos
-            break get(from, to)
-          end
-        }
-
-        if uri
-          browser = ENV['BROWSER'] || ['links', '-g']
-          system(*browser, uri)
-          message "%p opens the uri: %s" % [browser, uri]
-        end
-      end
-    end
-
-    def tag_all_uris(given_options = {})
-      tag_all_matching('markup.underline.link', /https?:\/\/[^<>)\]}\s'"]+/, given_options)
-    end
-
-    def tag_all_trailing_whitespace(given_options = {})
-      tag_all_matching('invalid.trailing-whitespace', /[ \t]+$/, given_options)
-    end
-
-    def show_matching_brace(index = :insert)
-      tag = 'ver.highlight.brace'
-      tag_remove(tag, '1.0', 'end')
-
-      if pos = Methods::Move.matching_brace_pos(self, index)
-        tag_configure(tag, background: '#ff0', foreground: '#00f')
-        tag_add(tag, 'insert', 'insert + 1 chars', pos, "#{pos} + 1 chars")
-      end
-    end
-
-    def font(given_options = nil)
-      if given_options
-        options.font.configure(given_options)
-      else
-        options.font
-      end
+    def mark_previous(index)
+      name = super
+      Mark.new(self, name) if name
     end
   end
 end