marvi 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519a600dd8ba2e4c6934cf57f37914337ce252ced2a51d6b05dff2ab2c1dda4b
-  data.tar.gz: '02669ac614cde421459555a5068429e1371036dd90eb549f5a90d6f3e3aea90c'
+  metadata.gz: 99ac52daecfd730bdd05ef63523075b5e4ad3229637208a99a083199518864dd
+  data.tar.gz: 4daae68331c1edf707b6c520c3defe941e9273b937e6618711b145e13568eed4
 SHA512:
-  metadata.gz: 37a67589e93f21f02d2c7cec09130e2a63ce83e88ebe21c61cf643b4810506ff4ece12ca39d8c36a40cbccaca35ecf8984e1c8276f953b0e17bf2b9caf4f98de
-  data.tar.gz: 12fa9234e6fb3dd1b13b72b5008a239acea242b049ae4086d6e2a8565435b4727fd5850c5766d79f05bbc48332719f7a2b97609725c8834ca1f6083d4a7acf02
+  metadata.gz: 775e51510484dac676928c537175db222f682d3d66c74691e248616442f042f294ae896c270531475e1cdc989dde1c1a5cb957df6acdf4159e0157b4d51f3d1f
+  data.tar.gz: b00bffa8ef8adaa9e5dab84df060e31d96ffad92e473bfb544df2962c3986cb26db06c35299902a4e341dd9c91422642b06ea9e3ab15e1c8089e64f64f352d56

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.5.0] - 2026-06-02
+
+- Syntax-highlight fenced code blocks via [Rouge](https://github.com/rouge-ruby/rouge). Blocks without a language (or with an unknown one) fall back to the previous single-color rendering.
+- Extend the dark code block background to the longest line so the block reads as a solid pane instead of a ragged shape.
+
+## [0.4.2] - 2026-05-31
+
+- Add left/right padding in the curses pager so content no longer sits flush against the terminal edges. Padding scales with terminal width.
+- Render every line of a multi-line blockquote with its `│ ` prefix.
+- Stop emitting an empty `│ ` line at the end of blockquotes.
+- Collapse consecutive blank lines so block-level elements are separated by a single blank line.
+
 ## [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)

data/lib/marvi/ast_walker.rb

@@ -16,7 +16,7 @@ module Marvi
       doc = Kramdown::Document.new(markdown, input: "GFM")
       lines = render_block(doc.root)
       lines.pop while lines.last&.plain_text&.empty?
-      lines
+      collapse_consecutive_blanks(lines)
     end
 
     private
@@ -112,11 +112,24 @@ module Marvi
       lang = el.options[:lang]
       lines = []
       lines << RichLine.new([Span.new(text: lang, color: :yellow)], source_line: src) if lang
-      el.value.chomp.split("\n").each_with_index do |line, i|
-        line_src = if src
-          src + i + (lang ? 1 : 0)
+
+      code = el.value.chomp
+      unless code.empty?
+        line_offset = lang ? 1 : 0
+        indent = Span.new(text: "  ", bg_color: :dark)
+        indent_width = spans_display_width([indent])
+
+        highlighted = Highlighter.lines(code, lang)
+        content_widths = highlighted.map { |spans| spans_display_width(spans) }
+        block_width = [content_widths.max || 0, @max_width - indent_width].min
+
+        highlighted.each_with_index do |spans, i|
+          line_src = src ? src + i + line_offset : nil
+          line_spans = [indent] + spans
+          pad = block_width - content_widths[i]
+          line_spans << Span.new(text: " " * pad, bg_color: :dark) if pad > 0
+          lines << RichLine.new(line_spans, source_line: line_src)
         end
-        lines << RichLine.new([Span.new(text: "  #{line}", color: :green, bg_color: :dark)], source_line: line_src)
       end
       lines << RichLine.blank
       lines
@@ -131,9 +144,26 @@ module Marvi
       @max_width = [saved_width - prefix_width, MIN_COL_WIDTH].max
       inner = el.children.flat_map { |child| render_block(child) }
       @max_width = saved_width
+      # Trim trailing blanks and collapse runs of blanks so the │ prefix doesn't produce
+      # dangling/duplicated "│ " lines (kramdown emits both :p trailing blanks and explicit
+      # :blank elements between siblings).
+      inner.pop while inner.last&.plain_text&.empty?
+      inner = collapse_consecutive_blanks(inner)
       inner.map { |line| RichLine.new([prefix] + line.spans, source_line: line.source_line) } + [RichLine.blank]
     end
 
+    def collapse_consecutive_blanks(lines)
+      out = []
+      prev_blank = false
+      lines.each do |line|
+        is_blank = line.plain_text.empty?
+        next if is_blank && prev_blank
+        out << line
+        prev_blank = is_blank
+      end
+      out
+    end
+
     def render_table(el)
       src = el.options[:location]
       rows = el.children.flat_map(&:children)
@@ -210,34 +240,43 @@ module Marvi
       lines = [[]]
       current_width = 0
       spans.each do |span|
-        text = span.text.dup
-        until text.empty?
-          remaining = width - current_width
-          if remaining <= 0
+        # Split on \n so embedded hard line breaks become separate RichLines downstream,
+        # otherwise Curses.addstr resets the cursor to column 0 and bypasses padding/prefix.
+        parts = span.text.split("\n", -1)
+        parts.each_with_index do |part, idx|
+          if idx > 0 && !lines.last.empty?
             lines << []
             current_width = 0
-            remaining = width
-          end
-          taken = 0
-          chunk_width = 0
-          text.each_char do |c|
-            cw = Unicode::DisplayWidth.of(c)
-            break if chunk_width + cw > remaining
-            chunk_width += cw
-            taken += c.bytesize
           end
-          if taken.zero?
-            first_char = text.each_char.first
-            taken = first_char.bytesize
-            chunk_width = Unicode::DisplayWidth.of(first_char)
-          end
-          chunk = text.byteslice(0, taken)
-          text = text.byteslice(taken..) || ""
-          lines.last << Span.new(text: chunk, bold: span.bold, italic: span.italic, color: span.color, bg_color: span.bg_color)
-          current_width += chunk_width
-          unless text.empty?
-            lines << []
-            current_width = 0
+          text = part.dup
+          until text.empty?
+            remaining = width - current_width
+            if remaining <= 0
+              lines << []
+              current_width = 0
+              remaining = width
+            end
+            taken = 0
+            chunk_width = 0
+            text.each_char do |c|
+              cw = Unicode::DisplayWidth.of(c)
+              break if chunk_width + cw > remaining
+              chunk_width += cw
+              taken += c.bytesize
+            end
+            if taken.zero?
+              first_char = text.each_char.first
+              taken = first_char.bytesize
+              chunk_width = Unicode::DisplayWidth.of(first_char)
+            end
+            chunk = text.byteslice(0, taken)
+            text = text.byteslice(taken..) || ""
+            lines.last << Span.new(text: chunk, bold: span.bold, italic: span.italic, color: span.color, bg_color: span.bg_color)
+            current_width += chunk_width
+            unless text.empty?
+              lines << []
+              current_width = 0
+            end
           end
         end
       end

data/lib/marvi/highlighter.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require "rouge"
+
+module Marvi
+  class Highlighter
+    DEFAULT_COLOR = :white
+    FALLBACK_COLOR = :green
+
+    # Ordered so longer qualnames win over their prefixes (e.g. "Literal.String" before "Literal").
+    TOKEN_COLOR_RULES = [
+      ["Comment", :cyan],
+      ["Keyword", :yellow],
+      ["Literal.String", :green],
+      ["Literal.Number", :magenta],
+      ["Literal", :magenta],
+      ["Name.Function", :cyan],
+      ["Name.Class", :cyan],
+      ["Name.Namespace", :cyan],
+      ["Name.Tag", :cyan],
+      ["Name.Attribute", :cyan],
+      ["Name.Decorator", :cyan],
+      ["Name.Constant", :magenta],
+      ["Name.Builtin", :magenta],
+      ["Operator", :white],
+      ["Punctuation", :white],
+      ["Error", :magenta]
+    ].freeze
+
+    COMMENT_PREFIX = "Comment"
+
+    def self.lines(code, lang, bg_color: :dark)
+      lexer = resolve_lexer(lang)
+      return fallback(code, bg_color) if lexer.nil?
+      tokens_to_lines(lexer.lex(code), bg_color)
+    end
+
+    def self.resolve_lexer(lang)
+      return nil if lang.nil? || lang.empty?
+      Rouge::Lexer.find(lang)
+    rescue
+      nil
+    end
+
+    def self.fallback(code, bg_color)
+      code.split("\n", -1).map { |line| [Span.new(text: line, color: FALLBACK_COLOR, bg_color: bg_color)] }
+    end
+
+    def self.tokens_to_lines(tokens, bg_color)
+      current = []
+      lines = []
+      tokens.each do |tok, val|
+        color = token_color(tok)
+        italic = comment?(tok)
+        val.split("\n", -1).each_with_index do |part, idx|
+          if idx > 0
+            lines << current
+            current = []
+          end
+          next if part.empty?
+          current << Span.new(text: part, italic: italic, color: color, bg_color: bg_color)
+        end
+      end
+      lines << current
+      lines
+    end
+
+    def self.token_color(token)
+      qual = token.qualname
+      TOKEN_COLOR_RULES.each do |prefix, color|
+        return color if qual == prefix || qual.start_with?("#{prefix}.")
+      end
+      DEFAULT_COLOR
+    end
+
+    def self.comment?(token)
+      qual = token.qualname
+      qual == COMMENT_PREFIX || qual.start_with?("#{COMMENT_PREFIX}.")
+    end
+  end
+end

data/lib/marvi/renderer/curses.rb

@@ -12,8 +12,11 @@ module Marvi
         yellow: 3,
         magenta: 4,
         white: 5,
-        green_on_dark: 6,
-        cyan_on_dark: 7
+        cyan_on_dark: 6,
+        green_on_dark: 7,
+        yellow_on_dark: 8,
+        magenta_on_dark: 9,
+        white_on_dark: 10
       }.freeze
 
       ITALIC_ATTR = (defined?(::Curses::A_ITALIC) ? ::Curses::A_ITALIC : 0)
@@ -23,6 +26,9 @@ module Marvi
       CTRL_D = 4
       CTRL_U = 21
 
+      MIN_HORIZONTAL_PADDING = 2
+      HORIZONTAL_PADDING_DIVISOR = 12
+
       def render(markdown, file: nil)
         @file = file
         @markdown = markdown
@@ -97,8 +103,11 @@ module Marvi
         ::Curses.init_pair(COLOR_PAIRS[:yellow], ::Curses::COLOR_YELLOW, -1)
         ::Curses.init_pair(COLOR_PAIRS[:magenta], ::Curses::COLOR_MAGENTA, -1)
         ::Curses.init_pair(COLOR_PAIRS[:white], ::Curses::COLOR_WHITE, -1)
-        ::Curses.init_pair(COLOR_PAIRS[:green_on_dark], ::Curses::COLOR_GREEN, ::Curses::COLOR_BLACK)
         ::Curses.init_pair(COLOR_PAIRS[:cyan_on_dark], ::Curses::COLOR_CYAN, ::Curses::COLOR_BLACK)
+        ::Curses.init_pair(COLOR_PAIRS[:green_on_dark], ::Curses::COLOR_GREEN, ::Curses::COLOR_BLACK)
+        ::Curses.init_pair(COLOR_PAIRS[:yellow_on_dark], ::Curses::COLOR_YELLOW, ::Curses::COLOR_BLACK)
+        ::Curses.init_pair(COLOR_PAIRS[:magenta_on_dark], ::Curses::COLOR_MAGENTA, ::Curses::COLOR_BLACK)
+        ::Curses.init_pair(COLOR_PAIRS[:white_on_dark], ::Curses::COLOR_WHITE, ::Curses::COLOR_BLACK)
       end
 
       def handle_key(key)
@@ -127,7 +136,17 @@ module Marvi
       end
 
       def rewalk
-        @lines = ASTWalker.new.walk(@markdown, max_width: ::Curses.cols)
+        @lines = ASTWalker.new.walk(@markdown, max_width: content_width)
+      end
+
+      def horizontal_padding
+        cols = ::Curses.cols
+        return 0 if cols <= MIN_HORIZONTAL_PADDING * 2
+        [MIN_HORIZONTAL_PADDING, cols / HORIZONTAL_PADDING_DIVISOR].max
+      end
+
+      def content_width
+        [::Curses.cols - horizontal_padding * 2, 1].max
       end
 
       def reload_from_key
@@ -214,8 +233,9 @@ module Marvi
 
       def draw
         ::Curses.clear
+        padding = horizontal_padding
         visible_lines.each_with_index do |line, row|
-          ::Curses.setpos(row, 0)
+          ::Curses.setpos(row, padding)
           render_line(line)
         end
         draw_status_bar
@@ -264,7 +284,7 @@ module Marvi
         attr |= ITALIC_ATTR if span.italic
 
         pair_key = if span.bg_color == :dark
-          (span.color == :cyan) ? :cyan_on_dark : :green_on_dark
+          :"#{span.color || :green}_on_dark"
         elsif span.color
           span.color
         end

data/lib/marvi/version.rb

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

data/lib/marvi.rb

@@ -3,6 +3,7 @@
 require_relative "marvi/version"
 require_relative "marvi/ansi"
 require_relative "marvi/document"
+require_relative "marvi/highlighter"
 require_relative "marvi/ast_walker"
 require_relative "marvi/renderer/ansi"
 require_relative "marvi/renderer/curses"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvi
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Mitsutaka Mimura
@@ -65,6 +65,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 description: Renders Markdown with ANSI colors in pipes and an interactive curses
   pager in TTY.
 email:
@@ -86,6 +106,7 @@ files:
 - lib/marvi/ansi.rb
 - lib/marvi/ast_walker.rb
 - lib/marvi/document.rb
+- lib/marvi/highlighter.rb
 - lib/marvi/renderer/ansi.rb
 - lib/marvi/renderer/curses.rb
 - lib/marvi/version.rb