ruvim 0.3.0 → 0.4.0

data/test/highlighter_test.rb

@@ -14,6 +14,12 @@ class HighlighterTest < Minitest::Test
     assert_equal "\e[33m", cols[6] # number start
   end
 
+  def test_jsonl_highlighter_reuses_json_colors
+    cols = RuVim::Highlighter.color_columns("jsonl", '{"a": 10}')
+    assert_equal "\e[36m", cols[1] # key chars
+    assert_equal "\e[33m", cols[6] # number start
+  end
+
   def test_ruby_highlighter_marks_instance_variables_and_constants
     cols = RuVim::Highlighter.color_columns("ruby", "@x = Foo")
     assert_equal "\e[93m", cols[0] # @x
@@ -134,4 +140,42 @@ class HighlighterTest < Minitest::Test
     cols = RuVim::Highlighter.color_columns("scheme", "")
     assert_empty cols
   end
+
+  # --- Diff ---
+
+  def test_diff_add_line_green
+    cols = RuVim::Highlighter.color_columns("diff", "+added line")
+    refute_empty cols
+    assert_equal "\e[32m", cols[0]
+    assert_equal "\e[32m", cols[5]
+  end
+
+  def test_diff_delete_line_red
+    cols = RuVim::Highlighter.color_columns("diff", "-removed line")
+    refute_empty cols
+    assert_equal "\e[31m", cols[0]
+  end
+
+  def test_diff_hunk_header_cyan
+    cols = RuVim::Highlighter.color_columns("diff", "@@ -1,3 +1,4 @@ def foo")
+    refute_empty cols
+    assert_equal "\e[36m", cols[0]
+  end
+
+  def test_diff_header_bold
+    cols = RuVim::Highlighter.color_columns("diff", "diff --git a/foo.rb b/foo.rb")
+    refute_empty cols
+    assert_equal "\e[1m", cols[0]
+  end
+
+  def test_diff_context_line_no_color
+    cols = RuVim::Highlighter.color_columns("diff", " context line")
+    assert_empty cols
+  end
+
+  def test_diff_meta_line_yellow
+    cols = RuVim::Highlighter.color_columns("diff", "index abc..def 100644")
+    refute_empty cols
+    assert_equal "\e[33m", cols[0]
+  end
 end

data/test/indent_test.rb

@@ -1,5 +1,91 @@
 require_relative "test_helper"
 
+class JsonIndentTest < Minitest::Test
+  def calc(lines, target_row, sw = 2)
+    RuVim::Lang::Json.calculate_indent(lines, target_row, sw)
+  end
+
+  def test_first_line_is_zero
+    assert_equal 0, calc(["{"], 0)
+  end
+
+  def test_after_open_brace
+    lines = ["{", '  "key": "value"']
+    assert_equal 2, calc(lines, 1)
+  end
+
+  def test_close_brace
+    lines = ["{", '  "key": "value"', "}"]
+    assert_equal 0, calc(lines, 2)
+  end
+
+  def test_after_open_bracket
+    lines = ["[", "  1"]
+    assert_equal 2, calc(lines, 1)
+  end
+
+  def test_close_bracket
+    lines = ["[", "  1,", "  2", "]"]
+    assert_equal 0, calc(lines, 3)
+  end
+
+  def test_nested_objects
+    lines = [
+      "{",
+      '  "a": {',
+      '    "b": 1',
+      "  }",
+      "}"
+    ]
+    assert_equal 2, calc(lines, 1)
+    assert_equal 4, calc(lines, 2)
+    assert_equal 2, calc(lines, 3)
+    assert_equal 0, calc(lines, 4)
+  end
+
+  def test_array_in_object
+    lines = [
+      "{",
+      '  "items": [',
+      "    1,",
+      "    2",
+      "  ]",
+      "}"
+    ]
+    assert_equal 2, calc(lines, 1)
+    assert_equal 4, calc(lines, 2)
+    assert_equal 4, calc(lines, 3)
+    assert_equal 2, calc(lines, 4)
+    assert_equal 0, calc(lines, 5)
+  end
+
+  def test_shiftwidth_4
+    lines = ["{", '    "key": 1', "}"]
+    assert_equal 4, calc(lines, 1, 4)
+    assert_equal 0, calc(lines, 2, 4)
+  end
+
+  def test_indent_trigger_open_brace
+    assert RuVim::Lang::Json.indent_trigger?("{")
+    assert RuVim::Lang::Json.indent_trigger?('  "key": {')
+    assert RuVim::Lang::Json.indent_trigger?('  "key": [')
+  end
+
+  def test_indent_trigger_no_trigger
+    refute RuVim::Lang::Json.indent_trigger?('  "key": "value"')
+    refute RuVim::Lang::Json.indent_trigger?("}")
+  end
+
+  def test_dedent_trigger_close_brace
+    assert_kind_of Regexp, RuVim::Lang::Json.dedent_trigger("}")
+    assert_kind_of Regexp, RuVim::Lang::Json.dedent_trigger("]")
+  end
+
+  def test_dedent_trigger_no_trigger
+    assert_nil RuVim::Lang::Json.dedent_trigger("a")
+  end
+end
+
 class RubyIndentTest < Minitest::Test
   def calc(lines, target_row, sw = 2)
     RuVim::Lang::Ruby.calculate_indent(lines, target_row, sw)

data/test/rich_view_test.rb

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

data/test/search_option_test.rb

@@ -36,4 +36,23 @@ class SearchOptionTest < Minitest::Test
     cols = screen.send(:search_highlight_source_cols, @editor, "foo bar", source_col_offset: 0)
     assert_equal({}, cols)
   end
+
+  def test_nohlsearch_suppresses_highlight_until_next_search
+    screen = RuVim::Screen.new(terminal: TerminalStub.new([10, 40]))
+    @editor.set_last_search(pattern: "foo", direction: :forward)
+
+    # highlight is active
+    cols = screen.send(:search_highlight_source_cols, @editor, "foo bar", source_col_offset: 0)
+    assert_equal true, cols[0]
+
+    # suppress via nohlsearch
+    @editor.suppress_hlsearch!
+    cols = screen.send(:search_highlight_source_cols, @editor, "foo bar", source_col_offset: 0)
+    assert_equal({}, cols)
+
+    # next search restores highlight
+    @editor.set_last_search(pattern: "bar", direction: :forward)
+    cols = screen.send(:search_highlight_source_cols, @editor, "foo bar", source_col_offset: 0)
+    assert_equal true, cols[4]
+  end
 end

data/test/test_helper.rb

@@ -1,3 +1,12 @@
+# Suppress "system temporary path is not writable" warnings in sandboxed environments
+unless ENV["TMPDIR"] && File.writable?(ENV["TMPDIR"])
+  candidates = ["/tmp", "/var/tmp"]
+  # Claude Code sandbox uses /tmp/claude-<uid>
+  candidates.unshift("/tmp/claude-#{Process.uid}") if Dir.exist?("/tmp/claude-#{Process.uid}")
+  found = candidates.find { |d| File.writable?(d) }
+  ENV["TMPDIR"] = found if found
+end
+
 $LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 require "minitest/autorun"
 require "ruvim"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruvim
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Koichi Sasada
@@ -62,6 +62,14 @@ files:
 - lib/ruvim/display_width.rb
 - lib/ruvim/editor.rb
 - lib/ruvim/ex_command_registry.rb
+- lib/ruvim/file_watcher.rb
+- lib/ruvim/git/blame.rb
+- lib/ruvim/git/branch.rb
+- lib/ruvim/git/commit.rb
+- lib/ruvim/git/diff.rb
+- lib/ruvim/git/handler.rb
+- lib/ruvim/git/log.rb
+- lib/ruvim/git/status.rb
 - lib/ruvim/global_commands.rb
 - lib/ruvim/highlighter.rb
 - lib/ruvim/input.rb
@@ -69,12 +77,15 @@ files:
 - lib/ruvim/keyword_chars.rb
 - lib/ruvim/lang/base.rb
 - lib/ruvim/lang/csv.rb
+- lib/ruvim/lang/diff.rb
 - lib/ruvim/lang/json.rb
 - lib/ruvim/lang/markdown.rb
 - lib/ruvim/lang/ruby.rb
 - lib/ruvim/lang/scheme.rb
 - lib/ruvim/lang/tsv.rb
 - lib/ruvim/rich_view.rb
+- lib/ruvim/rich_view/json_renderer.rb
+- lib/ruvim/rich_view/jsonl_renderer.rb
 - lib/ruvim/rich_view/markdown_renderer.rb
 - lib/ruvim/rich_view/table_renderer.rb
 - lib/ruvim/screen.rb
@@ -94,15 +105,20 @@ files:
 - test/arglist_test.rb
 - test/buffer_test.rb
 - test/cli_test.rb
+- test/clipboard_test.rb
+- test/command_line_test.rb
 - test/config_dsl_test.rb
 - test/config_loader_test.rb
 - test/dispatcher_test.rb
 - test/display_width_test.rb
 - test/editor_mark_test.rb
 - test/editor_register_test.rb
+- test/file_watcher_test.rb
 - test/fixtures/render_basic_snapshot.txt
 - test/fixtures/render_basic_snapshot_nonumber.txt
 - test/fixtures/render_unicode_scrolled_snapshot.txt
+- test/follow_test.rb
+- test/git_blame_test.rb
 - test/highlighter_test.rb
 - test/indent_test.rb
 - test/input_screen_integration_test.rb