marvi 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e3091d68f7f5ccd8b131401fd1dce1b010e7d8108125430de3c47bd68b403d4
-  data.tar.gz: f52d7849ff7982cb1b988b0e5e5e1c9a496661c56e689bd008fe34347b84dd7f
+  metadata.gz: a3372fe5ca768321491d123b2591149b77594c9ab0b2bbc4008e16f6b542bcba
+  data.tar.gz: 68e2bad815cf3b20c461a8285df8944d568640288e8bfc3aef40117d5095fccb
 SHA512:
-  metadata.gz: 54848bb6e78b5833c96eb6aaea4de9869c5dcd18c381c9b05dc69e1d2d9528f93be9846068bf89acc56f569c54b37e96bbd7868c070802b0ae644f98fa8914ed
-  data.tar.gz: d645f16e52d118bf57ef02dc5009cede7e7400377e7c6640030c78a36392ff37adab60a2bfbe8f88e749107bed3f57b153ab8f50754fc22ba822ff948adcbfcf
+  metadata.gz: 7ae44f8bdbc6ab8326b986b5663cbf81a79ef6682871af01157c7d390e75f77de907cae36e4a761d4f46e82aefbd42d070c991d98a0fb498300c6eff856ff1bf
+  data.tar.gz: a2554b23a557bdec28fcca02afa213edf865f5354ce7673faa16db15d494781a9d9eb7e9d1bcb482b0752806ee943bf486b318c36bab73d7e573b19890a2c54a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.7.0] - 2026-06-15
+
+- Add incremental search to the curses pager. Press `/` to search as you type, with all matches highlighted (current match in bold) and the view jumping to the nearest match. Navigate matches with `n`/`N` (vi/less style); search is case-insensitive.
+
 ## [0.6.0] - 2026-06-11
 
 - Render Mermaid fenced code blocks as Unicode box-drawing art. Supports `flowchart`/`graph` (TD/TB/LR/RL), `sequenceDiagram`, `classDiagram`, and `stateDiagram`/`stateDiagram-v2`. Unsupported diagram types, malformed syntax, and over-width output fall back to the highlighted code block.

data/lib/marvi/renderer/curses.rb

@@ -33,6 +33,10 @@ module Marvi
         @file = file
         @markdown = markdown
         @scroll = 0
+        @search_query = nil
+        @search_input = nil
+        @matches = []
+        @current_match = nil
         mark_reloaded
 
         init_curses_state
@@ -123,6 +127,9 @@ module Marvi
                       draw
         when "G" then @scroll = max_scroll
                       draw
+        when "/" then start_search
+        when "n" then jump_match(1)
+        when "N" then jump_match(-1)
         when "e" then launch_editor if @file
         when "r", "R" then reload_from_key if @file
         when ::Curses::Key::RESIZE then handle_resize
@@ -132,6 +139,7 @@ module Marvi
       def handle_resize
         rewalk
         @scroll = [@scroll, max_scroll].min
+        refresh_search_after_rewalk
         draw
       end
 
@@ -197,6 +205,7 @@ module Marvi
         @markdown = File.read(@file)
         rewalk
         @scroll = [@scroll, max_scroll].min
+        refresh_search_after_rewalk
       end
 
       def init_curses_state
@@ -236,7 +245,7 @@ module Marvi
         padding = horizontal_padding
         visible_lines.each_with_index do |line, row|
           ::Curses.setpos(row, padding)
-          render_line(line)
+          render_line(line, highlight_ranges_for(@scroll + row))
         end
         draw_status_bar
         ::Curses.refresh
@@ -247,7 +256,7 @@ module Marvi
         top = @scroll + 1
         bottom = [@scroll + page_size, @lines.size].min
         edit_hint = @file ? "  e edit" : ""
-        status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom#{edit_hint}  q quit"
+        status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom  / search#{search_hint}#{edit_hint}  q quit"
         updated_hint = @file_updated ? "  ● updated (r to reload) " : ""
         available = [::Curses.cols - updated_hint.length, 0].max
 
@@ -261,23 +270,65 @@ module Marvi
         end
       end
 
-      def render_line(line)
+      def render_line(line, highlights = nil)
+        col = 0
         line.spans.each do |span|
-          render_span(span)
+          render_span(span, col, highlights)
+          col += span.text.length
         rescue ::Curses::Error
           # ignore write errors at line edge
         end
       end
 
-      def render_span(span)
+      def render_span(span, col_offset = 0, highlights = nil)
         attr = build_attr(span)
+        if highlights.nil? || highlights.empty?
+          write_text(span.text, attr)
+          return
+        end
+
+        highlight_segments(span.text, col_offset, highlights).each do |text, state|
+          seg_attr = attr
+          seg_attr |= ::Curses::A_REVERSE if state
+          seg_attr |= ::Curses::A_BOLD if state == :current
+          write_text(text, seg_attr)
+        end
+      end
+
+      def write_text(text, attr)
         if attr != 0
-          ::Curses.attron(attr) { ::Curses.addstr(span.text) }
+          ::Curses.attron(attr) { ::Curses.addstr(text) }
         else
-          ::Curses.addstr(span.text)
+          ::Curses.addstr(text)
         end
       end
 
+      # Split a span's text into runs of identical highlight state so each run can
+      # be drawn with the matching attributes. Highlight ranges are expressed in
+      # whole-line character offsets, hence col_offset locates this span on the line.
+      def highlight_segments(text, col_offset, highlights)
+        chars = text.chars
+        states = Array.new(chars.length)
+        highlights.each do |start, finish, current|
+          start.upto(finish - 1) do |c|
+            idx = c - col_offset
+            next if idx.negative? || idx >= chars.length
+            states[idx] = :current if current
+            states[idx] ||= true
+          end
+        end
+
+        segments = []
+        chars.each_with_index do |ch, i|
+          if segments.empty? || segments.last[1] != states[i]
+            segments << [ch.dup, states[i]]
+          else
+            segments.last[0] << ch
+          end
+        end
+        segments
+      end
+
       def build_attr(span)
         attr = 0
         attr |= ::Curses::A_BOLD if span.bold
@@ -309,6 +360,141 @@ module Marvi
         @scroll = (@scroll + delta).clamp(0, max_scroll)
         draw
       end
+
+      # --- Incremental search ---
+
+      BACKSPACE_KEYS = [127, 8].freeze
+
+      def start_search
+        @search_input = ""
+        update_search(@search_input)
+        draw_search_prompt
+
+        loop do
+          key = ::Curses.getch
+          next if key.nil? || key == -1
+
+          case key
+          when 27 # ESC cancels and clears the search
+            clear_search
+            draw
+            return
+          when "\n", "\r", 10, 13, ::Curses::Key::ENTER
+            commit_search
+            return
+          when *BACKSPACE_KEYS, ::Curses::Key::BACKSPACE
+            @search_input = @search_input[0...-1] || ""
+            update_search(@search_input)
+            draw_search_prompt
+          else
+            next unless key.is_a?(String) && key.match?(/\A[[:print:]]\z/)
+            @search_input += key
+            update_search(@search_input)
+            draw_search_prompt
+          end
+        end
+      end
+
+      def update_search(query)
+        @search_query = query
+        recompute_matches
+        focus_match_from(@scroll) unless @matches.empty?
+        draw
+      end
+
+      def commit_search
+        if @search_query.to_s.empty? || @matches.empty?
+          clear_search
+        end
+        @search_input = nil
+        draw
+      end
+
+      def clear_search
+        @search_query = nil
+        @search_input = nil
+        @matches = []
+        @current_match = nil
+      end
+
+      def recompute_matches
+        @matches = []
+        @current_match = nil
+        needle = @search_query.to_s.downcase
+        return if needle.empty?
+
+        @lines.each_with_index do |line, line_index|
+          haystack = line.plain_text.downcase
+          next if haystack.empty?
+
+          pos = 0
+          while (idx = haystack.index(needle, pos))
+            @matches << [line_index, idx, idx + needle.length]
+            pos = idx + needle.length
+          end
+        end
+      end
+
+      def focus_match_from(from_line)
+        return if @matches.empty?
+        index = @matches.index { |match| match[0] >= from_line } || 0
+        set_current_match(index)
+      end
+
+      def set_current_match(index)
+        return if @matches.empty?
+        @current_match = index % @matches.size
+        ensure_match_visible(@matches[@current_match][0])
+      end
+
+      def ensure_match_visible(line_index)
+        if line_index < @scroll || line_index >= @scroll + page_size
+          @scroll = [line_index, max_scroll].min
+        end
+      end
+
+      def jump_match(direction)
+        return if @matches.empty?
+        if @current_match.nil?
+          focus_match_from(@scroll)
+        else
+          set_current_match(@current_match + direction)
+        end
+        draw
+      end
+
+      def refresh_search_after_rewalk
+        return unless @search_query
+        recompute_matches
+        focus_match_from(@scroll) unless @matches.empty?
+      end
+
+      def highlight_ranges_for(line_index)
+        return nil if @matches.empty?
+        ranges = []
+        @matches.each_with_index do |(li, start, finish), i|
+          ranges << [start, finish, i == @current_match] if li == line_index
+        end
+        ranges.empty? ? nil : ranges
+      end
+
+      def search_hint
+        return "  n/N next/prev" if @search_query.nil? || @search_query.empty?
+        return "  no matches: #{@search_query}" if @matches.empty?
+
+        position = @current_match ? @current_match + 1 : 0
+        "  [#{position}/#{@matches.size}] n/N"
+      end
+
+      def draw_search_prompt
+        prompt = "/#{@search_input}"
+        ::Curses.setpos(::Curses.lines - 1, 0)
+        ::Curses.attron(::Curses.color_pair(COLOR_PAIRS[:cyan])) do
+          ::Curses.addstr(prompt.ljust(::Curses.cols)[0, ::Curses.cols])
+        end
+        ::Curses.setpos(::Curses.lines - 1, [prompt.length, ::Curses.cols - 1].min)
+        ::Curses.refresh
+      end
     end
   end
 end

data/lib/marvi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marvi
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvi
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Mitsutaka Mimura