textbringer 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6dafe6a94443fe1e79c7a9316973fc43ec01525
-  data.tar.gz: 8332b5d2ef6dd7cbb4df030b9e2ce79a4551be83
+  metadata.gz: 68977203d454a58e4191f2b74aba7239793f01ed
+  data.tar.gz: fc172a9d8466197a4cd2383d1fd25a04b5f31056
 SHA512:
-  metadata.gz: 5d7687449b608e273a1a0a11155e80e07543095e0bf73deab13740767166274590803d28e203a5816a6526d44a25bf49ac36855deecc1833a007b4a84525b933
-  data.tar.gz: 4cf790621ce7c55960cc7e0087fb6dac140280d60adf20e2e0b9b88f69eef252226cf9bdbf975614bdf56658cbc90de074f568c4a9775fb0c983206fa5951293
+  metadata.gz: 428028614b59f7c75b9740ce2567f7f40887e2df3b13f4a860416c0b742ffcc41c117011a77d5b31f9138bb79f79e8b5142c288f72d803ee676881ceaf1b4eeb
+  data.tar.gz: 5da641c9f7a42d4535a3f3889200fb97c83987f8223fba81a2c7d5e7324649804281c4965dcefce897762ba7dac400a406d93f483601ec9745f201fafe5e5ded

data/.travis.yml

@@ -1,13 +1,27 @@
-sudo: false
-os:
-  - linux
-  - osx
 language: ruby
-rvm:
-  - 2.3.3
-  - 2.4.0
-  - ruby-head
 matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: false
+      rvm: 2.3.3
+    - os: linux
+      dist: trusty
+      sudo: false
+      rvm: 2.4.0
+    - os: linux
+      dist: trusty
+      sudo: false
+      rvm: ruby-head
+    - os: osx
+      osx_image: xcode8.2
+      rvm: 2.3.3
+    - os: osx
+      osx_image: xcode8.2
+      rvm: 2.4.0
+    - os: osx
+      osx_image: xcode8.2
+      rvm: ruby-head
   allow_failures:
     - os: osx
     - rvm: ruby-head

data/CHANGES.md

@@ -1,3 +1,14 @@
+## 0.1.9
+
+* Support registers.
+* Support plugins.
+* Support global mark ring.
+* Support keyboard macro.
+* Support help (describe_bindings, describe_command, and describe_key).
+* Add tbtags.
+* Add the commands back_to_indentation, indent_region, delete_indentation,
+  shrink_window, and shrink_window_if_larger_than_buffer.
+
 ## 0.1.8
 
 * Support syntax highlighting.

data/Guardfile

@@ -17,6 +17,6 @@
 
 guard :shell do
   watch(%r'^(lib|test)/.+\.rb$') do
-    `ripper-tags -R`
+    `bundle exec tbtags -R`
   end
 end

data/exe/tbtags

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require "ripper-tags"
+
+module Textbringer
+  module TagParser
+    def on_method_add_arg(call, args)
+      call_name = call&.slice(0)
+      first_arg = args&.slice(0) == :args && args[1]
+      if call_name == :fcall && first_arg && call[1][0] == "define_command"
+        [:def, args[1][0], call[1][1]]
+      else
+        super(call, args)
+      end
+    end
+  end
+end
+
+RipperTags::Parser.prepend(Textbringer::TagParser)
+
+begin
+  RipperTags.process_args(ARGV)
+rescue => e
+  STDERR.printf("%s: %s\n", File.basename($0), e)
+  exit(1)
+end

data/exe/textbringer

@@ -18,6 +18,7 @@ $VERBOSE = nil
 Controller.current = Controller.new
 Window.start do
   begin
+    Plugin.load_plugins
     load_user_config
     ruby_mode
     if ARGV.size > 0

data/lib/textbringer.rb

@@ -1,6 +1,7 @@
 require_relative "textbringer/version"
 require_relative "textbringer/config"
 require_relative "textbringer/errors"
+require_relative "textbringer/ring"
 require_relative "textbringer/buffer"
 require_relative "textbringer/window"
 require_relative "textbringer/keymap"
@@ -17,6 +18,9 @@ require_relative "textbringer/commands/replace"
 require_relative "textbringer/commands/dabbrev"
 require_relative "textbringer/commands/ctags"
 require_relative "textbringer/commands/clipboard"
+require_relative "textbringer/commands/register"
+require_relative "textbringer/commands/keyboard_macro"
+require_relative "textbringer/commands/help"
 require_relative "textbringer/mode"
 require_relative "textbringer/modes/fundamental_mode"
 require_relative "textbringer/modes/programming_mode"
@@ -24,4 +28,6 @@ require_relative "textbringer/modes/ruby_mode"
 require_relative "textbringer/modes/c_mode"
 require_relative "textbringer/modes/backtrace_mode"
 require_relative "textbringer/modes/completion_list_mode"
+require_relative "textbringer/modes/help_mode"
+require_relative "textbringer/plugin"
 require_relative "textbringer/controller"

data/lib/textbringer/buffer.rb

@@ -52,6 +52,7 @@ module Textbringer
     @@list = []
     @@current = nil
     @@minibuffer = nil
+    @@global_mark_ring = nil
 
     def self.auto_detect_encodings
       @@auto_detect_encodings
@@ -90,6 +91,10 @@ module Textbringer
       @@minibuffer ||= Buffer.new(name: "*Minibuffer*")
     end
 
+    def self.global_mark_ring
+      @@global_mark_ring ||= Ring.new(CONFIG[:global_mark_ring_max])
+    end
+
     def self.last
       if @@list.last == @@current
         @@list[-2]
@@ -210,13 +215,16 @@ module Textbringer
       @gap_end = 0
       @marks = []
       @mark = nil
+      @mark_ring = Ring.new(CONFIG[:mark_ring_max],
+                            on_delete: ->(mark) { mark.delete })
       @current_line = 1
       @current_column = 1  # One-based character count
       @goal_column = nil   # Zero-based display width count
-      @yank_start = new_mark
       @undo_stack = []
       @redo_stack = []
       @undoing = false
+      @composite_edit_level = 0
+      @composite_edit_actions = []
       @version = 0
       @modified = false
       @mode = FundamentalMode.new(self)
@@ -283,12 +291,24 @@ module Textbringer
       end
     end
 
+    def read_only_edit
+      self.read_only = false
+      begin
+        yield
+      ensure
+        self.read_only = true
+      end
+    end
+
     def kill
       @@table.delete(@name)
       @@list.delete(self)
       if @@current == self
         @@current = nil
       end
+      @marks.each do |mark|
+        mark.detach
+      end
     end
 
     def current?
@@ -767,8 +787,63 @@ module Textbringer
     end
 
     def set_mark(pos = @point)
-      @mark ||= new_mark
+      if @mark
+        @mark.location = pos
+      else
+        push_mark(pos)
+      end
+    end
+
+    # Set mark at pos, and push the mark on the mark ring.
+    # Unlike Emacs, the new mark is pushed on the mark ring instead of
+    # the old one.
+    def push_mark(pos = @point)
+      @mark = new_mark
       @mark.location = pos
+      @mark_ring.push(@mark)
+      if self != Buffer.minibuffer
+        global_mark_ring = Buffer.global_mark_ring
+        if global_mark_ring.empty? || global_mark_ring.current.buffer != self
+          push_global_mark(pos)
+        end
+      end
+    end
+
+    def on_global_mark_ring?
+      mark_ring = Buffer.global_mark_ring
+      if mark_ring.empty?
+        return false
+      end
+      current = mark_ring.current
+      if current&.buffer == self
+        return true
+      end
+      next_mark = mark_ring[-1]
+      if next_mark&.buffer ==  self
+        return true
+      end
+      false
+    end
+
+    def push_global_mark(pos = @point, force: false)
+      if force || !on_global_mark_ring?
+        mark = new_mark
+        mark.location = pos
+        Buffer.global_mark_ring.push(mark)
+        true
+      else
+        false
+      end
+    end
+
+    def pop_mark
+      return if @mark_ring.empty?
+      @mark = @mark_ring.rotate(1)
+    end
+
+    def pop_to_mark
+      goto_char(mark)
+      pop_mark
     end
 
     def set_visible_mark(pos = @point)
@@ -783,8 +858,17 @@ module Textbringer
       end
     end
 
+    def self.region_boundaries(s, e)
+      if s > e
+        [e, s]
+      else
+        [s, e]
+      end
+    end
+
     def copy_region(s = @point, e = mark, append = false)
-      str = s <= e ? substring(s, e) : substring(e, s)
+      s, e = Buffer.region_boundaries(s, e)
+      str = substring(s, e)
       if append && !KILL_RING.empty?
         KILL_RING.current.concat(str)
       else
@@ -800,9 +884,7 @@ module Textbringer
     def delete_region(s = @point, e = mark)
       check_read_only_flag
       old_pos = @point
-      if s > e
-        s, e = e, s
-      end
+      s, e = Buffer.region_boundaries(s, e)
       update_line_and_column(old_pos, s)
       save_point do
         str = substring(s, e)
@@ -868,7 +950,9 @@ module Textbringer
     end
 
     def insert_for_yank(s)
-      mark_to_point(@yank_start)
+      if @mark.nil? || !point_at_mark?(@mark)
+        push_mark
+      end
       insert(s)
     end
 
@@ -877,8 +961,8 @@ module Textbringer
     end
 
     def yank_pop
-      delete_region(@yank_start.location, @point)
-      insert_for_yank(KILL_RING.current(1))
+      delete_region
+      insert_for_yank(KILL_RING.rotate(1))
     end
 
     def undo
@@ -963,7 +1047,7 @@ module Textbringer
 
     def looking_at?(re)
       if re.is_a?(Regexp)
-        r = Regexp.new("\\G(?:#{re.source})", re.options)
+        r = /\G#{re}/
       else
         r = "\\G(?:#{re})"
       end
@@ -1049,19 +1133,21 @@ module Textbringer
       b = match_beginning(0)
       e =  match_end(0)
       goto_char(b)
-      delete_region(b, e)
-      insert(new_str)
-      merge_undo(2)
+      composite_edit do
+        delete_region(b, e)
+        insert(new_str)
+      end
     end
 
     def replace_regexp_forward(regexp, to_str)
       result = 0
       rest = substring(point, point_max)
-      delete_region(point, point_max)
-      new_str = rest.gsub(new_regexp(regexp)) {
-        result += 1
-        m = Regexp.last_match
-        to_str.gsub(/\\(?:([0-9]+)|(&)|(\\))/) { |s|
+      composite_edit do
+        delete_region(point, point_max)
+        new_str = rest.gsub(new_regexp(regexp)) {
+          result += 1
+          m = Regexp.last_match
+          to_str.gsub(/\\(?:([0-9]+)|(&)|(\\))/) { |s|
           case
           when $1
             m[$1.to_i]
@@ -1070,10 +1156,10 @@ module Textbringer
           when $3
             "\\"
           end
+          }
         }
-      }
-      insert(new_str)
-      merge_undo(2)
+        insert(new_str)
+      end
       result
     end
 
@@ -1095,16 +1181,22 @@ module Textbringer
       /\A\0*\z/ =~ @contents[@gap_start...@gap_end] ? true : false
     end
 
-    def merge_undo(n)
-      return if @undoing || @undo_limit == 0
-      actions = @undo_stack.pop(n)
-      if actions
-        action = CompositeAction.new(self, actions.first.location)
-        actions.each do |i|
-          action.add_action(i)
+    def composite_edit
+      @composite_edit_level += 1
+      begin
+        yield
+      ensure
+        @composite_edit_level -= 1
+        if @composite_edit_level == 0 && !@composite_edit_actions.empty?
+          action = CompositeAction.new(self,
+                                       @composite_edit_actions.first.location)
+          @composite_edit_actions.each do |i|
+            action.add_action(i)
+          end
+          action.version = @composite_edit_actions.first.version
+          push_undo(action)
+          @composite_edit_actions.clear
         end
-        action.version = actions.first.version
-        @undo_stack.push(action)
       end
     end
 
@@ -1189,9 +1281,10 @@ module Textbringer
 
     def gsub(*args, &block)
       s = to_s.gsub(*args, &block)
-      delete_region(point_min, point_max)
-      insert(s)
-      merge_undo(2)
+      composite_edit do
+        delete_region(point_min, point_max)
+        insert(s)
+      end
       self
     end
 
@@ -1343,14 +1436,18 @@ module Textbringer
 
     def push_undo(action)
       return if @undoing || @undo_limit == 0
-      if @undo_stack.size >= @undo_limit
-        @undo_stack[0, @undo_stack.size + 1 - @undo_limit] = []
-      end
-      if !modified?
-        action.version = @version
+      if @composite_edit_level > 0
+        @composite_edit_actions.push(action)
+      else
+        if @undo_stack.size >= @undo_limit
+          @undo_stack[0, @undo_stack.size + 1 - @undo_limit] = []
+        end
+        if !modified?
+          action.version = @version
+        end
+        @undo_stack.push(action)
+        @redo_stack.clear
       end
-      @undo_stack.push(action)
-      @redo_stack.clear
     end
 
     def new_regexp(s)
@@ -1369,70 +1466,48 @@ module Textbringer
   end
 
   class Mark
-    attr_reader :buffer
+    attr_reader :buffer, :file_name
     attr_accessor :location
 
     def initialize(buffer, location)
       @buffer = buffer
+      @file_name = nil
       @location = location
     end
 
-    def delete
-      @buffer.marks.delete(self)
-    end
-
-    def dup
-      mark = @buffer.new_mark
-      mark.location = @location
-      mark
-    end
-  end
-
-  class KillRing
-    def initialize(max = 30)
-      @max = max
-      @ring = []
-      @current = -1
+    def inspect
+      "#<Mark:#{@buffer&.name || @file_name}:#{@location}>"
     end
 
-    def clear
-      @ring.clear
-      @current = -1
+    def delete
+      if @buffer
+        @buffer.marks.delete(self)
+      end
     end
 
-    def push(str)
-      @current += 1
-      if @ring.size < @max
-        @ring.insert(@current, str)
-      else
-        if @current == @max
-          @current = 0
-        end
-        @ring[@current] = str
-      end
+    def deleted?
+      !@buffer.marks.include?(self)
     end
 
-    def current(n = 0)
-      if @ring.empty?
-        raise EditorError, "Kill ring is empty"
-      end
-      @current -= n
-      if @current < 0
-        @current += @ring.size
+    def detach
+      if @buffer
+        @file_name = @buffer.file_name
+        @buffer = nil
       end
-      @ring[@current]
     end
 
-    def empty?
-      @ring.empty?
+    def detached?
+      @buffer.nil?
     end
 
-    def size
-      @ring.size
+    def dup
+      mark = @buffer.new_mark
+      mark.location = @location
+      mark
     end
   end
 
-  KILL_RING = KillRing.new
+  KILL_RING = Ring.new
 
   class UndoableAction
     attr_accessor :version