marvi 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0110473458c01229add5274f0ab0df77dad55587286ee01c426612fa0505707
-  data.tar.gz: 8e59b8386b4fb283613a2fc81d2841473ccd78eaa216a4608e10c17ae62c61b0
+  metadata.gz: 519a600dd8ba2e4c6934cf57f37914337ce252ced2a51d6b05dff2ab2c1dda4b
+  data.tar.gz: '02669ac614cde421459555a5068429e1371036dd90eb549f5a90d6f3e3aea90c'
 SHA512:
-  metadata.gz: 3abaf2190555600e5e04cd0a04d7176d6ef5b8384afc902cff76389ec782a448bd99609cf2474d7f62827bc24750514b7517cf780b61739c327a665bb3cc9821
-  data.tar.gz: 2caddfb8de48b8fc5f6c894f839d06239b57845993a67f576f8cde2cb6591509d3167dbe35d11636e1c03f5cb140e2c16cfeec945bf8204eeb4095f3a31c8bcb
+  metadata.gz: 37a67589e93f21f02d2c7cec09130e2a63ce83e88ebe21c61cf643b4810506ff4ece12ca39d8c36a40cbccaca35ecf8984e1c8276f953b0e17bf2b9caf4f98de
+  data.tar.gz: 12fa9234e6fb3dd1b13b72b5008a239acea242b049ae4086d6e2a8565435b4727fd5850c5766d79f05bbc48332719f7a2b97609725c8834ca1f6083d4a7acf02

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.4.1] - 2026-05-26
+
+- Wrap long text in bulleted/ordered lists, paragraphs, headers, and blockquotes so it no longer overflows the terminal width. List items and headers use a hanging indent for continuation lines. (#1)
+
 ## [0.4.0] - 2026-05-18
 
 - Bind `Ctrl-D` / `Ctrl-U` for vim-style half-page scrolling in the curses pager.

data/lib/marvi/ast_walker.rb

@@ -29,7 +29,8 @@ module Marvi
         render_header(el)
       when :p
         src = el.options[:location]
-        [RichLine.new(render_inline_children(el), source_line: src), RichLine.blank]
+        wrapped = wrap_spans(render_inline_children(el), @max_width)
+        wrapped.each_with_index.map { |spans, i| RichLine.new(spans, source_line: (i.zero? ? src : nil)) } + [RichLine.blank]
       when :ul
         el.children.flat_map { |child| render_block(child, indent: indent, list_type: :ul) } + [RichLine.blank]
       when :ol
@@ -62,12 +63,15 @@ module Marvi
       content = render_inline_children(el).map do |s|
         Span.new(text: s.text, bold: true, italic: s.italic, color: s.color || color, bg_color: s.bg_color)
       end
-      [RichLine.new([prefix] + content, source_line: src), RichLine.blank]
+      wrap_with_prefix([prefix], content, @max_width, source_line: src) + [RichLine.blank]
     end
 
     def render_li(el, indent:, list_type:, list_index:)
       bullet = (list_type == :ol) ? "#{list_index}." : "•"
       prefix = Span.new(text: "#{"  " * indent}#{bullet} ", color: :cyan)
+      prefix_width = spans_display_width([prefix])
+      hanging = Span.new(text: " " * prefix_width)
+      inner_width = [@max_width - prefix_width, MIN_COL_WIDTH].max
       src = el.options[:location]
       lines = []
 
@@ -78,16 +82,25 @@ module Marvi
           nested.pop while nested.last&.plain_text&.empty?
           lines += nested
         when :p
+          content_spans = render_inline_children(child)
           if lines.empty?
-            lines << RichLine.new([prefix] + render_inline_children(child), source_line: src)
+            lines += wrap_with_prefix([prefix], content_spans, @max_width, source_line: src)
           else
-            lines += render_block(child)
+            child_src = child.options[:location]
+            wrapped = wrap_spans(content_spans, inner_width)
+            wrapped.each_with_index do |spans, i|
+              lines << RichLine.new([hanging] + spans, source_line: (i.zero? ? child_src : nil))
+            end
+            lines << RichLine.blank
           end
         else
-          lines << if lines.empty?
-            RichLine.new([prefix] + render_inline(child), source_line: src)
+          content_spans = render_inline(child)
+          if lines.empty?
+            lines += wrap_with_prefix([prefix], content_spans, @max_width, source_line: src)
           else
-            RichLine.new(render_inline(child))
+            wrap_spans(content_spans, inner_width).each do |spans|
+              lines << RichLine.new([hanging] + spans)
+            end
           end
         end
       end
@@ -110,9 +123,14 @@ module Marvi
     end
 
     def render_blockquote(el)
-      inner = el.children.flat_map { |child| render_block(child) }
       prefix = Span.new(text: "│ ", color: :cyan)
-      # preserve source_line from inner lines
+      prefix_width = spans_display_width([prefix])
+      # Reduce @max_width while rendering inner content so the │ prefix fits within @max_width
+      # without forcing a second wrap pass on already-wrapped lines.
+      saved_width = @max_width
+      @max_width = [saved_width - prefix_width, MIN_COL_WIDTH].max
+      inner = el.children.flat_map { |child| render_block(child) }
+      @max_width = saved_width
       inner.map { |line| RichLine.new([prefix] + line.spans, source_line: line.source_line) } + [RichLine.blank]
     end
 
@@ -177,6 +195,17 @@ module Marvi
       shrunk
     end
 
+    def wrap_with_prefix(prefix_spans, content_spans, max_width, source_line: nil)
+      prefix_width = spans_display_width(prefix_spans)
+      inner_width = [max_width - prefix_width, MIN_COL_WIDTH].max
+      wrapped = wrap_spans(content_spans, inner_width)
+      indent = Span.new(text: " " * prefix_width)
+      wrapped.each_with_index.map do |spans, i|
+        line_prefix = i.zero? ? prefix_spans : [indent]
+        RichLine.new(line_prefix + spans, source_line: (i.zero? ? source_line : nil))
+      end
+    end
+
     def wrap_spans(spans, width)
       lines = [[]]
       current_width = 0

data/lib/marvi/version.rb

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

metadata

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