marvi 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81a8d64fd49b33e6d17b7d1b2bf898bca77b6abb347ec5d4f6844f6b2969b647
-  data.tar.gz: b8020fc1f24ab9806f1dc3d8b94baf4061e6ab329a0dc54598db747465e5c5d7
+  metadata.gz: 41854d878cdc8137d35b7c54ff30ffb13b90206869828a6db31bd53b8d279f1b
+  data.tar.gz: 396301e10a2d99ffd4c27526b1e792495c286450ae3e4c213ace369ea2b96706
 SHA512:
-  metadata.gz: decbb5c0688e364d432aced0e156a9b0cdd1d33f3aeaa6c9bba5f7761f1bfd5182e740cc023b956926838261e1d66fa8a90f0666ded886d72dd397010c793ac7
-  data.tar.gz: 5f969855ab9c5d49801bc4675ecd19d4c815a8e49e7532559bc6f46ffc6d76f3ae6f735e6f73c495bee7406ccbfcd091305127f29c00e0d0c859179c3447543b
+  metadata.gz: f7493dd561c802f8db70acf7f87fdc62f49aec9b74f9681197598e4781885598ce5a5ccf1acfad2975ab22a669556ada2282363b9d4342047ece848334686072
+  data.tar.gz: 2c3e48d560413d982c451a9c3a562c102ac06da98900cf1441f73c05077f9dfa8682c6d6d4ea3e44a43ef7387cbeefe67d949b651a9e1d65808a5634348ff17d

data/exe/marvi

@@ -23,7 +23,7 @@ else
 end
 
 if $stdout.tty?
-  Marvi::Renderer::Curses.new.render(markdown)
+  Marvi::Renderer::Curses.new.render(markdown, file: ARGV[0])
 else
   print Marvi::Renderer::ANSI.new.render(markdown)
 end

data/lib/marvi/ast_walker.rb

@@ -23,7 +23,8 @@ module Marvi
       when :header
         render_header(el)
       when :p
-        [RichLine.new(render_inline_children(el)), RichLine.blank]
+        src = el.options[:location]
+        [RichLine.new(render_inline_children(el), source_line: src), RichLine.blank]
       when :ul
         el.children.flat_map { |child| render_block(child, indent: indent, list_type: :ul) } + [RichLine.blank]
       when :ol
@@ -37,7 +38,8 @@ module Marvi
       when :blockquote
         render_blockquote(el)
       when :hr
-        [RichLine.new([Span.new(text: "─" * 60, color: :cyan)]), RichLine.blank]
+        src = el.options[:location]
+        [RichLine.new([Span.new(text: "─" * 60, color: :cyan)], source_line: src), RichLine.blank]
       when :table
         render_table(el)
       when :blank
@@ -50,17 +52,19 @@ module Marvi
     def render_header(el)
       level = el.options[:level]
       color = HEADER_COLORS[level - 1]
+      src   = el.options[:location]
       prefix = Span.new(text: "#" * level + " ", bold: true, color: color)
       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), RichLine.blank]
+      [RichLine.new([prefix] + content, 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)
-      lines = []
+      src    = el.options[:location]
+      lines  = []
 
       el.children.each do |child|
         case child.type
@@ -70,13 +74,13 @@ module Marvi
           lines += nested
         when :p
           if lines.empty?
-            lines << RichLine.new([prefix] + render_inline_children(child))
+            lines << RichLine.new([prefix] + render_inline_children(child), source_line: src)
           else
             lines += render_block(child)
           end
         else
           if lines.empty?
-            lines << RichLine.new([prefix] + render_inline(child))
+            lines << RichLine.new([prefix] + render_inline(child), source_line: src)
           else
             lines << RichLine.new(render_inline(child))
           end
@@ -86,23 +90,27 @@ module Marvi
     end
 
     def render_codeblock(el)
+      src  = el.options[:location]
       lang = el.options[:lang]
       lines = []
-      lines << RichLine.new([Span.new(text: lang, color: :yellow)]) if lang
-      el.value.chomp.split("\n").each do |line|
-        lines << RichLine.new([Span.new(text: "  #{line}", color: :green, bg_color: :dark)])
+      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 = src ? src + i + (lang ? 1 : 0) : nil
+        lines << RichLine.new([Span.new(text: "  #{line}", color: :green, bg_color: :dark)], source_line: line_src)
       end
       lines << RichLine.blank
       lines
     end
 
     def render_blockquote(el)
-      inner = el.children.flat_map { |child| render_block(child) }
+      inner  = el.children.flat_map { |child| render_block(child) }
       prefix = Span.new(text: "│ ", color: :cyan)
-      inner.map { |line| RichLine.new([prefix] + line.spans) } + [RichLine.blank]
+      # preserve source_line from inner lines
+      inner.map { |line| RichLine.new([prefix] + line.spans, source_line: line.source_line) } + [RichLine.blank]
     end
 
     def render_table(el)
+      src  = el.options[:location]
       rows = el.children.flat_map(&:children)
       header_row = el.children.find { |s| s.type == :thead }&.children&.first
 
@@ -112,7 +120,7 @@ module Marvi
 
       lines = []
       top = col_widths.map { |w| "─" * (w + 2) }.join("┬")
-      lines << RichLine.new([Span.new(text: "┌#{top}┐", color: :cyan)])
+      lines << RichLine.new([Span.new(text: "┌#{top}┐", color: :cyan)], source_line: src)
 
       rows.each_with_index do |row, ri|
         is_header = row == header_row

data/lib/marvi/document.rb

@@ -14,10 +14,11 @@ module Marvi
   end
 
   class RichLine
-    attr_reader :spans
+    attr_reader :spans, :source_line
 
-    def initialize(spans = [])
+    def initialize(spans = [], source_line: nil)
       @spans = spans
+      @source_line = source_line
     end
 
     def plain_text

data/lib/marvi/renderer/curses.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "curses"
+require "shellwords"
 
 module Marvi
   module Renderer
@@ -17,9 +18,11 @@ module Marvi
 
       ITALIC_ATTR = (defined?(::Curses::A_ITALIC) ? ::Curses::A_ITALIC : 0)
 
-      def render(markdown)
-        @lines = ASTWalker.new.walk(markdown)
-        @scroll = 0
+      def render(markdown, file: nil)
+        @file     = file
+        @markdown = markdown
+        @lines    = ASTWalker.new.walk(markdown)
+        @scroll   = 0
 
         ::Curses.init_screen
         ::Curses.start_color
@@ -51,18 +54,68 @@ module Marvi
 
       def handle_key(key)
         case key
-        when "q", "Q", 27                  then throw :quit
-        when "j", ::Curses::Key::DOWN      then scroll_by(1)
-        when "k", ::Curses::Key::UP        then scroll_by(-1)
-        when "d"                           then scroll_by(page_size / 2)
-        when "u"                           then scroll_by(-page_size / 2)
+        when "q", "Q", 27                   then throw :quit
+        when "j", ::Curses::Key::DOWN       then scroll_by(1)
+        when "k", ::Curses::Key::UP         then scroll_by(-1)
+        when "d"                            then scroll_by(page_size / 2)
+        when "u"                            then scroll_by(-page_size / 2)
         when "f", " ", ::Curses::Key::NPAGE then scroll_by(page_size)
-        when "b", ::Curses::Key::PPAGE     then scroll_by(-page_size)
-        when "g"                           then @scroll = 0; draw
-        when "G"                           then @scroll = max_scroll; draw
+        when "b", ::Curses::Key::PPAGE      then scroll_by(-page_size)
+        when "g"                            then @scroll = 0; draw
+        when "G"                            then @scroll = max_scroll; draw
+        when "e"                            then launch_editor if @file
         end
       end
 
+      def launch_editor
+        editor = ENV["EDITOR"] || ENV["VISUAL"] || "vi"
+        line   = current_source_line
+        cmd    = build_editor_command(editor, @file, line)
+
+        ::Curses.close_screen
+        system(cmd)
+        reload
+        reinit_curses
+        draw
+      end
+
+      def reload
+        @markdown = File.read(@file)
+        @lines    = ASTWalker.new.walk(@markdown)
+        @scroll   = [@scroll, max_scroll].min
+      end
+
+      def reinit_curses
+        ::Curses.init_screen
+        ::Curses.start_color
+        ::Curses.use_default_colors
+        ::Curses.noecho
+        ::Curses.cbreak
+        ::Curses.stdscr.keypad(true)
+        setup_colors
+      end
+
+      def build_editor_command(editor, file, line)
+        base = File.basename(editor.split.first)
+        escaped = Shellwords.escape(file)
+        case base
+        when "code"
+          "#{editor} --goto #{escaped}:#{line}"
+        when "subl", "sublime_text"
+          "#{editor} #{escaped}:#{line}"
+        else
+          # vim, nvim, nano, emacs, micro, etc.
+          "#{editor} +#{line} #{escaped}"
+        end
+      end
+
+      def current_source_line
+        visible_lines.each { |line| return line.source_line if line.source_line }
+        # fall back to searching upward from scroll position
+        @scroll.downto(0) { |i| return @lines[i].source_line if @lines[i]&.source_line }
+        1
+      end
+
       def draw
         ::Curses.clear
         visible_lines.each_with_index do |line, row|
@@ -78,7 +131,8 @@ module Marvi
         ::Curses.attron(::Curses.color_pair(COLOR_PAIRS[:cyan])) do
           top    = @scroll + 1
           bottom = [@scroll + page_size, @lines.size].min
-          status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom  q quit"
+          edit_hint = @file ? "  e edit" : ""
+          status = " #{top}-#{bottom}/#{@lines.size}  j/k scroll  g/G top/bottom#{edit_hint}  q quit"
           ::Curses.addstr(status.ljust(::Curses.cols)[0, ::Curses.cols])
         end
       end

data/lib/marvi/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marvi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mitsutaka Mimura
@@ -73,6 +73,7 @@ files:
 - lib/marvi/renderer/ansi.rb
 - lib/marvi/renderer/curses.rb
 - lib/marvi/version.rb
+- marvi-0.1.0.gem
 - sig/marvi.rbs
 homepage: https://github.com/takkanm/marvi
 licenses: