ruvim 0.2.0 → 0.3.0

data/test/screen_test.rb

@@ -101,6 +101,36 @@ class ScreenTest < Minitest::Test
     assert_includes out, "boom"
   end
 
+  def test_status_line_shows_stream_state_for_stdin_buffer
+    editor = RuVim::Editor.new
+    buf = editor.add_virtual_buffer(kind: :stream, name: "[stdin]", lines: [""], readonly: true, modifiable: false)
+    buf.stream_state = :closed
+    editor.add_window(buffer_id: buf.id)
+
+    term = TerminalStub.new([6, 60])
+    screen = RuVim::Screen.new(terminal: term)
+    line = screen.send(:status_line, editor, 60)
+
+    assert_includes line, "[stdin/closed]"
+  end
+
+  def test_render_uses_dim_and_brighter_line_number_gutter_colors
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["foo", "bar"])
+    editor.set_option("number", true, scope: :window, window: win, buffer: buf)
+    win.cursor_y = 1
+
+    term = TerminalStub.new([6, 20])
+    screen = RuVim::Screen.new(terminal: term)
+    screen.render(editor)
+    out = term.writes.last
+
+    assert_includes out, "\e[90m"
+    assert_includes out, "\e[37m"
+  end
+
   def test_render_reuses_syntax_highlight_cache_for_same_line
     editor = RuVim::Editor.new
     buf = editor.add_empty_buffer
@@ -132,6 +162,40 @@ class ScreenTest < Minitest::Test
     assert_equal 1, calls
   end
 
+  def test_render_reuses_wrap_segment_cache_for_same_line
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["x" * 400])
+    editor.set_option("wrap", true, scope: :window, window: win, buffer: buf)
+
+    term = TerminalStub.new([8, 20])
+    screen = RuVim::Screen.new(terminal: term)
+
+    calls = [0, 0]
+    render_index = 0
+    mod = RuVim::TextMetrics.singleton_class
+    verbose, $VERBOSE = $VERBOSE, nil
+    mod.alias_method(:__orig_clip_cells_for_width_for_screen_test, :clip_cells_for_width)
+    mod.define_method(:clip_cells_for_width) do |*args, **kwargs|
+      calls[render_index] += 1
+      __orig_clip_cells_for_width_for_screen_test(*args, **kwargs)
+    end
+
+    begin
+      render_index = 0
+      screen.render(editor)
+      render_index = 1
+      screen.render(editor)
+    ensure
+      mod.alias_method(:clip_cells_for_width, :__orig_clip_cells_for_width_for_screen_test)
+      mod.remove_method(:__orig_clip_cells_for_width_for_screen_test) rescue nil
+      $VERBOSE = verbose
+    end
+
+    assert_operator calls[1], :<, calls[0]
+  end
+
   def test_render_text_line_with_cursor_search_and_syntax_highlights_fits_width
     editor = RuVim::Editor.new
     buf = editor.add_empty_buffer
@@ -286,4 +350,244 @@ class ScreenTest < Minitest::Test
     assert_includes row2, ">"
     assert_match(/\s>|\>\s/, row2)
   end
+
+  def test_wrap_keeps_cursor_visible_after_very_long_previous_line
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["x" * 200, "tail"])
+    editor.set_option("wrap", true, scope: :window, window: win, buffer: buf)
+    win.cursor_y = 1
+    win.cursor_x = 0
+
+    term = TerminalStub.new([6, 8]) # text_rows=4, content width ~8 (no gutter)
+    screen = RuVim::Screen.new(terminal: term)
+    screen.render(editor)
+
+    assert_equal 1, win.row_offset
+
+    rows, cols = term.winsize
+    text_rows, text_cols = editor.text_viewport_size(rows:, cols:)
+    rects = screen.send(:window_rects, editor, text_rows:, text_cols:)
+    row, _col = screen.send(:cursor_screen_position, editor, text_rows, rects)
+    assert_equal 1, row
+  end
+
+  def test_rich_mode_horizontal_scroll_preserves_column_alignment
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    # Create rows where raw lines differ in length but formatted lines are aligned
+    buf.replace_all_lines!(["Short\tSecond\tThird", "LongerField\tB\tC"])
+    buf.options["filetype"] = "tsv"
+    RuVim::RichView.open!(editor, format: "tsv")
+
+    # Move cursor to end of line (like pressing $)
+    win.cursor_y = 0
+    win.cursor_x = buf.line_length(0)
+
+    # Use a narrow terminal so that the formatted line won't fit
+    term = TerminalStub.new([6, 20])
+    screen = RuVim::Screen.new(terminal: term)
+    screen.render(editor)
+
+    # After render, col_offset should be in formatted space.
+    # Both rendered lines should use the same col_offset, keeping separators aligned.
+    rows_key, cols_key = term.winsize
+    text_rows, text_cols = editor.text_viewport_size(rows: rows_key, cols: cols_key)
+    rects = screen.send(:window_rects, editor, text_rows:, text_cols:)
+    frame = screen.send(:build_frame, editor, rows: rows_key, cols: cols_key, text_rows:, text_cols:, rects:)
+
+    # Strip ANSI and check that "|" separators are at the same column in both rows
+    row1 = frame[:lines][1].to_s.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
+    row2 = frame[:lines][2].to_s.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
+
+    sep_positions_row1 = row1.enum_for(:scan, /\|/).map { Regexp.last_match.begin(0) }
+    sep_positions_row2 = row2.enum_for(:scan, /\|/).map { Regexp.last_match.begin(0) }
+
+    # They should have the same separator positions (column alignment preserved)
+    assert_equal sep_positions_row1, sep_positions_row2,
+                 "Separators should align: row1=#{row1.inspect} row2=#{row2.inspect}"
+  end
+
+  def test_rich_mode_cjk_horizontal_scroll_preserves_display_column_alignment
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!([
+      "色\t果物名\t産地",
+      "赤\tりんご\t青森",
+      "緑\tキウイフルーツジャム\t静岡"
+    ])
+    buf.options["filetype"] = "tsv"
+    RuVim::RichView.open!(editor, format: "tsv")
+
+    # Move to end of line to trigger horizontal scroll
+    win.cursor_y = 2
+    win.cursor_x = buf.line_length(2)
+
+    # Narrow terminal so formatted line doesn't fit
+    term = TerminalStub.new([6, 30])
+    screen = RuVim::Screen.new(terminal: term)
+    screen.render(editor)
+
+    rows_key, cols_key = term.winsize
+    text_rows, text_cols = editor.text_viewport_size(rows: rows_key, cols: cols_key)
+    rects = screen.send(:window_rects, editor, text_rows:, text_cols:)
+    frame = screen.send(:build_frame, editor, rows: rows_key, cols: cols_key, text_rows:, text_cols:, rects:)
+
+    # Strip ANSI, collect visible lines
+    visible_rows = (1..3).map do |r|
+      frame[:lines][r].to_s.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
+    end
+
+    # All rows should have separator "|" at the same display column
+    pipe_display_cols = visible_rows.map do |row|
+      col = 0
+      pipe_col = nil
+      row.each_char do |ch|
+        if ch == "|"
+          pipe_col = col
+          break
+        end
+        col += RuVim::DisplayWidth.cell_width(ch, col: col, tabstop: 2)
+      end
+      pipe_col
+    end
+
+    # Filter out rows where pipe might not be visible (scrolled away)
+    visible_pipes = pipe_display_cols.compact
+    assert(visible_pipes.length >= 2, "At least 2 rows should show a pipe separator")
+    assert_equal 1, visible_pipes.uniq.length,
+                 "Pipe separators should align at same display column: #{pipe_display_cols.inspect} in #{visible_rows.inspect}"
+  end
+
+  def test_truncate_respects_display_width_for_wide_chars
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    editor.add_window(buffer_id: buf.id)
+    term = TerminalStub.new([6, 20])
+    screen = RuVim::Screen.new(terminal: term)
+
+    # "Unknown key: あ" => 13 ASCII + 1 wide char (display width 2) = 15 display cols
+    result = screen.send(:truncate, "Unknown key: あ", 20)
+    dw = RuVim::DisplayWidth.display_width(result)
+    assert_equal 20, dw, "truncate must produce exactly 20 display columns, got #{dw}"
+  end
+
+  def test_error_message_with_wide_char_does_not_exceed_terminal_width
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    editor.add_window(buffer_id: buf.id)
+
+    editor.echo_error("Unknown key: あ")
+
+    term = TerminalStub.new([6, 20])
+    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:)
+    frame = screen.send(:build_frame, editor, rows:, cols:, text_rows:, text_cols:, rects:)
+
+    error_row = frame[:lines][text_rows + 2]
+    # Strip ANSI codes and measure display width
+    plain = error_row.to_s.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
+    dw = RuVim::DisplayWidth.display_width(plain)
+    assert_operator dw, :<=, cols, "error line display width #{dw} exceeds terminal cols #{cols}"
+  end
+
+  def test_rich_mode_cursor_visible_after_end_of_line
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["A\tB\tC", "DD\tEE\tFF"])
+    buf.options["filetype"] = "tsv"
+    RuVim::RichView.open!(editor, format: "tsv")
+
+    # Move cursor to end of raw line
+    win.cursor_y = 0
+    win.cursor_x = buf.line_length(0) # last char
+
+    # Narrow terminal
+    term = TerminalStub.new([6, 15])
+    screen = RuVim::Screen.new(terminal: term)
+    screen.render(editor)
+
+    rows_key, cols_key = term.winsize
+    text_rows, text_cols = editor.text_viewport_size(rows: rows_key, cols: cols_key)
+    rects = screen.send(:window_rects, editor, text_rows:, text_cols:)
+    _cursor_row, cursor_col = screen.send(:cursor_screen_position, editor, text_rows, rects)
+
+    # Cursor should be within the visible area
+    assert_operator cursor_col, :>=, 1
+    assert_operator cursor_col, :<=, cols_key
+  end
+
+  def test_status_line_shows_tab_indicator_when_multiple_tabs
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    editor.add_window(buffer_id: buf.id)
+    editor.tabnew
+    editor.tabnew
+
+    term = TerminalStub.new([6, 60])
+    screen = RuVim::Screen.new(terminal: term)
+    line = screen.send(:status_line, editor, 60)
+
+    assert_includes line, "tab:3/3"
+  end
+
+  def test_status_line_hides_tab_indicator_when_single_tab
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    editor.add_window(buffer_id: buf.id)
+
+    term = TerminalStub.new([6, 60])
+    screen = RuVim::Screen.new(terminal: term)
+    line = screen.send(:status_line, editor, 60)
+
+    refute_includes line, "tab:"
+  end
+
+  def test_window_rects_nested_vsplit_hsplit
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    # win1
+    editor.add_window(buffer_id: buf.id)
+    win1 = editor.current_window
+    # vsplit → win2
+    editor.split_current_window(layout: :vertical)
+    win2 = editor.current_window
+    # split win2 → win3
+    editor.split_current_window(layout: :horizontal)
+    win3 = editor.current_window
+
+    term = TerminalStub.new([22, 80])
+    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:)
+
+    # All three windows should have rects
+    assert rects.key?(win1.id), "win1 should have a rect"
+    assert rects.key?(win2.id), "win2 should have a rect"
+    assert rects.key?(win3.id), "win3 should have a rect"
+
+    # win1 should be on the left, win2/win3 should be on the right
+    assert_operator rects[win1.id][:left], :<, rects[win2.id][:left]
+    assert_operator rects[win1.id][:left], :<, rects[win3.id][:left]
+
+    # win2 and win3 should share the same left position (same column)
+    assert_equal rects[win2.id][:left], rects[win3.id][:left]
+
+    # win2 should be above win3
+    assert_operator rects[win2.id][:top], :<, rects[win3.id][:top]
+
+    # win1 should span the full height
+    assert_equal rects[win1.id][:height], text_rows
+
+    # win2 + win3 heights + separator should equal text_rows
+    assert_equal text_rows, rects[win2.id][:height] + rects[win3.id][:height] + 1
+  end
 end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: ruvim
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Koichi Sasada
 bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: vim clone on Ruby by codex
 email:
 - ko1@atdot.net
@@ -18,6 +32,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/test.yml"
+- AGENTS.md
+- CLAUDE.md
 - README.md
 - Rakefile
 - docs/binding.md
@@ -51,6 +67,16 @@ files:
 - lib/ruvim/input.rb
 - lib/ruvim/keymap_manager.rb
 - lib/ruvim/keyword_chars.rb
+- lib/ruvim/lang/base.rb
+- lib/ruvim/lang/csv.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/markdown_renderer.rb
+- lib/ruvim/rich_view/table_renderer.rb
 - lib/ruvim/screen.rb
 - lib/ruvim/terminal.rb
 - lib/ruvim/text_metrics.rb
@@ -65,6 +91,7 @@ files:
 - test/app_startup_test.rb
 - test/app_text_object_test.rb
 - test/app_unicode_behavior_test.rb
+- test/arglist_test.rb
 - test/buffer_test.rb
 - test/cli_test.rb
 - test/config_dsl_test.rb
@@ -77,9 +104,13 @@ files:
 - test/fixtures/render_basic_snapshot_nonumber.txt
 - test/fixtures/render_unicode_scrolled_snapshot.txt
 - test/highlighter_test.rb
+- test/indent_test.rb
 - test/input_screen_integration_test.rb
 - test/keymap_manager_test.rb
+- test/markdown_renderer_test.rb
+- test/on_save_hook_test.rb
 - test/render_snapshot_test.rb
+- test/rich_view_test.rb
 - test/screen_test.rb
 - test/search_option_test.rb
 - test/test_helper.rb