textbringer 13 → 15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ebcccec1dcc4c9b2116dc02f0e4548d30f019c0da7fc1d0573f84cf08b8590d
-  data.tar.gz: 1f2b135717e1fde5ca8f13fdb9a967d5a7cad5aea6af83c040f35bec85c3bf23
+  metadata.gz: 5ad5b7d9a5cc2022075f802db23f24781dcb3be366a4ba3ee27015a66ada834d
+  data.tar.gz: 1933c54c72c4e189b4f0a6ba81d6186d7618c9eaaa3eccbe5b61925d8959c108
 SHA512:
-  metadata.gz: a9a9ea8e0234c2fda07af756eb12e8acc53a7f0c3e9cee57276adb742bda13a896875f4b21334794737a55d6e7c7c07168baea74304336e687834f3e5ba4b5d2
-  data.tar.gz: 1c3a84fc349f0d68cd55498d6ae45d159f672b824c8307e89e30bd4eb68c70126de3c358a9255177c74230b747b6255dbdfd36182fe9d56b34927b8a88f60fbb
+  metadata.gz: 44736e20de4174e865ad160107e48461e26d46cd495e74000138c724753dafaae65b5e530902e8f1ad1f38659e301cfe2fbec71208913f85d01af5e23b124bc5
+  data.tar.gz: b07e7c3533f540b88157c268d498f7ec6bd077db6fce0e3adb154acc02fb9d960cee0bfb23cd91342a6dce12f0c8af1083dac1434fc67c9fddc361bd03623ded

data/CLAUDE.md

@@ -0,0 +1,197 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Overview
+
+Textbringer is an Emacs-like text editor written in Ruby. It is extensible by Ruby instead of Lisp and runs in the terminal using ncurses.
+
+**Ruby Version**: Requires Ruby >= 3.2
+
+## Development Commands
+
+### Setup
+```bash
+bundle install
+```
+
+For ncursesw support (required for multibyte characters):
+```bash
+sudo apt-get install libncursesw5-dev
+gem install curses
+```
+
+### Running the Editor
+```bash
+# Run the main executable
+./exe/txtb
+
+# Or after installation
+txtb
+```
+
+### Testing
+```bash
+# Run all tests
+bundle exec rake test
+
+# Or simply (default task)
+bundle exec rake
+
+# On Ubuntu/Linux (for CI)
+xvfb-run bundle exec rake test
+
+# Run a single test file
+ruby -Ilib:test test/textbringer/test_buffer.rb
+```
+
+### Build and Release
+```bash
+# Install gem locally
+bundle exec rake install
+
+# Bump version and create release
+bundle exec rake bump
+```
+
+## Architecture
+
+### Core Components
+
+**Buffer** (`lib/textbringer/buffer.rb`)
+- The fundamental text container, similar to Emacs buffers
+- Uses a gap buffer implementation (GAP_SIZE = 256) for efficient text editing
+- Supports undo/redo with UNDO_LIMIT = 1000
+- Handles encoding detection (UTF-8, EUC-JP, Windows-31J) and file format conversion
+- Manages marks, point (cursor position), and the kill ring
+- Class methods maintain global buffer list (@@list, @@current, @@minibuffer)
+
+**Window** (`lib/textbringer/window.rb`)
+- Display abstraction using curses for terminal UI
+- Multiple windows can display different buffers or the same buffer
+- Window.current tracks the active window
+- Echo area (@@echo_area) for messages and minibuffer input
+- Manages cursor position and window splitting/deletion
+
+**Controller** (`lib/textbringer/controller.rb`)
+- The main event loop and command dispatcher
+- Reads key sequences and dispatches to commands
+- Handles prefix arguments, keyboard macros, and recursive editing
+- Maintains command execution state (this_command, last_command)
+- Pre/post command hooks for extensibility
+
+**Mode** (`lib/textbringer/mode.rb`)
+- Buffer modes define context-specific behavior and syntax highlighting
+- Modes inherit from Mode class (FundamentalMode, ProgrammingMode, RubyMode, CMode, etc.)
+- Each mode has its own keymap and syntax table
+- `define_local_command` creates mode-specific commands
+- Modes are automatically selected based on file_name_pattern or interpreter_name_pattern
+
+**Keymap** (`lib/textbringer/keymap.rb`)
+- Tree structure for key bindings (supports multi-stroke sequences)
+- Uses `kbd()` function to parse Emacs-style key notation
+- Key sequences can bind to commands (symbols) or nested keymaps
+
+**Commands** (`lib/textbringer/commands.rb` and `lib/textbringer/commands/*.rb`)
+- Commands are defined using `define_command(name, doc:)`
+- Available as module functions in the Commands module
+- Command groups: buffers, windows, files, isearch, replace, rectangle, etc.
+- All commands accessible via Alt+x or key bindings
+
+### Plugin System
+
+Plugins are loaded from `~/.textbringer/plugins/` via `Plugin.load_plugins`. Examples:
+- Mournmail (mail client)
+- MedicineShield (Mastodon client)
+- textbringer-presentation
+- textbringer-ghost_text
+
+### Configuration
+
+User configuration is loaded from:
+1. `~/.textbringer/init.rb` (loaded first)
+2. `~/.textbringer.rb` (loaded after plugins)
+
+Global configuration hash: `CONFIG` in `lib/textbringer/config.rb`
+
+Key settings:
+- `east_asian_ambiguous_width`: Character width (1 or 2)
+- `tab_width`, `indent_tabs_mode`: Indentation
+- `syntax_highlight`, `highlight_buffer_size_limit`: Syntax highlighting
+- `default_input_method`: Input method for non-ASCII text
+
+### Input Methods
+
+Support for non-ASCII input:
+- T-Code (`lib/textbringer/input_methods/t_code_input_method.rb`)
+- Hiragana (`lib/textbringer/input_methods/hiragana_input_method.rb`)
+- Hangul (`lib/textbringer/input_methods/hangul_input_method.rb`)
+
+### Testing Infrastructure
+
+Tests use `Test::Unit` with custom `Textbringer::TestCase` base class in `test/test_helper.rb`.
+
+Key test helpers:
+- `FakeController`: Test controller with `test_key_buffer` for simulating input
+- `FakeCursesWindow`: Mock curses window for headless testing
+- `push_keys(keys)`: Simulate keyboard input
+- `mkcdtmpdir`: Create temporary directory for file tests
+- `Window.setup_for_test`: Initialize test environment
+
+Tests are organized mirroring lib structure: `test/textbringer/**/*`.
+
+## Code Patterns
+
+### Defining Commands
+```ruby
+define_command(:command_name, doc: "Description") do
+  # Command implementation
+  # Access current buffer: Buffer.current
+  # Get prefix arg: current_prefix_arg
+end
+```
+
+### Mode-Specific Commands
+```ruby
+class MyMode < Mode
+  define_local_command(:my_command) do
+    # Mode-specific implementation
+  end
+end
+```
+
+### Key Bindings
+```ruby
+GLOBAL_MAP.define_key("\C-x\C-f", :find_file)
+MODE_MAP.define_key("C-c C-c", :compile)
+```
+
+### Buffer Operations
+- Always use `Buffer.current` to get the active buffer
+- `@buffer.point` is the cursor position
+- `@buffer.mark` for region operations
+- `@buffer.insert(text)`, `@buffer.delete_char(n)` for modifications
+- `@buffer.save_point` and `@buffer.goto_char(pos)` for navigation
+
+### Window Management
+- `Window.current` is the active window
+- `Window.redisplay` updates the display
+- `Window.echo_area` for messages
+- `message(text)` to display in echo area
+
+## File Organization
+
+- `lib/textbringer.rb`: Main entry point, requires all components
+- `lib/textbringer/commands/*.rb`: Command implementations by category
+- `lib/textbringer/modes/*.rb`: Major and minor modes
+- `lib/textbringer/faces/*.rb`: Syntax highlighting face definitions
+- `exe/txtb`: Main executable
+- `exe/tbclient`: Client for server mode
+- `exe/tbtags`: Tag file generator
+
+## Notes
+
+- The editor is designed to mimic Emacs conventions and terminology
+- Key sequences use Emacs notation: C- (Control), M- (Meta/Alt), S- (Shift)
+- The codebase uses extensive metaprogramming for command registration and mode definition
+- All user-facing text editing operations should go through Buffer methods to maintain undo/redo support

data/lib/textbringer/buffer.rb

@@ -10,7 +10,8 @@ module Textbringer
 
     attr_accessor :mode, :keymap
     attr_reader :name, :file_name, :file_encoding, :file_format, :point, :marks
-    attr_reader :current_line, :current_column, :visible_mark
+    attr_reader :current_line, :current_column, :visible_mark, :mark_active
+    attr_reader :last_match
     attr_reader :input_method
 
     GAP_SIZE = 256
@@ -253,8 +254,10 @@ module Textbringer
       @save_point_level = 0
       @match_offsets = []
       @visible_mark = nil
+      @mark_active = false
       @read_only = read_only
       @callbacks = {}
+      @last_match = nil
       @input_method = nil
     end
 
@@ -945,6 +948,20 @@ module Textbringer
       end
     end
 
+    def activate_mark
+      @mark_active = true
+      set_visible_mark(@mark.location) if @mark
+    end
+
+    def deactivate_mark
+      @mark_active = false
+      delete_visible_mark
+    end
+
+    def mark_active?
+      @mark_active
+    end
+
     def self.region_boundaries(s, e)
       if s > e
         [e, s]
@@ -1090,203 +1107,6 @@ module Textbringer
       insert_for_yank(KILL_RING.rotate(1))
     end
 
-    # Returns start_line, start_col, end_line, and end_col of the rectangle region
-    # Note that start_col and end_col are 0-origin and width-based (neither 1-origin nor codepoint-based)
-    def rectangle_boundaries(s = @point, e = mark)
-      s, e = Buffer.region_boundaries(s, e)
-      save_excursion do
-        goto_char(s)
-        start_line = @current_line
-        beginning_of_line
-        start_col = display_width(substring(@point, s))
-        goto_char(e)
-        end_line = @current_line
-        beginning_of_line
-        end_col = display_width(substring(@point, e))
-
-        # Ensure start_col <= end_col
-        if start_col > end_col
-          start_col, end_col = end_col, start_col
-        end
-        [start_line, start_col, end_line, end_col]
-      end
-    end
-
-    def apply_on_rectangle(s = @point, e = mark, reverse: false)
-      start_line, start_col, end_line, end_col = rectangle_boundaries(s, e)
-
-      save_excursion do
-        composite_edit do
-          if reverse
-            goto_line(end_line)
-          else
-            goto_line(start_line)
-          end
-
-          loop do
-            beginning_of_line
-            line_start = @point
-
-            # Move to start column
-            col = 0
-            while col < start_col && !end_of_line?
-              forward_char
-              col = display_width(substring(line_start, @point))
-            end
-
-            yield(start_col, end_col, col, line_start)
-
-            # Move to next line for forward iteration
-            if reverse
-              break if @current_line <= start_line
-              backward_line
-            else
-              break if @current_line >= end_line
-              forward_line
-            end
-          end
-        end
-      end
-    end
-
-    def extract_rectangle(s = @point, e = mark)
-      lines = []
-      apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
-        start_pos = @point
-        width = end_col - start_col
-
-        # If we haven't reached start_col, the line is too short
-        if col < start_col
-          # Line is shorter than start column, extract all spaces
-          lines << " " * width
-        else
-          # Move to end column
-          while col < end_col && !end_of_line?
-            forward_char
-            col = display_width(substring(line_start, @point))
-          end
-          end_pos = @point
-
-          # Extract the rectangle text for this line
-          if end_pos > start_pos
-            extracted = substring(start_pos, end_pos)
-            # Pad with spaces if the extracted text is shorter than rectangle width
-            extracted_width = display_width(extracted)
-            if extracted_width < width
-              extracted += " " * (width - extracted_width)
-            end
-            lines << extracted
-          else
-            lines << " " * width
-          end
-        end
-      end
-
-      lines
-    end
-
-    def copy_rectangle(s = @point, e = mark)
-      lines = extract_rectangle(s, e)
-      @@killed_rectangle = lines
-    end
-
-    def kill_rectangle(s = @point, e = mark)
-      copy_rectangle(s, e)
-      delete_rectangle(s, e)
-    end
-
-    def delete_rectangle(s = @point, e = mark)
-      check_read_only_flag
-
-      apply_on_rectangle(s, e, reverse: true) do |start_col, end_col, col, line_start|
-        start_pos = @point
-
-        # Only delete if we're within the line bounds
-        if col >= start_col
-          # Move to end column
-          while col < end_col && !end_of_line?
-            forward_char
-            col = display_width(substring(line_start, @point))
-          end
-          end_pos = @point
-
-          # Delete the rectangle text for this line
-          if end_pos > start_pos
-            delete_region(start_pos, end_pos)
-          end
-        end
-      end
-    end
-
-    def yank_rectangle
-      raise "No rectangle in kill ring" if @@killed_rectangle.nil?
-      lines = @@killed_rectangle
-      start_line = @current_line
-      start_point = @point
-      start_col = save_excursion {
-        beginning_of_line
-        display_width(substring(@point, start_point))
-      }
-      composite_edit do
-        lines.each_with_index do |line, i|
-          goto_line(start_line + i)
-          beginning_of_line
-          line_start = @point
-
-          # Move to start column, extending line if necessary
-          col = 0
-          while col < start_col && !end_of_line?
-            forward_char
-            col = display_width(substring(line_start, @point))
-          end
-
-          # If line is shorter than start_col, extend it with spaces
-          if col < start_col
-            insert(" " * (start_col - col))
-          end
-
-          # Insert the rectangle line
-          insert(line)
-        end
-      end
-    end
-
-    def open_rectangle(s = @point, e = mark)
-      check_read_only_flag
-      s, e = Buffer.region_boundaries(s, e)
-      composite_edit do
-        apply_on_rectangle(s, e) do |start_col, end_col, col, line_start|
-          # If line is shorter than start_col, extend it with spaces
-          if col < start_col
-            insert(" " * (start_col - col))
-          end
-
-          # Insert spaces to create the rectangle
-          insert(" " * (end_col - start_col))
-        end
-        goto_char(s)
-      end
-    end
-
-    def clear_rectangle(s = @point, e = mark)
-      check_read_only_flag
-      apply_on_rectangle(s, e, reverse: true) do |start_col, end_col, col, line_start|
-        start_pos = @point
-        if col < start_col
-          insert(" " * (end_col - start_col))
-        else
-          while col < end_col && !end_of_line?
-            forward_char
-            col = display_width(substring(line_start, @point))
-          end
-          end_pos = @point
-
-          delete_region(start_pos, end_pos) if end_pos > start_pos
-          insert(" " * (end_col - start_col))
-        end
-      end
-    end
-
     def undo
       undo_or_redo(:undo, @undo_stack, @redo_stack)
     end
@@ -1295,7 +1115,7 @@ module Textbringer
       undo_or_redo(:redo, @redo_stack, @undo_stack)
     end
 
-    def re_search_forward(s, raise_error: true, count: 1)
+    def re_search_forward(s, raise_error: true, goto_beginning: false, count: 1)
       if count < 0
         return re_search_backward(s, raise_error: raise_error, count: -count)
       end
@@ -1310,7 +1130,7 @@ module Textbringer
             return nil
           end
         end
-        pos = match_end(0)
+        pos = goto_beginning ? match_beginning(0) : match_end(0)
       end
       goto_char(pos)
     end
@@ -1356,6 +1176,7 @@ module Textbringer
 
     def byteindex(forward, re, pos)
       @match_offsets = []
+      @last_match = nil
       method = forward ? :byteindex : :byterindex
       adjust_gap(0, 0)
       s = @contents.byteslice(@gap_end..-1)
@@ -1364,9 +1185,9 @@ module Textbringer
       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))
+        @last_match = Regexp.last_match
+        (0 .. @last_match.size - 1).each do |j|
+          @match_offsets.push(@last_match.byteoffset(j))
         end
         i
       else
@@ -1491,6 +1312,10 @@ module Textbringer
       end
     end
 
+    def minor_mode_active?(mode_class)
+      @minor_modes.any? { |mode| mode.instance_of?(mode_class) }
+    end
+
     def mode_names
       names = []
       names.push(mode&.name || 'None')
@@ -1948,7 +1773,6 @@ module Textbringer
   end
 
   KILL_RING = Ring.new
-  @@killed_rectangle = nil
 
   class UndoableAction
     attr_accessor :version

data/lib/textbringer/commands/buffers.rb

@@ -93,7 +93,12 @@ module Textbringer
 
     define_command(:exchange_point_and_mark,
                    doc: "Exchange the positions of point and mark.") do
-      Buffer.current.exchange_point_and_mark
+      buffer = Buffer.current
+      buffer.exchange_point_and_mark
+      # Activate mark if transient mark mode is enabled
+      if TransientMarkMode.enabled?
+        buffer.activate_mark
+      end
     end
 
     define_command(:copy_region,
@@ -129,36 +134,6 @@ module Textbringer
       Buffer.current.delete_region
     end
 
-    define_command(:kill_rectangle,
-                   doc: "Kill the text of the region-rectangle, saving its contents as the last killed rectangle.") do
-      Buffer.current.kill_rectangle
-    end
-
-    define_command(:copy_rectangle_as_kill,
-                   doc: "Save the text of the region-rectangle as the last killed rectangle.") do
-      Buffer.current.copy_rectangle
-    end
-
-    define_command(:delete_rectangle,
-                   doc: "Delete the text of the region-rectangle.") do
-      Buffer.current.delete_rectangle
-    end
-
-    define_command(:yank_rectangle,
-                   doc: "Yank the last killed rectangle with its upper left corner at point.") do
-      Buffer.current.yank_rectangle
-    end
-
-    define_command(:open_rectangle,
-                   doc: "Insert blank space to fill the space of the region-rectangle. This pushes the previous contents of the region-rectangle to the right.") do
-      Buffer.current.open_rectangle
-    end
-
-    define_command(:clear_rectangle,
-                   doc: "Clear the region-rectangle by replacing its contents with spaces.") do
-      Buffer.current.clear_rectangle
-    end
-
     define_command(:transpose_chars,
                    doc: "Transpose characters.") do
       Buffer.current.transpose_chars
@@ -177,6 +152,10 @@ module Textbringer
         buffer.pop_to_mark
       else
         buffer.push_mark
+        # Activate mark if transient mark mode is enabled
+        if TransientMarkMode.enabled?
+          buffer.activate_mark
+        end
         message("Mark set")
       end
     end

data/lib/textbringer/commands/isearch.rb

@@ -77,7 +77,10 @@ module Textbringer
     end
 
     def isearch_done
-      Buffer.current.delete_visible_mark
+      # Don't delete visible_mark if mark is active (transient mark mode)
+      unless Buffer.current.mark_active?
+        Buffer.current.delete_visible_mark
+      end
       Controller.current.overriding_map = nil
       remove_hook(:pre_command_hook, :isearch_pre_command_hook)
       ISEARCH_STATUS[:last_string] = ISEARCH_STATUS[:string]
@@ -154,8 +157,11 @@ module Textbringer
         if Buffer.current != Buffer.minibuffer
           message(isearch_prompt + ISEARCH_STATUS[:string], log: false)
         end
-        Buffer.current.set_visible_mark(forward ? match_beginning(0) :
-                                        match_end(0))
+        # Don't update visible_mark if mark is already active (transient mark mode)
+        unless Buffer.current.mark_active?
+          Buffer.current.set_visible_mark(forward ? match_beginning(0) :
+                                          match_end(0))
+        end
         goto_char(forward ? match_end(0) : match_beginning(0))
       else
         if Buffer.current != Buffer.minibuffer