textbringer 3 → 4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66be90097685aaa387bc495b1ec0480eeaa4f7015480c5358fd07268d3e14fdb
-  data.tar.gz: f848eefb51793d46065411ef40b5c8c96f04ebb490a1919c3497e44ed7f0c574
+  metadata.gz: 98c29dc1578dcd0acdfe058e2465e610d9803d687ac9e37ab0e2cc2935c6cc9f
+  data.tar.gz: 0feb32743ea8c276cb5a30e76f9725508481ca239a0f29960b8712642477ab80
 SHA512:
-  metadata.gz: 33afdb5cdc3c255a5910e0757393a650dce8ab09b705a58725f391a70e8c46bf7a1b1c31959bf4ed0e96b435c0ba745d3f13c353f5c869f64afa764b23551f9a
-  data.tar.gz: 9b9cc0408ab6d79038d080ebfce6fe3c6c11fe600b88a267c0d2b75c35d12eec02e9a8d95aa82169919fdb49da13c973274b7a9a05edba1a570641167e09c094
+  metadata.gz: 6d16b6eb9feb3679a1297dad604da419c3afb59a963e720d8f09c546a7accda2333732b7170edfa8db8eaef18b69d65aed87a8ed58610192fd6951021d61514b
+  data.tar.gz: 8b532a2c38278c08677be9bfb2cee271e0af00e832326859551d623a3daff8ad5207b4350cfe7642fbfe476fb3b7532a9671994db98355fdf8e179083c81042d

data/.github/workflows/macos.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: macos-latest
     strategy:
       matrix:
-        ruby: [ head, 3.3 ]
+        ruby: [ head, 3.4 ]
     timeout-minutes: 10
     env:
       RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal

data/.github/workflows/ubuntu.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ head, 3.3, 3.2, 3.1 ]
+        ruby: [ head, 3.4, 3.3, 3.2 ]
     timeout-minutes: 10
     env:
       RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal

data/.github/workflows/windows.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        ruby: [ 'mingw', 'mswin', '3.3' ]
+        ruby: [ 'mingw', 'mswin', '3.4' ]
     timeout-minutes: 10
     env:
       RUBYOPT: --enable-frozen-string-literal --debug-frozen-string-literal

data/lib/textbringer/buffer.rb

@@ -62,8 +62,6 @@ module Textbringer
       end
     }
 
-    HAS_BYTEINDEX = String.instance_methods.include?(:byteindex)
-    HAS_BYTESPLICE = String.instance_methods.include?(:bytesplice)
     BYTESPLICE_SUPPORTS_PARTIAL_COPY =
       begin
         (+"foo").bytesplice(0, 2, "bar", 1, 2) == "aro"
@@ -249,6 +247,7 @@ module Textbringer
       @version = 0
       @modified = false
       @mode = FundamentalMode.new(self)
+      @minor_modes = []
       @keymap = nil
       @attributes = {}
       @save_point_level = 0
@@ -531,14 +530,10 @@ module Textbringer
       if pos == point_min
         column = 1
       else
-        if HAS_BYTEINDEX
-          begin
-            i = @contents.byterindex("\n", user_to_gap(get_pos(pos, -1)))
-          rescue RangeError
-            i = nil
-          end
-        else
-          i = @contents.rindex("\n", user_to_gap(pos - 1))
+        begin
+          i = @contents.byterindex("\n", user_to_gap(get_pos(pos, -1)))
+        rescue RangeError
+          i = nil
         end
         if i
           i += 1
@@ -568,11 +563,7 @@ module Textbringer
       pos = point_min
       i = 1
       while i < n && pos < @contents.bytesize
-        if HAS_BYTEINDEX
-          pos = @contents.byteindex("\n", pos)
-        else
-          pos = @contents.index("\n", pos)
-        end
+        pos = @contents.byteindex("\n", pos)
         break if pos.nil?
         i += 1
         pos += 1
@@ -592,7 +583,7 @@ module Textbringer
       pos = @point
       size = s.bytesize
       adjust_gap(size)
-      splice_contents(@point, size, s.b)
+      @contents.bytesplice(@point, size, s.b)
       @marks.each do |m|
         if m.location > @point
           m.location += size
@@ -640,7 +631,7 @@ module Textbringer
       if n > 0
         str = substring(s, pos)
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
-        splice_contents(@gap_end...user_to_gap(pos), "\0" * (pos - @point))
+        @contents.bytesplice(@gap_end...user_to_gap(pos), "\0" * (pos - @point))
         @gap_end += pos - @point
         @marks.each do |m|
           if m.location > pos
@@ -655,7 +646,7 @@ module Textbringer
         str = substring(pos, s)
         update_line_and_column(@point, pos)
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
-        splice_contents(user_to_gap(pos)...@gap_start, "\0" * (@point - pos))
+        @contents.bytesplice(user_to_gap(pos)...@gap_start, "\0" * (@point - pos))
         @marks.each do |m|
           if m.location >= @point
             m.location -= @point - pos
@@ -983,7 +974,7 @@ module Textbringer
         adjust_gap
         len = e - s
         # fill the gap with NUL to avoid invalid byte sequence in UTF-8
-        splice_contents(@gap_end, len, "\0" * len)
+        @contents.bytesplice(@gap_end, len, "\0" * len)
         @gap_end += len
         @marks.each do |m|
           if m.location > e
@@ -1161,72 +1152,23 @@ module Textbringer
       byteindex(true, r, @point) == @point
     end
 
-    if HAS_BYTEINDEX
-      def byteindex(forward, re, pos)
-        @match_offsets = []
-        method = forward ? :byteindex : :byterindex
-        adjust_gap(0, 0)
-        s = @contents.byteslice(@gap_end..-1)
-        unless binary?
-          s.force_encoding(Encoding::UTF_8)
-        end
-        i = s.send(method, re, pos)
-        if i
-          m = Regexp.last_match
-          (0 .. m.size - 1).each do |j|
-            @match_offsets.push(m.byteoffset(j))
-          end
-          i
-        else
-          nil
-        end
+    def byteindex(forward, re, pos)
+      @match_offsets = []
+      method = forward ? :byteindex : :byterindex
+      adjust_gap(0, 0)
+      s = @contents.byteslice(@gap_end..-1)
+      unless binary?
+        s.force_encoding(Encoding::UTF_8)
       end
-    else
-      def byteindex(forward, re, pos)
-        @match_offsets = []
-        method = forward ? :index : :rindex
-        adjust_gap(0, 0)
-        s = @contents[@gap_end..-1]
-        if @binary
-          offset = pos
-        else
-          offset = s.byteslice(0, pos).force_encoding(Encoding::UTF_8).size
-          s.force_encoding(Encoding::UTF_8)
-        end
-        begin
-          i = s.send(method, re, offset)
-          if i
-            m = Regexp.last_match
-            if m.nil?
-              # A bug of rindex
-              @match_offsets.push([pos, pos])
-              pos
-            else
-              b = m.pre_match.bytesize
-              e = b + m.to_s.bytesize
-              if e <= bytesize
-                @match_offsets.push([b, e])
-                match_beg = m.begin(0)
-                match_str = m.to_s
-                (1 .. m.size - 1).each do |j|
-                  cb, ce = m.offset(j)
-                  if cb.nil?
-                    @match_offsets.push([nil, nil])
-                  else
-                    bb = b + match_str[0, cb - match_beg].bytesize
-                    be = b + match_str[0, ce - match_beg].bytesize
-                    @match_offsets.push([bb, be])
-                  end
-                end
-                b
-              else
-                nil
-              end
-            end
-          else
-            nil
-          end
+      i = s.send(method, re, pos)
+      if i
+        m = Regexp.last_match
+        (0 .. m.size - 1).each do |j|
+          @match_offsets.push(m.byteoffset(j))
         end
+        i
+      else
+        nil
       end
     end
 
@@ -1335,6 +1277,27 @@ module Textbringer
       Utils.run_hooks(mode_class.hook_name)
     end
 
+    def toggle_minor_mode(mode_class)
+      mode = @minor_modes.find { |mode| mode.instance_of?(mode_class) }
+      if mode
+        mode.disable
+        @minor_modes.delete(mode)
+      else
+        mode = mode_class.new(self)
+        @minor_modes.push(mode)
+        mode.enable
+      end
+    end
+
+    def mode_names
+      names = []
+      names.push(mode&.name || 'None')
+      @minor_modes.each do |mode|
+        names.push(mode.name)
+      end
+      names
+    end
+
     def indent_to(column)
       s = if self[:indent_tabs_mode]
         "\t" * (column / self[:tab_width]) + " " * (column % self[:tab_width])
@@ -1503,16 +1466,6 @@ module Textbringer
       end
     end
 
-    if HAS_BYTESPLICE
-      def splice_contents(*args)
-        @contents.bytesplice(*args)
-      end
-    else
-      def splice_contents(*args)
-        @contents.[]=(*args)
-      end
-    end
-
     def adjust_gap(min_size = 0, pos = @point)
       if @gap_start < pos
         len = user_to_gap(pos) - @gap_end
@@ -1526,9 +1479,9 @@ module Textbringer
                                "\0" * (new_gap_end - nul_filling_start))
         else
           s = @contents.byteslice(@gap_end, len)
-          splice_contents(nul_filling_start...new_gap_end,
-                          "\0" * (new_gap_end - nul_filling_start))
-          splice_contents(@gap_start...new_gap_start, s)
+          @contents.bytesplice(nul_filling_start...new_gap_end,
+                               "\0" * (new_gap_end - nul_filling_start))
+          @contents.bytesplice(@gap_start...new_gap_start, s)
         end
         @gap_start = new_gap_start
         @gap_end = new_gap_end
@@ -1544,8 +1497,8 @@ module Textbringer
                                "\0" * (nul_filling_end - pos))
         else
           s = @contents.byteslice(pos, len)
-          splice_contents(pos...nul_filling_end, "\0" * (nul_filling_end - pos))
-          splice_contents(new_gap_end...@gap_end, s)
+          @contents.bytesplice(pos...nul_filling_end, "\0" * (nul_filling_end - pos))
+          @contents.bytesplice(new_gap_end...@gap_end, s)
         end
         @gap_start = new_gap_start
         @gap_end = new_gap_end
@@ -1553,7 +1506,7 @@ module Textbringer
       if gap_size < min_size
         new_gap_size = GAP_SIZE + min_size
         extended_size = new_gap_size - gap_size
-        splice_contents(@gap_end, 0, "\0" * extended_size)
+        @contents.bytesplice(@gap_end, 0, "\0" * extended_size)
         @gap_end += extended_size
       end
     end
@@ -1620,14 +1573,10 @@ module Textbringer
           @current_column += substring(pos, new_pos).size
         else
           @current_line += n
-          if HAS_BYTEINDEX
-            begin
-              i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, -1)))
-            rescue RangeError
-              i = nil
-            end
-          else
-            i = @contents.rindex("\n", user_to_gap(new_pos - 1))
+          begin
+            i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, -1)))
+          rescue RangeError
+            i = nil
           end
           if i
             i += 1
@@ -1642,14 +1591,10 @@ module Textbringer
           @current_column -= substring(new_pos, pos).size
         else
           @current_line -= n
-          if HAS_BYTEINDEX
-            begin
-              i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, - 1)))
-            rescue RangeError
-              i = nil
-            end
-          else
-            i = @contents.rindex("\n", user_to_gap(new_pos - 1))
+          begin
+            i = @contents.byterindex("\n", user_to_gap(get_pos(new_pos, - 1)))
+          rescue RangeError
+            i = nil
           end
           if i
             i += 1

data/lib/textbringer/commands/buffers.rb

@@ -171,6 +171,7 @@ module Textbringer
       c = Controller.current.last_key
       merge_undo = Controller.current.last_command == :self_insert
       Buffer.current.insert(c * n, merge_undo)
+      run_hooks(:post_self_insert_hook)
     end
 
     define_command(:quoted_insert,

data/lib/textbringer/keymap.rb

@@ -220,6 +220,7 @@ module Textbringer
   GLOBAL_MAP.define_key("\M-c", :capitalize_word)
   GLOBAL_MAP.define_key("\C-x8\C-m", :insert_char)
   GLOBAL_MAP.define_key("\C-x=", :what_cursor_position)
+  GLOBAL_MAP.define_key(:ic, :overwrite_mode)
   GLOBAL_MAP.handle_undefined_key do |key|
     if key.is_a?(String) && /[\0-\x7f]/ !~ key
       :self_insert

data/lib/textbringer/minor_mode.rb

@@ -0,0 +1,35 @@
+module Textbringer
+  class MinorMode
+    extend Commands
+    include Commands
+
+    class << self
+      attr_accessor :mode_name
+      attr_accessor :command_name
+    end
+
+    def self.inherited(child)
+      base_name = child.name.slice(/[^:]*\z/)
+      child.mode_name = base_name.sub(/Mode\z/, "")
+      command_name = base_name.sub(/\A[A-Z]/) { |s| s.downcase }.
+        gsub(/(?<=[a-z])([A-Z])/) {
+          "_" + $1.downcase
+        }
+      command = command_name.intern
+      child.command_name = command
+      define_command(command) do
+        Buffer.current.toggle_minor_mode(child)
+      end
+    end
+
+    attr_reader :buffer
+
+    def initialize(buffer)
+      @buffer = buffer
+    end
+
+    def name
+      self.class.mode_name
+    end
+  end
+end

data/lib/textbringer/modes/overwrite_mode.rb

@@ -0,0 +1,27 @@
+module Textbringer
+  class OverwriteMode < MinorMode
+    self.mode_name = "Ovwrt"
+
+    POST_INSERT_HOOK = -> {
+      buffer = Buffer.current
+      s = Controller.current.last_key * number_prefix_arg
+      begin
+        buffer.delete_char(s.size)
+      rescue RangeError
+        buffer.save_excursion do
+          pos = buffer.point
+          buffer.end_of_buffer
+          buffer.delete_region(pos, buffer.point)
+        end
+      end
+    }
+
+    def enable
+      add_hook(:post_self_insert_hook, POST_INSERT_HOOK, local: true)
+    end
+
+    def disable
+      remove_hook(:post_self_insert_hook, POST_INSERT_HOOK, local: true)
+    end
+  end
+end

data/lib/textbringer/utils.rb

@@ -352,16 +352,33 @@ module Textbringer
 
     HOOKS = Hash.new { |h, k| h[k] = [] }
 
-    def add_hook(name, func = nil, &block)
-      HOOKS[name].unshift(func || block)
+    def add_hook(name, func = nil, local: false, &block)
+      hooks = get_hooks(local)
+      return if hooks[name].include?(func)
+      hooks[name].unshift(func || block)
     end
 
-    def remove_hook(name, func)
-      HOOKS[name].delete(func)
+    def remove_hook(name, func, local: false)
+      hooks = get_hooks(local)
+      hooks[name].delete(func)
+    end
+
+    def get_hooks(local)
+      if local
+        Buffer.current[:hooks] ||= Hash.new { |h, k| h[k] = [] }
+      else
+        HOOKS
+      end
     end
 
     def run_hooks(name, remove_on_error: false)
-      HOOKS[name].delete_if do |func|
+      hooks = Buffer.current[:hooks]
+      run_hooks_in(hooks, name, remove_on_error:) if hooks
+      run_hooks_in(HOOKS, name, remove_on_error:)
+    end
+
+    def run_hooks_in(hooks, name, remove_on_error: false)
+      hooks[name].delete_if do |func|
         begin
           case func
           when Symbol

data/lib/textbringer/version.rb

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

data/lib/textbringer/window.rb

@@ -659,7 +659,7 @@ module Textbringer
       end
       @mode_line.addstr(unicode_codepoint(c))
       @mode_line.addstr(" #{line},#{column}")
-      @mode_line.addstr(" (#{@buffer.mode&.name || 'None'})")
+      @mode_line.addstr(" (#{@buffer.mode_names.join(' ')})")
       @mode_line.addstr(" " * (columns - @mode_line.curx))
       @mode_line.attrset(0)
       @mode_line.noutrefresh

data/lib/textbringer.rb

@@ -34,6 +34,8 @@ require_relative "textbringer/modes/backtrace_mode"
 require_relative "textbringer/modes/completion_list_mode"
 require_relative "textbringer/modes/buffer_list_mode"
 require_relative "textbringer/modes/help_mode"
+require_relative "textbringer/minor_mode"
+require_relative "textbringer/modes/overwrite_mode"
 require_relative "textbringer/input_method"
 require_relative "textbringer/input_methods/t_code_input_method"
 require_relative "textbringer/input_methods/hiragana_input_method"

data/textbringer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 3.1'
+  spec.required_ruby_version = '>= 3.2'
 
   spec.add_runtime_dependency "rdoc"
   spec.add_runtime_dependency "ostruct"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '3'
+  version: '4'
 platform: ruby
 authors:
 - Shugo Maeda
 bindir: exe
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -379,6 +379,7 @@ files:
 - lib/textbringer/input_methods/t_code_input_method.rb
 - lib/textbringer/input_methods/t_code_input_method/tables.rb
 - lib/textbringer/keymap.rb
+- lib/textbringer/minor_mode.rb
 - lib/textbringer/mode.rb
 - lib/textbringer/modes/backtrace_mode.rb
 - lib/textbringer/modes/buffer_list_mode.rb
@@ -386,6 +387,7 @@ files:
 - lib/textbringer/modes/completion_list_mode.rb
 - lib/textbringer/modes/fundamental_mode.rb
 - lib/textbringer/modes/help_mode.rb
+- lib/textbringer/modes/overwrite_mode.rb
 - lib/textbringer/modes/programming_mode.rb
 - lib/textbringer/modes/ruby_mode.rb
 - lib/textbringer/plugin.rb
@@ -409,14 +411,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: An Emacs-like text editor
 test_files: []