marvi 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ff0488e214dd427a028dabe9d240bee43e48ac27cef895e7f8584b41695435
-  data.tar.gz: 71dcd3de576d8926b90cae6ec4b79732be3627b85922351585b624b064eafb94
+  metadata.gz: 99ac52daecfd730bdd05ef63523075b5e4ad3229637208a99a083199518864dd
+  data.tar.gz: 4daae68331c1edf707b6c520c3defe941e9273b937e6618711b145e13568eed4
 SHA512:
-  metadata.gz: 1f90d2999b6336d1fa26f8ef441c8e51e551f4f7d229633053acc9ab8418fe115bcd6ea3f8fa3b67ce678781b29198acc33fd1ed69f591611a47bc97b456901c
-  data.tar.gz: 82bcdfbe5166bcd2f48d2367da468df0290c89e831d16fa06dced445dba98a2ba0846c659a87e9f69a1dd2e68c900f9cccdaaa57790bb0f35ddcb2c4b8d8dc0e
+  metadata.gz: 775e51510484dac676928c537175db222f682d3d66c74691e248616442f042f294ae896c270531475e1cdc989dde1c1a5cb957df6acdf4159e0157b4d51f3d1f
+  data.tar.gz: b00bffa8ef8adaa9e5dab84df060e31d96ffad92e473bfb544df2962c3986cb26db06c35299902a4e341dd9c91422642b06ea9e3ab15e1c8089e64f64f352d56

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [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.

data/lib/marvi/ast_walker.rb

@@ -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

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)
@@ -100,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)
@@ -278,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.2"
+  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.2
+  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