ruvim 0.3.0 → 0.6.0

data/test/on_save_hook_test.rb

@@ -66,8 +66,9 @@ class OnSaveHookTest < Minitest::Test
       editor.current_buffer.replace_all_lines!(["hello"])
 
       # Execute :w command
+      kh = app.instance_variable_get(:@key_handler)
       keys = ":w #{path}\n".chars
-      keys.each { |k| app.send(:handle_key, k == "\n" ? :enter : k) }
+      keys.each { |k| kh.handle(k == "\n" ? :enter : k) }
 
       assert called, "on_save hook should have been called"
     end
@@ -84,15 +85,16 @@ class OnSaveHookTest < Minitest::Test
       File.write(path, "x = 1\ndef foo(\n")
 
       # Open and write the file
-      ":e #{path}\n".chars.each { |k| app.send(:handle_key, k == "\n" ? :enter : k) }
-      ":w\n".chars.each { |k| app.send(:handle_key, k == "\n" ? :enter : k) }
+      kh = app.instance_variable_get(:@key_handler)
+      ":e #{path}\n".chars.each { |k| kh.handle(k == "\n" ? :enter : k) }
+      ":w\n".chars.each { |k| kh.handle(k == "\n" ? :enter : k) }
 
       refute_empty editor.quickfix_items, "quickfix should be populated after :w with syntax error"
       assert_nil editor.quickfix_index, "quickfix index should be nil before navigation"
 
       # Press ]q — should jump to first item (index 0)
-      app.send(:handle_key, "]")
-      app.send(:handle_key, "q")
+      kh.handle("]")
+      kh.handle("q")
 
       assert_equal 0, editor.quickfix_index
       first_item = editor.quickfix_items.first
@@ -112,12 +114,13 @@ class OnSaveHookTest < Minitest::Test
       path = File.join(dir, "ok.rb")
       File.write(path, "puts 'hi'\n")
 
-      ":e #{path}\n".chars.each { |k| app.send(:handle_key, k == "\n" ? :enter : k) }
+      kh = app.instance_variable_get(:@key_handler)
+      ":e #{path}\n".chars.each { |k| kh.handle(k == "\n" ? :enter : k) }
       # Set some dummy quickfix items first
       editor.set_quickfix_list([{ buffer_id: editor.current_buffer.id, row: 0, col: 0, text: "dummy" }])
       refute_empty editor.quickfix_items
 
-      ":w\n".chars.each { |k| app.send(:handle_key, k == "\n" ? :enter : k) }
+      ":w\n".chars.each { |k| kh.handle(k == "\n" ? :enter : k) }
       assert_empty editor.quickfix_items, "quickfix should be cleared after :w with valid file"
     end
   end
@@ -141,8 +144,9 @@ class OnSaveHookTest < Minitest::Test
       editor.current_buffer.replace_all_lines!(["hello"])
       editor.set_option("onsavehook", false)
 
+      kh = app.instance_variable_get(:@key_handler)
       keys = ":w #{path}\n".chars
-      keys.each { |k| app.send(:handle_key, k == "\n" ? :enter : k) }
+      keys.each { |k| kh.handle(k == "\n" ? :enter : k) }
 
       refute called, "on_save hook should NOT have been called when onsavehook is disabled"
     end

data/test/render_snapshot_test.rb

@@ -64,7 +64,85 @@ class RenderSnapshotTest < Minitest::Test
     (1..rows).map { |row| strip_ansi(frame[:lines][row].to_s) }.join("\n")
   end
 
+  def build_raw_frame(lines:, winsize:, number: false, rich_format: nil, cursor_y: 0, cursor_x: 0)
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(lines)
+    editor.set_option("number", number, scope: :window, window: win, buffer: buf)
+    win.cursor_y = cursor_y
+    win.cursor_x = cursor_x
+    if rich_format
+      editor.instance_variable_set(:@rich_state, { format: rich_format })
+    end
+
+    term = TerminalStub.new(winsize)
+    screen = RuVim::Screen.new(terminal: term)
+
+    rows, cols = term.winsize
+    text_rows, text_cols = editor.text_viewport_size(rows:, cols:)
+    rects = screen.send(:window_rects, editor, text_rows:, text_cols:)
+    win.ensure_visible(buf, height: text_rows, width: text_cols, tabstop: 2)
+    frame = screen.send(:build_frame, editor, rows:, cols:, text_rows:, text_cols:, rects:)
+
+    (1..rows).map { |row| frame[:lines][row].to_s }.join("\n")
+  end
+
   def strip_ansi(str)
     str.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
   end
 end
+
+class RenderSanitizeTest < Minitest::Test
+  TerminalStub = Struct.new(:winsize) do
+    def write(_data); end
+  end
+
+  def test_normal_buffer_sanitizes_escape_sequences
+    # ESC (0x1B) should be replaced with "?" in normal rendering
+    lines = ["hello\x1b]52;c;dGVzdA==\x07world"]
+    snapshot = build_raw_frame(lines: lines, winsize: [5, 40])
+    refute_includes snapshot, "\x1b]52"
+    refute_includes snapshot, "\x07"
+  end
+
+  def test_rich_view_sanitizes_escape_sequences_in_tsv
+    lines = ["col1\tcol2", "val1\t\x1b]52;c;dGVzdA==\x07evil"]
+    snapshot = build_raw_frame(lines: lines, winsize: [6, 40], rich_format: :tsv)
+    refute_includes snapshot, "\x1b]52"
+    refute_includes snapshot, "\x07"
+  end
+
+  def test_rich_view_sanitizes_escape_sequences_in_markdown
+    lines = ["# heading", "\x1b]52;c;dGVzdA==\x07evil text"]
+    snapshot = build_raw_frame(lines: lines, winsize: [6, 40], rich_format: :markdown)
+    refute_includes snapshot, "\x1b]52"
+    refute_includes snapshot, "\x07"
+  end
+
+  private
+
+  def build_raw_frame(lines:, winsize:, number: false, rich_format: nil, cursor_y: 0, cursor_x: 0)
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(lines)
+    editor.set_option("number", number, scope: :window, window: win, buffer: buf)
+    win.cursor_y = cursor_y
+    win.cursor_x = cursor_x
+    if rich_format
+      editor.instance_variable_set(:@rich_state, { format: rich_format })
+    end
+
+    term = TerminalStub.new(winsize)
+    screen = RuVim::Screen.new(terminal: term)
+
+    rows, cols = term.winsize
+    text_rows, text_cols = editor.text_viewport_size(rows:, cols:)
+    rects = screen.send(:window_rects, editor, text_rows:, text_cols:)
+    win.ensure_visible(buf, height: text_rows, width: text_cols, tabstop: 2)
+    frame = screen.send(:build_frame, editor, rows:, cols:, text_rows:, text_cols:, rects:)
+
+    (1..rows).map { |row| frame[:lines][row].to_s }.join("\n")
+  end
+end

data/test/rich_view_test.rb

@@ -4,36 +4,36 @@ class RichViewTest < Minitest::Test
   # --- Framework tests ---
 
   def test_register_and_renderer_for
-    assert RuVim::RichView.renderer_for("tsv")
-    assert RuVim::RichView.renderer_for("csv")
-    assert_nil RuVim::RichView.renderer_for("unknown")
+    assert RuVim::RichView.renderer_for(:tsv)
+    assert RuVim::RichView.renderer_for(:csv)
+    assert_nil RuVim::RichView.renderer_for(:unknown)
   end
 
   def test_registered_filetypes
     fts = RuVim::RichView.registered_filetypes
-    assert_includes fts, "tsv"
-    assert_includes fts, "csv"
+    assert_includes fts, :tsv
+    assert_includes fts, :csv
   end
 
   def test_detect_format_from_filetype
     editor = fresh_editor
     buf = editor.current_buffer
     buf.options["filetype"] = "csv"
-    assert_equal "csv", RuVim::RichView.detect_format(buf)
+    assert_equal :csv, RuVim::RichView.detect_format(buf)
   end
 
   def test_detect_format_auto_tsv
     editor = fresh_editor
     buf = editor.current_buffer
     buf.replace_all_lines!(["a\tb\tc", "d\te\tf"])
-    assert_equal "tsv", RuVim::RichView.detect_format(buf)
+    assert_equal :tsv, RuVim::RichView.detect_format(buf)
   end
 
   def test_detect_format_auto_csv
     editor = fresh_editor
     buf = editor.current_buffer
     buf.replace_all_lines!(["a,b,c", "d,e,f"])
-    assert_equal "csv", RuVim::RichView.detect_format(buf)
+    assert_equal :csv, RuVim::RichView.detect_format(buf)
   end
 
   def test_detect_format_returns_nil_for_plain_text
@@ -63,7 +63,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tb", "c\td"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     assert_equal :rich, editor.mode
     assert RuVim::RichView.active?(editor)
   end
@@ -75,7 +75,7 @@ class RichViewTest < Minitest::Test
     buf.options["filetype"] = "tsv"
     original_id = buf.id
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     assert_equal original_id, editor.current_buffer.id
   end
 
@@ -85,7 +85,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["x\ty"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     assert_equal :rich, editor.mode
 
     RuVim::RichView.close!(editor)
@@ -100,7 +100,7 @@ class RichViewTest < Minitest::Test
     buf.options["filetype"] = "tsv"
     original_id = buf.id
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     RuVim::RichView.close!(editor)
     assert_equal original_id, editor.current_buffer.id
   end
@@ -124,9 +124,9 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tb"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     state = editor.rich_state
-    assert_equal "tsv", state[:format]
+    assert_equal :tsv, state[:format]
     assert_equal "\t", state[:delimiter]
   end
 
@@ -136,9 +136,9 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a,b"])
     buf.options["filetype"] = "csv"
 
-    RuVim::RichView.open!(editor, format: "csv")
+    RuVim::RichView.open!(editor, format: :csv)
     state = editor.rich_state
-    assert_equal "csv", state[:format]
+    assert_equal :csv, state[:format]
     assert_equal ",", state[:delimiter]
   end
 
@@ -148,7 +148,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tb"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     RuVim::RichView.close!(editor)
     assert_nil editor.rich_state
   end
@@ -159,7 +159,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tb"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     editor.enter_command_line_mode(":")
     assert_equal :command_line, editor.mode
     assert RuVim::RichView.active?(editor)
@@ -171,7 +171,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tb"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     assert_equal :rich, editor.mode
 
     editor.enter_command_line_mode(":")
@@ -189,7 +189,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tb"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     editor.enter_command_line_mode(":")
     editor.leave_command_line
     assert_equal :rich, editor.mode
@@ -210,7 +210,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tb"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     editor.enter_normal_mode
     assert_nil editor.rich_state
     assert_equal :normal, editor.mode
@@ -222,7 +222,7 @@ class RichViewTest < Minitest::Test
     buf.replace_all_lines!(["a\tbb", "ccc\td"])
     buf.options["filetype"] = "tsv"
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     lines = [buf.line_at(0), buf.line_at(1)]
     rendered = RuVim::RichView.render_visible_lines(editor, lines)
     assert_equal 2, rendered.length
@@ -236,7 +236,7 @@ class RichViewTest < Minitest::Test
     buf.options["filetype"] = "tsv"
     count_before = editor.buffers.length
 
-    RuVim::RichView.open!(editor, format: "tsv")
+    RuVim::RichView.open!(editor, format: :tsv)
     assert_equal count_before, editor.buffers.length
   end
 
@@ -459,6 +459,161 @@ class RichViewTest < Minitest::Test
     assert_equal dc0, dc1, "Second field start should align across CJK and ASCII rows"
   end
 
+  # --- JSON Rich View tests ---
+
+  def test_json_registered
+    assert RuVim::RichView.renderer_for(:json)
+  end
+
+  def test_json_open_creates_virtual_buffer
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1,"b":[2,3]}'])
+    buf.options["filetype"] = "json"
+    count_before = editor.buffers.length
+
+    RuVim::RichView.open!(editor, format: :json)
+    assert_equal count_before + 1, editor.buffers.length
+    new_buf = editor.current_buffer
+    refute_equal buf.id, new_buf.id
+    assert_equal :json_formatted, new_buf.kind
+    assert new_buf.readonly?
+  end
+
+  def test_json_open_binds_close_keys
+    editor = fresh_editor
+    editor.keymap_manager = RuVim::KeymapManager.new
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}'])
+    buf.options["filetype"] = "json"
+
+    RuVim::RichView.open!(editor, format: :json)
+    result = editor.keymap_manager.resolve_with_context(:normal, ["\e"], editor: editor)
+    assert_equal "rich.close_buffer", result.invocation.id
+  end
+
+  def test_json_open_pretty_prints
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1,"b":[2,3]}'])
+    buf.options["filetype"] = "json"
+
+    RuVim::RichView.open!(editor, format: :json)
+    new_buf = editor.current_buffer
+    lines = new_buf.lines
+    assert lines.length > 1, "Minified JSON should be expanded to multiple lines"
+    assert_equal "{", lines.first.strip
+    assert_equal "}", lines.last.strip
+  end
+
+  def test_json_open_multiline_buffer
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{', '"key": "value"', '}'])
+    buf.options["filetype"] = "json"
+
+    RuVim::RichView.open!(editor, format: :json)
+    new_buf = editor.current_buffer
+    lines = new_buf.lines
+    assert lines.length >= 3
+  end
+
+  def test_json_open_invalid_json_shows_error
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"invalid json'])
+    buf.options["filetype"] = "json"
+
+    RuVim::RichView.open!(editor, format: :json)
+    # Should stay on original buffer
+    assert_equal buf.id, editor.current_buffer.id
+    assert_match(/JSON/, editor.message.to_s)
+  end
+
+  def test_json_open_does_not_enter_rich_mode
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}'])
+    buf.options["filetype"] = "json"
+
+    RuVim::RichView.open!(editor, format: :json)
+    # Virtual buffer approach — no rich mode
+    assert_equal :normal, editor.mode
+    assert_nil editor.rich_state
+  end
+
+  def test_json_cursor_maps_to_formatted_line
+    editor = fresh_editor
+    buf = editor.current_buffer
+    # {"a":1,"b":{"c":2}}
+    buf.replace_all_lines!(['{"a":1,"b":{"c":2}}'])
+    buf.options["filetype"] = "json"
+
+    # Place cursor at "c" key — find its offset
+    line = buf.line_at(0)
+    idx = line.index('"c"')
+    editor.current_window.cursor_x = idx
+
+    RuVim::RichView.open!(editor, format: :json)
+    new_buf = editor.current_buffer
+    # Cursor should be on the line containing "c"
+    cursor_line = new_buf.line_at(editor.current_window.cursor_y)
+    assert_match(/"c"/, cursor_line, "Cursor should be on the line with \"c\" key")
+  end
+
+  def test_json_cursor_maps_multiline_source
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{', '  "x": [1, 2, 3]', '}'])
+    buf.options["filetype"] = "json"
+
+    # Place cursor on line 1 at the "x" key (col 2 = opening quote)
+    editor.current_window.cursor_y = 1
+    editor.current_window.cursor_x = 2
+
+    RuVim::RichView.open!(editor, format: :json)
+    new_buf = editor.current_buffer
+    cursor_line = new_buf.line_at(editor.current_window.cursor_y)
+    assert_match(/"x"/, cursor_line, "Cursor should be on the line with \"x\" key")
+  end
+
+  def test_json_cursor_at_start_stays_at_start
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}'])
+    buf.options["filetype"] = "json"
+    editor.current_window.cursor_x = 0
+
+    RuVim::RichView.open!(editor, format: :json)
+    assert_equal 0, editor.current_window.cursor_y
+  end
+
+  def test_json_significant_offset
+    r = RuVim::RichView::JsonRenderer
+    # {"a" — 4 significant chars: { " a "
+    assert_equal 4, r.significant_char_count('{"a"', 4)
+    # { "a" — space outside string skipped, still 4 significant
+    assert_equal 4, r.significant_char_count('{ "a"', 5)
+  end
+
+  def test_json_line_for_significant_offset
+    formatted = "{\n  \"a\": 1\n}"
+    r = RuVim::RichView::JsonRenderer
+    # count 0 → line 0 (before any char)
+    assert_equal 0, r.line_for_significant_count(formatted, 0)
+    # count 1 → line 0 ({ is the 1st significant char, on line 0)
+    assert_equal 0, r.line_for_significant_count(formatted, 1)
+    # count 2 → line 1 (" opening quote of "a" is on line 1)
+    assert_equal 1, r.line_for_significant_count(formatted, 2)
+  end
+
+  def test_json_filetype_detected
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.options["filetype"] = "json"
+    assert_equal :json, RuVim::RichView.detect_format(buf)
+  end
+
   # --- Filetype detection tests ---
 
   def test_detect_filetype_tsv
@@ -475,4 +630,105 @@ class RichViewTest < Minitest::Test
     editor = RuVim::Editor.new
     assert_equal "tsv", editor.detect_filetype("DATA.TSV")
   end
+
+  def test_detect_filetype_jsonl
+    editor = RuVim::Editor.new
+    assert_equal "jsonl", editor.detect_filetype("data.jsonl")
+  end
+
+  # --- JSONL Rich View tests ---
+
+  def test_jsonl_registered
+    assert RuVim::RichView.renderer_for(:jsonl)
+  end
+
+  def test_jsonl_open_creates_virtual_buffer
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}', '{"b":2}'])
+    buf.options["filetype"] = "jsonl"
+    count_before = editor.buffers.length
+
+    RuVim::RichView.open!(editor, format: :jsonl)
+    assert_equal count_before + 1, editor.buffers.length
+    new_buf = editor.current_buffer
+    refute_equal buf.id, new_buf.id
+    assert_equal :jsonl_formatted, new_buf.kind
+    assert new_buf.readonly?
+  end
+
+  def test_jsonl_open_binds_close_keys
+    editor = fresh_editor
+    editor.keymap_manager = RuVim::KeymapManager.new
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}', '{"b":2}'])
+    buf.options["filetype"] = "jsonl"
+
+    RuVim::RichView.open!(editor, format: :jsonl)
+    result = editor.keymap_manager.resolve_with_context(:normal, ["\e"], editor: editor)
+    assert_equal "rich.close_buffer", result.invocation.id
+  end
+
+  def test_jsonl_open_pretty_prints_each_line
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1,"b":[2,3]}', '{"c":4}'])
+    buf.options["filetype"] = "jsonl"
+
+    RuVim::RichView.open!(editor, format: :jsonl)
+    new_buf = editor.current_buffer
+    lines = new_buf.lines
+    # Each JSON object should be expanded; separated by "---"
+    assert lines.length > 2, "JSONL should be expanded to multiple lines"
+    assert lines.any? { |l| l.include?("---") }, "Entries should be separated"
+  end
+
+  def test_jsonl_open_maps_cursor_to_correct_entry
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}', '{"b":2}', '{"c":3}'])
+    buf.options["filetype"] = "jsonl"
+    editor.current_window.cursor_y = 1  # on second entry
+
+    RuVim::RichView.open!(editor, format: :jsonl)
+    new_buf = editor.current_buffer
+    cy = editor.current_window.cursor_y
+    # Cursor should be within the second entry's formatted block
+    nearby = (cy..[cy + 2, new_buf.lines.length - 1].min).map { |r| new_buf.line_at(r) }.join("\n")
+    assert_match(/"b"/, nearby, "Cursor should be near the entry with \"b\"")
+  end
+
+  def test_jsonl_open_skips_blank_lines
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}', '', '{"b":2}'])
+    buf.options["filetype"] = "jsonl"
+
+    RuVim::RichView.open!(editor, format: :jsonl)
+    new_buf = editor.current_buffer
+    lines = new_buf.lines
+    # Should contain both entries
+    assert lines.any? { |l| l.include?('"a"') }
+    assert lines.any? { |l| l.include?('"b"') }
+  end
+
+  def test_jsonl_open_shows_parse_error_inline
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.replace_all_lines!(['{"a":1}', 'bad json', '{"b":2}'])
+    buf.options["filetype"] = "jsonl"
+
+    RuVim::RichView.open!(editor, format: :jsonl)
+    new_buf = editor.current_buffer
+    lines = new_buf.lines
+    # Invalid line should show an error marker
+    assert lines.any? { |l| l.include?("PARSE ERROR") }, "Invalid JSON line should show error"
+  end
+
+  def test_jsonl_filetype_detected
+    editor = fresh_editor
+    buf = editor.current_buffer
+    buf.options["filetype"] = "jsonl"
+    assert_equal :jsonl, RuVim::RichView.detect_format(buf)
+  end
 end