textbringer 5 → 6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee5d500943649b27e9bebc067bb17e9192ca313fd653d272a6a4d0a2dacae838
-  data.tar.gz: 242eb5276649e97ff5677f3bd3a85e59b2c245818350741cf362429c2e7202a8
+  metadata.gz: 1a4e9151c1c0eb5b77a04aa772527cbab44782e161bdec0885d262d3af625fce
+  data.tar.gz: 7e32c6f85241240b08944de42b12174bd8e8f41568e4b65f24696355b5bd72e0
 SHA512:
-  metadata.gz: 927d28e674b1824f8e297599e6d34946625c3a28f677540953540798d89b444fef29d4e55eb8a5b0dfc51531d069a6da078f69f85d45a9a3a8acef84a8be7fd0
-  data.tar.gz: 8f2b663c0b7bbf58d1d8356b8d921f8218534c47b03bcde3031ebaa5f76568d473f67418bf6277d22800be82ea0bbdd1503eca411e3d8a1c715848679fe8dc73
+  metadata.gz: a49c66d31e61433c3755373cdc469a84c1c7c4f43391687287e5daa23e96d0a082ed82aebea89b0281982fdd16972eda67ff140379142242df455b6a22753166
+  data.tar.gz: 62df368e736bd9e7c31772cf75e6bb5f64781b9768d49352da87f7bd3e2eb91c2266dd2dd71660940024c99c0da8a89e4116cac04146de4a048bf8d2b6753e7d

data/lib/textbringer/buffer.rb

@@ -1759,6 +1759,8 @@ module Textbringer
   end
 
   class InsertAction < UndoableAction
+    attr_reader :string
+
     def initialize(buffer, location, string)
       super(buffer, location)
       @string = string
@@ -1785,6 +1787,8 @@ module Textbringer
   end
 
   class DeleteAction < UndoableAction
+    attr_reader :string
+
     def initialize(buffer, location, insert_location, string)
       super(buffer, location)
       @insert_location = insert_location

data/lib/textbringer/commands/help.rb

@@ -65,7 +65,8 @@ module Textbringer
     end
 
     def command_help(cmd)
-      s = format("%s:%d\n", *cmd.block.source_location)
+      file, line = *cmd.block.source_location
+      s = format("%s:%d\n", file, line)
       s << "-" * (Window.columns - 2) + "\n"
       s << "#{cmd.name}"
       if !cmd.block.parameters.empty?

data/lib/textbringer/modes/overwrite_mode.rb

@@ -1,4 +1,27 @@
 module Textbringer
+  using Module.new {
+    refine Buffer do
+      def merge_overwrite_action
+        if @undoing || @undo_stack.size < 2 ||
+            !@undo_stack[-1].is_a?(DeleteAction) ||
+            !@undo_stack[-2].is_a?(InsertAction)
+          return
+        end
+        delete_action = @undo_stack.pop
+        insert_action = @undo_stack.pop
+        action = @undo_stack.last
+        if action.is_a?(OverwriteAction)
+          action.merge(insert_action.string, delete_action.string)
+          @redo_stack.clear
+        else
+          new_action = OverwriteAction.new(self, insert_action.location,
+                                           insert_action.string, delete_action.string)
+          push_undo(new_action)
+        end
+      end
+    end
+  }
+
   class OverwriteMode < MinorMode
     self.mode_name = "Ovwrt"
 
@@ -14,6 +37,7 @@ module Textbringer
           buffer.delete_region(pos, buffer.point)
         end
       end
+      buffer.merge_overwrite_action
     }
 
     def enable
@@ -24,4 +48,36 @@ module Textbringer
       remove_hook(:post_self_insert_hook, POST_INSERT_HOOK, local: true)
     end
   end
+
+  class OverwriteAction < UndoableAction
+    def initialize(buffer, location, inserted_string, deleted_string)
+      super(buffer, location)
+      @inserted_string = inserted_string
+      @deleted_string = deleted_string
+      @copied = false
+    end
+
+    def undo
+      @buffer.goto_char(@location)
+      @buffer.delete_region(@location, @location + @inserted_string.bytesize)
+      @buffer.insert(@deleted_string)
+      @buffer.goto_char(@location)
+    end
+
+    def redo
+      @buffer.goto_char(@location)
+      @buffer.delete_region(@location, @location + @deleted_string.bytesize)
+      @buffer.insert(@inserted_string)
+    end
+
+    def merge(inserted_string, deleted_string)
+      unless @copied
+        @inserted_string = @inserted_string.dup
+        @deleted_string = @deleted_string.dup
+        @copied = true
+      end
+      @inserted_string.concat(inserted_string)
+      @deleted_string.concat(deleted_string)
+    end
+  end
 end

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "5"
+  VERSION = "6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '5'
+  version: '6'
 platform: ruby
 authors:
 - Shugo Maeda