mui 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f38d3d434535fc336c9b5394801e3fb49393f691b15878a1994758cfb73a6217
-  data.tar.gz: 220128d17afb0f711f2642cd7e64acc14364ca5e65de77c7130828e5a809796c
+  metadata.gz: fc6a6725223b44bd937314729fc4008b726123dd1624adfdf3adc868b9d4d71d
+  data.tar.gz: 1c58af876fa5c06fb9033a9968dd1de012265f3d3b85bb50a46b17a9e24eeca5
 SHA512:
-  metadata.gz: 82468df468d286b1b672b4c47257565f348661cf38633fdabfdc021cf42639d3637f1b6a1b233bd7af65b47fa426b15da2cd52e270cbe7be987dd071e4d785db
-  data.tar.gz: dbf19ebadd262acc004320ebcf55d25f404ce22ad7a77beb08f4363d5154dc2f9241834f531fa15b4b953d8768bc3c1ec8213441d3150ec803081b1be32590b0
+  metadata.gz: a7a0d46bdf37d31dd6a475b4c42665462e15ed2eee1cad432eed7dcec13776974cd95ed1853e2856fffae2005d367ae6a78294d30e2343ee25240995e943c5dc
+  data.tar.gz: 1f7b17692e0f2349eadbdd38b3687ca661f6d8f6196ba162579e28cc8b7f837d00d36d1ba1533a57d52e3e20f0f1510f51dc5333c2b494bc053c6533e62fd324

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-12-14 12:18:50 UTC using RuboCop version 1.81.7.
+# on 2025-12-18 10:56:40 UTC using RuboCop version 1.81.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -48,7 +48,7 @@ Lint/UselessConstantScoping:
   Exclude:
     - 'lib/mui/buffer_word_cache.rb'
 
-# Offense count: 33
+# Offense count: 35
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 49
@@ -56,14 +56,14 @@ Metrics/CyclomaticComplexity:
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 284
+  Max: 328
 
 # Offense count: 10
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 14
+# Offense count: 15
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 19
@@ -123,7 +123,7 @@ Naming/PredicateMethod:
     - 'lib/mui/undo_manager.rb'
     - 'lib/mui/window_manager.rb'
 
-# Offense count: 1
+# Offense count: 4
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
 # NamePrefix: is_, has_, have_, does_
 # ForbiddenPrefixes: is_, has_, have_, does_
@@ -133,6 +133,9 @@ Naming/PredicatePrefix:
   Exclude:
     - 'spec/**/*'
     - 'lib/mui/search_state.rb'
+    - 'lib/mui/terminal_adapter/base.rb'
+    - 'lib/mui/terminal_adapter/curses.rb'
+    - 'test/test_helper.rb'
 
 # Offense count: 2
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.

data/CHANGELOG.md

@@ -1,5 +1,68 @@
 ## [Unreleased]
 
+## [0.4.0] 2025-12-19
+
+### Added
+- `<S-Tab>` (Shift+Tab) notation support in keymap configuration:
+  - Added `s-tab` and `btab` to `SPECIAL_KEYS` mapping to `:shift_tab` symbol
+  - `normalize_input_key()` now handles `KEY_BTAB` (353) from Curses
+  - Enables tab navigation keymaps like:
+    ```ruby
+    Mui.keymap :normal, "<Tab>", ->(ctx) { ctx.editor.tab_manager.next_tab }
+    Mui.keymap :normal, "<S-Tab>", ->(ctx) { ctx.editor.tab_manager.prev_tab }
+    ```
+- Function definition name highlighting for 6 languages:
+  - Ruby: `def hello` highlights `hello` (lookbehind pattern `(?<=def )`)
+  - Go: `func main()` highlights `main` (lookbehind pattern `(?<=func )`)
+  - Rust: `fn calculate()` highlights `calculate` (lookbehind pattern `(?<=fn )`)
+  - JavaScript: `function add()` highlights `add` (post-process after `function` keyword)
+  - TypeScript: `function fetchData()` highlights `fetchData` (post-process after `function` keyword)
+  - C: `int main()` highlights `main` (lookahead pattern for identifier before `(`)
+  - New token type `:function_definition` mapped to `syntax_function_definition` color scheme element
+  - All 8 themes updated with `syntax_function_definition` style (same color as `syntax_method_call`)
+- Improved mui default theme with 256-color palette:
+  - Eye-friendly gray-based color scheme using 256-color palette
+  - 19 new `mui_*` colors in `EXTENDED_COLOR_MAP` (mui_bg, mui_fg, mui_comment, etc.)
+  - Syntax highlighting follows Vim standard highlight groups (Comment, Constant, Identifier, Statement, PreProc, Type, Special)
+  - 8-color fallbacks for all mui colors
+- Improved all bundled themes to match their original color schemes:
+  - Solarized Dark/Light: Adjusted visual selection, operators, and diff colors
+  - Monokai: Fixed comment color to olive gray (#75715e), added `monokai_comment` color
+  - Nord: Adjusted status line and constant colors to match Nord palette
+  - Gruvbox: Adjusted identifier and keyword colors
+  - Dracula: Adjusted visual selection and symbol colors
+  - Tokyo Night: Adjusted operator and constant colors
+- Added LSP diagnostics and floating window styles to all themes:
+  - `diagnostic_error`, `diagnostic_warning`, `diagnostic_info`, `diagnostic_hint`
+  - `floating_window`
+- 256-color support stabilization:
+  - Environment capability detection (`Curses.has_colors?`, `Curses.colors`, `Curses.color_pairs`)
+  - Automatic 8-color fallback for terminals without 256-color support
+  - `FALLBACK_MAP` to map extended colors to nearest basic 8-color equivalents
+  - LRU cache for color pairs to prevent pair exhaustion
+  - Automatic eviction of oldest pairs when limit is reached
+  - Backward compatible: `ColorManager.new` without adapter assumes 256 colors
+  - `ColorManager#supports_256_colors` to check color capability
+  - `TerminalAdapter::Base#has_colors?`, `#colors`, `#color_pairs` interface methods
+
+### Fixed
+- Fixed text corruption after closing floating window or completion popup:
+  - Japanese/CJK multibyte characters were not displaying correctly after popup closed
+  - Added `touchwin` method to force complete screen redraw using `Curses.stdscr.redraw`
+  - `FloatingWindow` now tracks `last_bounds` and `needs_clear` flag
+  - `InsertCompletionState` now tracks `needs_clear` flag
+  - Editor calls `touchwin` when popup is closed to restore corrupted characters
+
+### Changed
+- Improved search performance for large files:
+  - Added row-based index (`row_index`) to search match cache for O(1) lookup
+  - `matches_for_row()` now uses hash lookup instead of linear search
+  - Before: O(M × visible_rows) per frame, After: O(visible_rows) per frame
+- Improved navigation performance for large files (G, gg commands):
+  - Added smart scroll jump for cursor movements over 100 rows
+  - Directly calculates scroll position instead of iterating line by line
+  - Before: O(n) where n = cursor distance, After: O(1)
+
 ## [0.3.0] - 2025-12-15
 
 ### Added

data/docs/configuration.md

@@ -36,15 +36,27 @@ Configuration files are written in Ruby using Mui's DSL.
 Mui.set :colorscheme, "tokyo_night"
 ```
 
-Available themes:
-- `mui` (default)
-- `solarized_dark`
-- `solarized_light`
-- `monokai`
-- `nord`
-- `gruvbox_dark`
-- `dracula`
-- `tokyo_night`
+Available themes (all themes support 256-color palette with 8-color fallback):
+
+| Theme | Description |
+|-------|-------------|
+| `mui` | Default theme with eye-friendly gray-based colors |
+| `solarized_dark` | Solarized dark theme |
+| `solarized_light` | Solarized light theme |
+| `monokai` | Monokai theme |
+| `nord` | Nord theme |
+| `gruvbox_dark` | Gruvbox dark theme |
+| `dracula` | Dracula theme |
+| `tokyo_night` | Tokyo Night theme |
+
+### 256-Color Support
+
+All bundled themes utilize 256-color palettes for rich syntax highlighting and UI elements. Mui automatically detects your terminal's color capabilities:
+
+- **256-color terminals**: Full color palette with all theme colors
+- **8-color terminals**: Automatic fallback to basic 8-color equivalents
+
+Most modern terminals (iTerm2, gnome-terminal, Windows Terminal, etc.) support 256 colors. If colors appear incorrect, ensure your terminal's `TERM` environment variable is set correctly (e.g., `xterm-256color`).
 
 ### Indentation
 
@@ -125,6 +137,7 @@ end
 | `<Leader>` | Leader key |
 | `<Space>` | Space bar |
 | `<Tab>` | Tab key |
+| `<S-Tab>`, `<btab>` | Shift+Tab |
 | `<CR>`, `<Enter>` | Enter key |
 | `<Esc>` | Escape key |
 | `<BS>` | Backspace |

data/docs/syntax-highlighting.md

@@ -144,6 +144,12 @@ Each theme defines colors for:
 | `syntax_number` | Numeric literals |
 | `syntax_type` | Types and classes |
 | `syntax_function` | Function names |
+| `syntax_function_definition` | Function definition names |
 | `syntax_variable` | Variables |
 | `syntax_constant` | Constants |
 | `syntax_operator` | Operators |
+| `diagnostic_error` | LSP diagnostic errors |
+| `diagnostic_warning` | LSP diagnostic warnings |
+| `diagnostic_info` | LSP diagnostic information |
+| `diagnostic_hint` | LSP diagnostic hints |
+| `floating_window` | Floating window background |

data/lib/mui/color_manager.rb

@@ -17,8 +17,27 @@ module Mui
     # 256-color palette extended colors
     # Use https://www.ditig.com/256-colors-cheat-sheet for reference
     EXTENDED_COLOR_MAP = {
-      # mui theme
-      darkgray: 235, # #262626 (~#2b2b2b)
+      # mui theme - Eye-friendly gray-based theme
+      mui_bg: 236,             # #303030 - Calm dark gray background
+      mui_fg: 253,             # #dadada - Soft white (easy on the eyes)
+      mui_comment: 102,        # #878787 - Subtle gray (for comments)
+      mui_constant: 110,       # #87afd7 - Calm blue (constants/strings/numbers)
+      mui_identifier: 174,     # #d78787 - Soft salmon pink
+      mui_statement: 186,      # #d7d787 - Subtle yellow (keywords)
+      mui_preproc: 173,        # #d7875f - Orange/brown (preprocessor)
+      mui_type: 109,           # #87afaf - Calm cyan (types)
+      mui_special: 180,        # #d7af87 - Soft beige (symbols)
+      mui_function: 216,       # #ffaf87 - Peach/orange (functions)
+      # UI colors
+      mui_line_number: 243,    # #767676 - Subtle gray
+      mui_status_bg: 238,      # #444444 - Status bar background
+      mui_visual: 239,         # #4e4e4e - Selection background
+      mui_search: 222,         # #ffd787 - Search highlight (prominent yellow)
+      mui_tab_bg: 237,         # #3a3a3a - Tab bar background
+      mui_tab_active: 110,     # #87afd7 - Active tab
+      mui_error: 167,          # #d75f5f - Error messages
+      mui_info: 109,           # #87afaf - Info messages
+      darkgray: 235,           # #262626 (~#2b2b2b) - Kept for backward compatibility
 
       # solarized
       solarized_base03: 234,   # #1c1c1c (~#002b36)
@@ -41,6 +60,7 @@ module Mui
       # monokai
       monokai_bg: 235,         # #262626 (~#272822)
       monokai_fg: 231,         # #ffffff (~#f8f8f2)
+      monokai_comment: 101,    # #87875f (~#75715e) - Olive gray for comments
       monokai_pink: 197,       # #ff005f (~#f92672)
       monokai_green: 148,      # #afd700 (~#a6e22e)
       monokai_orange: 208,     # #ff8700 (~#fd971f)
@@ -104,18 +124,95 @@ module Mui
       tokyo_yellow: 223        # #ffd7af (~#e0af68)
     }.freeze
 
-    attr_reader :pairs
+    # Fallback map: 256-color to 8-color
+    FALLBACK_MAP = {
+      # mui theme
+      mui_bg: :black,
+      mui_fg: :white,
+      mui_comment: :white,
+      mui_constant: :cyan,
+      mui_identifier: :red,
+      mui_statement: :yellow,
+      mui_preproc: :yellow,
+      mui_type: :cyan,
+      mui_special: :yellow,
+      mui_function: :yellow,
+      mui_line_number: :white,
+      mui_status_bg: :blue,
+      mui_visual: :magenta,
+      mui_search: :yellow,
+      mui_tab_bg: :blue,
+      mui_tab_active: :cyan,
+      mui_error: :red,
+      mui_info: :cyan,
+      darkgray: :black,
+      # solarized
+      solarized_base03: :black, solarized_base02: :black,
+      solarized_base01: :white, solarized_base00: :white,
+      solarized_base0: :white, solarized_base1: :white,
+      solarized_base2: :white, solarized_base3: :white,
+      solarized_yellow: :yellow, solarized_orange: :red,
+      solarized_red: :red, solarized_magenta: :magenta,
+      solarized_violet: :blue, solarized_blue: :blue,
+      solarized_cyan: :cyan, solarized_green: :green,
+      # monokai
+      monokai_bg: :black, monokai_fg: :white, monokai_comment: :white,
+      monokai_pink: :magenta, monokai_green: :green,
+      monokai_orange: :yellow, monokai_purple: :magenta,
+      monokai_cyan: :cyan, monokai_yellow: :yellow,
+      # nord
+      nord_polar0: :black, nord_polar1: :black,
+      nord_polar2: :black, nord_polar3: :white,
+      nord_snow0: :white, nord_snow1: :white, nord_snow2: :white,
+      nord_frost0: :cyan, nord_frost1: :cyan,
+      nord_frost2: :blue, nord_frost3: :blue,
+      nord_aurora_red: :red, nord_aurora_orange: :yellow,
+      nord_aurora_yellow: :yellow, nord_aurora_green: :green,
+      nord_aurora_purple: :magenta,
+      # gruvbox
+      gruvbox_bg: :black, gruvbox_fg: :white,
+      gruvbox_red: :red, gruvbox_green: :green,
+      gruvbox_yellow: :yellow, gruvbox_blue: :blue,
+      gruvbox_purple: :magenta, gruvbox_aqua: :cyan,
+      gruvbox_orange: :yellow, gruvbox_gray: :white,
+      # dracula
+      dracula_bg: :black, dracula_fg: :white,
+      dracula_selection: :black, dracula_comment: :blue,
+      dracula_cyan: :cyan, dracula_green: :green,
+      dracula_orange: :yellow, dracula_pink: :magenta,
+      dracula_purple: :magenta, dracula_red: :red,
+      dracula_yellow: :yellow,
+      # tokyo night
+      tokyo_bg: :black, tokyo_fg: :white,
+      tokyo_comment: :blue, tokyo_cyan: :cyan,
+      tokyo_blue: :blue, tokyo_purple: :magenta,
+      tokyo_green: :green, tokyo_orange: :yellow,
+      tokyo_red: :red, tokyo_yellow: :yellow
+    }.freeze
 
-    def initialize
+    attr_reader :pairs, :supports_256_colors
+
+    def initialize(adapter: nil)
       @pair_index = 1
       @pairs = {}
+      @pair_order = []
+      @adapter = adapter
+      configure_color_capability
     end
 
     def register_pair(fg, bg)
       key = [fg, bg]
-      return @pairs[key] if @pairs[key]
+
+      if @pairs[key]
+        touch_pair(key)
+        return @pairs[key]
+      end
+
+      # Check pair limit and evict oldest if needed
+      evict_oldest_pair if @max_pairs.positive? && @pair_index >= @max_pairs
 
       @pairs[key] = @pair_index
+      @pair_order << key
       @pair_index += 1
       @pairs[key]
     end
@@ -128,9 +225,46 @@ module Mui
       return -1 if color.nil?
       return color if color.is_a?(Integer)
 
-      COLOR_MAP[color] || EXTENDED_COLOR_MAP[color] || -1
+      resolved_color = resolve_with_fallback(color)
+      COLOR_MAP[resolved_color] || EXTENDED_COLOR_MAP[resolved_color] || -1
     end
 
     alias resolve color_code
+
+    private
+
+    def configure_color_capability
+      if @adapter.nil?
+        # Backward compatibility: assume 256 colors when adapter is not specified
+        @available_colors = 256
+        @max_pairs = 256
+        @supports_256_colors = true
+      elsif @adapter.has_colors?
+        @available_colors = @adapter.colors
+        @max_pairs = [@adapter.color_pairs, 256].min
+        @supports_256_colors = @available_colors >= 256
+      else
+        @available_colors = 0
+        @max_pairs = 0
+        @supports_256_colors = false
+      end
+    end
+
+    def resolve_with_fallback(color)
+      return color if @supports_256_colors
+      return color if COLOR_MAP.key?(color)
+
+      FALLBACK_MAP[color] || :white
+    end
+
+    def touch_pair(key)
+      @pair_order.delete(key)
+      @pair_order << key
+    end
+
+    def evict_oldest_pair
+      oldest_key = @pair_order.shift
+      @pairs.delete(oldest_key) if oldest_key
+    end
   end
 end

data/lib/mui/color_scheme.rb

@@ -27,6 +27,7 @@ module Mui
       syntax_instance_variable
       syntax_global_variable
       syntax_method_call
+      syntax_function_definition
       syntax_type
       diff_add
       diff_delete

data/lib/mui/editor.rb

@@ -238,8 +238,20 @@ module Mui
     end
 
     def render
+      # Force complete redraw if floating window or completion popup was closed
+      # This is needed because multibyte characters (CJK) can be corrupted
+      # when partially overwritten by popups
+      if @floating_window.needs_clear? || @insert_completion_state.needs_clear?
+        @screen.touchwin
+        @insert_completion_state.clear_needs_clear
+      end
+
       @screen.clear
 
+      # Clear the area where the floating window was previously displayed
+      # Must be done before window rendering to avoid overwriting text
+      @floating_window.clear_last_bounds(@screen) if @floating_window.needs_clear?
+
       @tab_bar_renderer.render(@screen, 0)
 
       window.ensure_cursor_visible

data/lib/mui/floating_window.rb

@@ -3,7 +3,7 @@
 module Mui
   # A floating window (popup) for displaying temporary content like hover info
   class FloatingWindow
-    attr_reader :content, :row, :col, :width, :height
+    attr_reader :content, :row, :col, :width, :height, :last_bounds
     attr_accessor :visible
 
     def initialize(color_scheme)
@@ -15,6 +15,8 @@ module Mui
       @height = 0
       @visible = false
       @scroll_offset = 0
+      @last_bounds = nil
+      @needs_clear = false
     end
 
     # Show the floating window with content at the specified position
@@ -27,14 +29,49 @@ module Mui
       @scroll_offset = 0
       calculate_dimensions
       @visible = true
+      @needs_clear = false
     end
 
     # Hide the floating window
     def hide
+      return unless @visible
+
+      # Record bounds for clearing on next render
+      @last_bounds = {
+        row: @row,
+        col: @col,
+        width: @width,
+        height: @height
+      }
+      @needs_clear = true
       @visible = false
       @content = []
     end
 
+    # Check if the previous window area needs to be cleared
+    def needs_clear?
+      @needs_clear && @last_bounds
+    end
+
+    # Clear the area where the floating window was previously displayed
+    def clear_last_bounds(screen)
+      return unless needs_clear?
+
+      bounds = @last_bounds
+      adjusted_row, adjusted_col = adjust_position_for_bounds(screen, bounds)
+
+      bounds[:height].times do |i|
+        row = adjusted_row + i
+        next if row.negative? || row >= screen.height
+
+        spaces = " " * bounds[:width]
+        screen.put(row, adjusted_col, spaces)
+      end
+
+      @needs_clear = false
+      @last_bounds = nil
+    end
+
     # Scroll content up
     def scroll_up
       @scroll_offset = [@scroll_offset - 1, 0].max if @visible
@@ -105,6 +142,21 @@ module Mui
       [row, col]
     end
 
+    def adjust_position_for_bounds(screen, bounds)
+      row = bounds[:row]
+      col = bounds[:col]
+
+      # Adjust horizontal position
+      col = screen.width - bounds[:width] if col + bounds[:width] > screen.width
+      col = [col, 0].max
+
+      # Adjust vertical position
+      row = bounds[:row] - bounds[:height] if row + bounds[:height] > screen.height
+      row = [row, 0].max
+
+      [row, col]
+    end
+
     def draw_border(screen, row, col)
       style = @color_scheme[:floating_window] || @color_scheme[:completion_popup]
 

data/lib/mui/highlighters/syntax_highlighter.rb

@@ -19,6 +19,7 @@ module Mui
         instance_variable: :syntax_instance_variable,
         global_variable: :syntax_global_variable,
         method_call: :syntax_method_call,
+        function_definition: :syntax_function_definition,
         type: :syntax_type,
         macro: :syntax_keyword,    # Rust macros (println!, vec!, etc.)
         regex: :syntax_string      # JavaScript/TypeScript regex literals

data/lib/mui/insert_completion_state.rb

@@ -6,16 +6,29 @@ module Mui
     attr_reader :items, :selected_index, :prefix, :original_items
 
     def initialize
-      reset
+      @needs_clear = false
+      reset(set_needs_clear: false)
     end
 
-    def reset
+    def reset(set_needs_clear: true)
+      # Set needs_clear flag if we had items (popup was visible)
+      @needs_clear = true if set_needs_clear && !@items.empty?
       @items = []
       @original_items = []
       @selected_index = 0
       @prefix = ""
     end
 
+    # Check if the previous popup area needs to be cleared
+    def needs_clear?
+      @needs_clear
+    end
+
+    # Clear the needs_clear flag after redraw
+    def clear_needs_clear
+      @needs_clear = false
+    end
+
     def active?
       !@items.empty?
     end

data/lib/mui/key_notation_parser.rb

@@ -10,6 +10,8 @@ module Mui
     SPECIAL_KEYS = {
       "space" => " ",
       "tab" => "\t",
+      "s-tab" => :shift_tab,
+      "btab" => :shift_tab,
       "cr" => "\r",
       "enter" => "\r",
       "return" => "\r",
@@ -92,15 +94,18 @@ module Mui
       def parse_special(name)
         return :leader if name.casecmp?("leader")
 
+        # Check SPECIAL_KEYS first (handles <S-Tab>, <btab>, etc.)
+        normalized_name = name.downcase
+        return SPECIAL_KEYS[normalized_name] if SPECIAL_KEYS.key?(normalized_name)
+
         # Handle Ctrl key: <C-x>, <Ctrl-x>, <C-X>
         return parse_ctrl_key(::Regexp.last_match(2)) if name =~ /\A(c|ctrl)-(.+)\z/i
 
         # Handle Shift key: <S-x>, <Shift-x>
         return parse_shift_key(::Regexp.last_match(2)) if name =~ /\A(s|shift)-(.+)\z/i
 
-        # Handle other special keys
-        normalized_name = name.downcase
-        SPECIAL_KEYS[normalized_name] || name
+        # Unknown special key - return as-is
+        name
       end
 
       # Normalize an input key (from terminal) to internal representation
@@ -136,6 +141,8 @@ module Mui
           "\e"
         when KeyCode::TAB
           "\t"
+        when 353 # Curses::KEY_BTAB (Shift+Tab)
+          :shift_tab
         when KeyCode::BACKSPACE
           "\x7f"
         when 0..31

data/lib/mui/screen.rb

@@ -25,6 +25,12 @@ module Mui
       @adapter.clear
     end
 
+    # Force a complete redraw of the screen
+    # This is needed when multibyte characters may have been corrupted
+    def touchwin
+      @adapter.touchwin
+    end
+
     def put(y, x, text)
       return if y.negative?
       return if y >= @height || x >= @width

data/lib/mui/search_state.rb

@@ -62,49 +62,62 @@ module Mui
     end
 
     # Get matches for a specific row in a specific buffer
+    # O(1) lookup using row_index
     def matches_for_row(row, buffer: nil)
       return [] if buffer.nil?
 
-      matches = get_or_calculate_matches(buffer)
-      matches.select { |m| m[:row] == row }
+      cache = get_or_calculate_cache(buffer)
+      cache[:row_index][row] || []
     end
 
     private
 
     def get_or_calculate_matches(buffer)
+      get_or_calculate_cache(buffer)[:matches]
+    end
+
+    def get_or_calculate_cache(buffer)
       buffer_id = buffer.object_id
       cached = @buffer_matches[buffer_id]
 
-      # Return cached matches if valid (same pattern version and buffer hasn't changed)
-      return cached[:matches] if cached && cached[:version] == @pattern_version && cached[:change_count] == buffer.change_count
+      # Return cached data if valid (same pattern version and buffer hasn't changed)
+      return cached if cached && cached[:version] == @pattern_version && cached[:change_count] == buffer.change_count
 
       # Calculate and cache matches for this buffer
-      matches = calculate_matches(buffer)
+      matches, row_index = calculate_matches(buffer)
       @buffer_matches[buffer_id] = {
         version: @pattern_version,
         change_count: buffer.change_count,
-        matches:
+        matches:,
+        row_index:
       }
-      matches
+      @buffer_matches[buffer_id]
     end
 
     def calculate_matches(buffer)
-      return [] if @pattern.nil? || @pattern.empty?
+      empty_result = [[], {}]
+      return empty_result if @pattern.nil? || @pattern.empty?
 
       matches = []
+      row_index = {}
       begin
         regex = Regexp.new(@pattern)
         buffer.line_count.times do |row|
           line = buffer.line(row)
-          scan_line_matches(matches, line, row, regex)
+          row_matches = scan_line_matches(line, row, regex)
+          unless row_matches.empty?
+            matches.concat(row_matches)
+            row_index[row] = row_matches
+          end
         end
       rescue RegexpError
         # Invalid regex pattern - no matches
       end
-      matches
+      [matches, row_index]
     end
 
-    def scan_line_matches(matches, line, row, regex)
+    def scan_line_matches(line, row, regex)
+      matches = []
       offset = 0
       while (match_data = line.match(regex, offset))
         col = match_data.begin(0)
@@ -116,6 +129,7 @@ module Mui
         offset += 1 if match_data[0].empty?
         break if offset >= line.length
       end
+      matches
     end
   end
 end