ruvim 0.1.0 → 0.2.0

data/test/dispatcher_test.rb

@@ -1,4 +1,5 @@
 require_relative "test_helper"
+require "tmpdir"
 
 class DispatcherTest < Minitest::Test
   def setup
@@ -43,6 +44,35 @@ class DispatcherTest < Minitest::Test
     assert_equal "ruby: 3", @editor.message
   end
 
+  def test_dispatch_ex_ruby_captures_stdout_and_stderr_into_virtual_buffer
+    @dispatcher.dispatch_ex(@editor, "ruby STDOUT.puts(%q[out]); STDERR.puts(%q[err]); 42")
+
+    assert_equal "[Ruby Output]", @editor.message
+    assert_equal :help, @editor.current_buffer.kind
+    body = @editor.current_buffer.lines.join("\n")
+    assert_includes body, "[stdout]"
+    assert_includes body, "out"
+    assert_includes body, "[stderr]"
+    assert_includes body, "err"
+    assert_includes body, "[result]"
+    assert_includes body, "42"
+  end
+
+  def test_dispatch_ex_shell_captures_stdout_and_stderr_into_virtual_buffer
+    @dispatcher.dispatch_ex(@editor, "!echo out; echo err 1>&2")
+
+    assert_equal "[Shell Output]", @editor.message
+    assert_equal :help, @editor.current_buffer.kind
+    body = @editor.current_buffer.lines.join("\n")
+    assert_includes body, "[command]"
+    assert_includes body, "echo out; echo err 1>&2"
+    assert_includes body, "[stdout]"
+    assert_includes body, "out"
+    assert_includes body, "[stderr]"
+    assert_includes body, "err"
+    assert_includes body, "[status]"
+  end
+
   def test_dispatch_ex_set_commands
     @dispatcher.dispatch_ex(@editor, "set number")
     assert_equal true, @editor.current_window.options["number"]
@@ -121,4 +151,90 @@ class DispatcherTest < Minitest::Test
     @dispatcher.dispatch_ex(@editor, "lnext")
     assert_equal 1, @editor.current_window.cursor_y
   end
+
+  def test_hidden_option_allows_buffer_switch_without_bang
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["x"])
+    @editor.current_buffer.modified = true
+    other = @editor.add_empty_buffer(path: "other.txt")
+    @editor.set_option("hidden", true, scope: :global)
+
+    @dispatcher.dispatch_ex(@editor, "buffer #{other.id}")
+
+    assert_equal other.id, @editor.current_buffer.id
+    refute @editor.message_error?
+  end
+
+  def test_autowrite_saves_current_buffer_before_buffer_switch
+    Dir.mktmpdir("ruvim-autowrite") do |dir|
+      path = File.join(dir, "a.txt")
+      File.write(path, "old\n")
+      @editor.materialize_intro_buffer!
+      @editor.current_buffer.path = path
+      @editor.current_buffer.replace_all_lines!(["new"])
+      @editor.current_buffer.modified = true
+      other = @editor.add_empty_buffer(path: "other.txt")
+      @editor.set_option("autowrite", true, scope: :global)
+
+      @dispatcher.dispatch_ex(@editor, "buffer #{other.id}")
+
+      assert_equal other.id, @editor.current_buffer.id
+      assert_equal "new", File.read(path).strip
+    end
+  end
+
+  def test_bdelete_deletes_current_buffer_and_switches_to_another
+    @editor.materialize_intro_buffer!
+    first = @editor.current_buffer
+    other = @editor.add_empty_buffer(path: "other.txt")
+    @dispatcher.dispatch_ex(@editor, "buffer #{other.id}")
+    assert_equal other.id, @editor.current_buffer.id
+
+    @dispatcher.dispatch_ex(@editor, "bd")
+
+    assert_equal first.id, @editor.current_buffer.id
+    refute @editor.buffers.key?(other.id)
+    assert_equal "buffer #{other.id} deleted", @editor.message
+  end
+
+  def test_bdelete_rejects_modified_buffer_without_bang
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["x"])
+    @editor.current_buffer.modified = true
+
+    @dispatcher.dispatch_ex(@editor, "bd")
+
+    assert_equal true, @editor.message_error?
+    assert_match(/No write since last change/, @editor.message)
+    assert @editor.buffers.key?(@editor.current_buffer.id)
+  end
+
+  def test_bdelete_bang_deletes_modified_buffer
+    @editor.materialize_intro_buffer!
+    first = @editor.current_buffer
+    other = @editor.add_empty_buffer(path: "other.txt")
+    @dispatcher.dispatch_ex(@editor, "buffer #{other.id}")
+    @editor.current_buffer.replace_all_lines!(["dirty"])
+    @editor.current_buffer.modified = true
+
+    @dispatcher.dispatch_ex(@editor, "bd!")
+
+    assert_equal first.id, @editor.current_buffer.id
+    refute @editor.buffers.key?(other.id)
+    refute @editor.message_error?
+  end
+
+  def test_splitbelow_and_splitright_change_insertion_side
+    @editor.set_option("splitbelow", false, scope: :global)
+    first = @editor.current_window_id
+    @dispatcher.dispatch_ex(@editor, "split")
+    assert_equal @editor.window_order[0], @editor.current_window_id
+    assert_equal first, @editor.window_order[1]
+
+    @editor.set_option("splitright", false, scope: :global)
+    @editor.current_window_id = first
+    @dispatcher.dispatch_ex(@editor, "vsplit")
+    idx = @editor.window_order.index(@editor.current_window_id)
+    assert_equal 1, idx
+  end
 end

data/test/display_width_test.rb

@@ -0,0 +1,18 @@
+require_relative "test_helper"
+
+class DisplayWidthTest < Minitest::Test
+  def test_ambiguous_width_cache_tracks_env_changes
+    prev = ENV["RUVIM_AMBIGUOUS_WIDTH"]
+    ENV["RUVIM_AMBIGUOUS_WIDTH"] = nil
+    assert_equal 1, RuVim::DisplayWidth.cell_width("Ω")
+
+    ENV["RUVIM_AMBIGUOUS_WIDTH"] = "2"
+    assert_equal 2, RuVim::DisplayWidth.cell_width("Ω")
+  ensure
+    if prev.nil?
+      ENV.delete("RUVIM_AMBIGUOUS_WIDTH")
+    else
+      ENV["RUVIM_AMBIGUOUS_WIDTH"] = prev
+    end
+  end
+end

data/test/fixtures/render_basic_snapshot.txt

@@ -1,8 +1,7 @@
-1 # title               
-2                       
-3 foo                   
-4 bar 日本語 編集       
-5 baz                   
-  ~                     
-  ~                     
--- NORMAL -- t1/1 w 1:1 
+   1 # title            
+   2                    
+   3 foo                
+   4 bar 日本語 編集    
+   5 baz                
+     ~                  
+-- NORMAL -- [No Na 1:1 

data/test/fixtures/render_basic_snapshot_nonumber.txt

@@ -4,5 +4,4 @@ foo
 bar 日本語 編集         
 baz                     
 ~                       
-~                       
--- NORMAL -- t1/1 w 1:1 
+-- NORMAL -- [No Na 1:1 

data/test/fixtures/render_unicode_scrolled_snapshot.txt

@@ -1,7 +1,6 @@
-1 # title           
-2                   
-3 foo               
-4 bar 日本語 編集   
-5 baz               
-6 qux               
--- NORMAL -- t1 4:5 
+   1 # title        
+   2                
+   3 foo            
+   4 bar 日本語 編集
+   5 baz            
+-- NORMAL -- [N 4:5 

data/test/input_screen_integration_test.rb

@@ -30,6 +30,21 @@ class InputScreenIntegrationTest < Minitest::Test
     end
   end
 
+  def with_fake_select
+    io_sc = IO.singleton_class
+    verbose, $VERBOSE = $VERBOSE, nil
+    io_sc.alias_method(:__orig_select_for_input_screen_test, :select)
+    io_sc.define_method(:select) do |readers, *_rest|
+      ready = Array(readers).select { |io| io.respond_to?(:ready?) && io.ready? }
+      ready.empty? ? nil : [ready, [], []]
+    end
+    yield
+  ensure
+    io_sc.alias_method(:select, :__orig_select_for_input_screen_test)
+    io_sc.remove_method(:__orig_select_for_input_screen_test) rescue nil
+    $VERBOSE = verbose
+  end
+
   def test_input_pagedown_to_app_and_screen_render
     app = RuVim::App.new(clean: true)
     editor = app.instance_variable_get(:@editor)
@@ -43,15 +58,7 @@ class InputScreenIntegrationTest < Minitest::Test
     stdin = FakeTTY.new("\e[6~")
     input = RuVim::Input.new(stdin: stdin)
 
-    io_sc = IO.singleton_class
-    verbose, $VERBOSE = $VERBOSE, nil
-    io_sc.alias_method(:__orig_select_for_input_screen_test, :select)
-    io_sc.define_method(:select) do |readers, *_rest|
-      ready = Array(readers).select { |io| io.respond_to?(:ready?) && io.ready? }
-      ready.empty? ? nil : [ready, [], []]
-    end
-
-    begin
+    with_fake_select do
       key = input.read_key(timeout: 0.2)
       assert_equal :pagedown, key
 
@@ -60,10 +67,16 @@ class InputScreenIntegrationTest < Minitest::Test
 
       assert_operator editor.current_window.cursor_y, :>, 0
       assert_includes term.writes.last, "line "
-    ensure
-      io_sc.alias_method(:select, :__orig_select_for_input_screen_test)
-      io_sc.remove_method(:__orig_select_for_input_screen_test) rescue nil
-      $VERBOSE = verbose
+    end
+  end
+
+  def test_input_keeps_repeated_arrow_sequences_separate
+    stdin = FakeTTY.new("\e[A\e[A")
+    input = RuVim::Input.new(stdin: stdin)
+
+    with_fake_select do
+      assert_equal :up, input.read_key(timeout: 0.2)
+      assert_equal :up, input.read_key(timeout: 0.2)
     end
   end
 end

data/test/screen_test.rb

@@ -55,6 +55,38 @@ class ScreenTest < Minitest::Test
     assert_equal " 3 ", screen.send(:line_number_prefix, editor, win, buf, 2, 3) # current line is absolute when both enabled
   end
 
+  def test_signcolumn_yes_reserves_one_column_in_gutter
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    editor.set_option("number", true, scope: :window, window: win, buffer: buf)
+    editor.set_option("signcolumn", "yes", scope: :window, window: win, buffer: buf)
+    term = TerminalStub.new([8, 20])
+    screen = RuVim::Screen.new(terminal: term)
+
+    w = screen.send(:number_column_width, editor, win, buf)
+    prefix = screen.send(:line_number_prefix, editor, win, buf, 0, w)
+
+    assert_equal 6, w # sign(1) + default numberwidth(4) + trailing space
+    assert_equal "    1 ", prefix
+  end
+
+  def test_signcolumn_yes_with_width_reserves_multiple_columns
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    editor.set_option("number", true, scope: :window, window: win, buffer: buf)
+    editor.set_option("signcolumn", "yes:2", scope: :window, window: win, buffer: buf)
+    term = TerminalStub.new([8, 20])
+    screen = RuVim::Screen.new(terminal: term)
+
+    w = screen.send(:number_column_width, editor, win, buf)
+    prefix = screen.send(:line_number_prefix, editor, win, buf, 0, w)
+
+    assert_equal 7, w # sign(2) + default numberwidth(4) + trailing space
+    assert_equal "     1 ", prefix
+  end
+
   def test_render_shows_error_message_on_command_line_row_with_highlight
     editor = RuVim::Editor.new
     buf = editor.add_empty_buffer
@@ -120,4 +152,138 @@ class ScreenTest < Minitest::Test
     assert_equal 10, RuVim::DisplayWidth.display_width(visible, tabstop: 2)
     refute_includes out, "\n"
   end
+
+  def test_termguicolors_uses_truecolor_sequences_for_search_highlight
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["foo"])
+    editor.set_last_search(pattern: "foo", direction: :forward)
+    editor.set_option("termguicolors", true, scope: :global)
+
+    term = TerminalStub.new([6, 20])
+    screen = RuVim::Screen.new(terminal: term)
+    out = screen.send(:render_text_line, buf.line_at(0), editor, buffer_row: 0, window: win, buffer: buf, width: 6)
+
+    assert_includes out, "\e[48;2;255;215;0m"
+  end
+
+  def test_render_text_line_respects_list_and_listchars_for_tab_trail_and_nbsp
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["\tA \u00A0  "])
+    editor.set_option("list", true, scope: :window, window: win, buffer: buf)
+    editor.set_option("listchars", "tab:>.,trail:~,nbsp:*", scope: :window, window: win, buffer: buf)
+
+    term = TerminalStub.new([6, 20])
+    screen = RuVim::Screen.new(terminal: term)
+    out = screen.send(:render_text_line, buf.line_at(0), editor, buffer_row: 0, window: win, buffer: buf, width: 12)
+    visible = out.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
+
+    assert_includes visible, ">."
+    assert_includes visible, "*"
+    assert_includes visible, "~"
+  end
+
+  def test_render_text_line_sanitizes_terminal_escape_controls
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["A\e]52;c;owned\aB"])
+    win.cursor_y = 1 # avoid cursor highlight on the tested row
+
+    term = TerminalStub.new([6, 40])
+    screen = RuVim::Screen.new(terminal: term)
+    out = screen.send(:render_text_line, buf.line_at(0), editor, buffer_row: 0, window: win, buffer: buf, width: 20)
+
+    refute_includes out, "\e]52"
+    visible = out.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
+    assert_includes visible, "A"
+    assert_includes visible, "B"
+    assert_includes visible, "?"
+  end
+
+  def test_wrap_and_showbreak_render_continuation_rows
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["abcdef ghijkl"])
+    editor.set_option("wrap", true, scope: :window, window: win, buffer: buf)
+    editor.set_option("showbreak", ">>", scope: :window, window: win, buffer: buf)
+
+    term = TerminalStub.new([6, 8])
+    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:)
+
+    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]/, "")
+    assert_includes row1, "abcdef"
+    assert_includes row2, ">>"
+  end
+
+  def test_cursor_screen_position_supports_virtualedit_past_eol
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["abc"])
+    editor.set_option("virtualedit", "onemore", scope: :global)
+    win.cursor_y = 0
+    win.cursor_x = 4
+
+    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:)
+    pos = screen.send(:cursor_screen_position, editor, text_rows, rects)
+
+    # col 1-based; "abc" places cursor at 4, one-past-eol should be 5
+    assert_equal [1, 5], pos
+  end
+
+  def test_cursor_screen_position_is_clamped_to_text_area_under_wrap
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["x" * 40, "tail"])
+    editor.set_option("wrap", true, scope: :window, window: win, buffer: buf)
+    win.row_offset = 0
+    win.cursor_y = 1
+    win.cursor_x = 0
+
+    term = TerminalStub.new([6, 8]) # text_rows = 4 (footer 2 rows)
+    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:)
+    row, _col = screen.send(:cursor_screen_position, editor, text_rows, rects)
+
+    assert_operator row, :<=, text_rows
+  end
+
+  def test_linebreak_and_breakindent_prefer_space_wrap
+    editor = RuVim::Editor.new
+    buf = editor.add_empty_buffer
+    win = editor.add_window(buffer_id: buf.id)
+    buf.replace_all_lines!(["  foo bar baz"])
+    editor.set_option("wrap", true, scope: :window, window: win, buffer: buf)
+    editor.set_option("linebreak", true, scope: :window, window: win, buffer: buf)
+    editor.set_option("breakindent", true, scope: :window, window: win, buffer: buf)
+    editor.set_option("showbreak", ">", scope: :window, window: win, buffer: buf)
+
+    term = TerminalStub.new([6, 10])
+    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:)
+
+    row2 = frame[:lines][2].to_s.gsub(/\e\[[0-9;?]*[A-Za-z]/, "")
+    assert_includes row2, ">"
+    assert_match(/\s>|\>\s/, row2)
+  end
 end

data/test/window_test.rb

@@ -18,4 +18,30 @@ class WindowTest < Minitest::Test
     assert_operator cursor_col, :<, offset_col + 4
     assert_equal 3, win.col_offset
   end
+
+  def test_ensure_visible_respects_scrolloff_and_sidescrolloff
+    buffer = RuVim::Buffer.new(id: 1, lines: ["0123456789", "aaaaa", "bbbbb", "ccccc", "0123456789", "eeeee"])
+    win = RuVim::Window.new(id: 1, buffer_id: 1)
+    win.cursor_y = 4
+    win.cursor_x = 8
+
+    win.ensure_visible(buffer, height: 3, width: 5, tabstop: 2, scrolloff: 1, sidescrolloff: 1)
+
+    assert_equal 3, win.row_offset
+    assert_operator win.col_offset, :>, 0
+  end
+
+  def test_move_down_preserves_preferred_column_across_empty_line
+    long = "x" * 80
+    buffer = RuVim::Buffer.new(id: 1, lines: [long, "", long])
+    win = RuVim::Window.new(id: 1, buffer_id: 1)
+    win.cursor_y = 0
+    win.cursor_x = 50
+
+    win.move_down(buffer)
+    assert_equal [1, 0], [win.cursor_y, win.cursor_x]
+
+    win.move_down(buffer)
+    assert_equal [2, 50], [win.cursor_y, win.cursor_x]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruvim
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Koichi Sasada
@@ -24,6 +24,7 @@ files:
 - docs/command.md
 - docs/config.md
 - docs/done.md
+- docs/lib_cleanup_report.md
 - docs/plugin.md
 - docs/spec.md
 - docs/todo.md
@@ -49,6 +50,7 @@ files:
 - lib/ruvim/highlighter.rb
 - lib/ruvim/input.rb
 - lib/ruvim/keymap_manager.rb
+- lib/ruvim/keyword_chars.rb
 - lib/ruvim/screen.rb
 - lib/ruvim/terminal.rb
 - lib/ruvim/text_metrics.rb
@@ -66,7 +68,9 @@ files:
 - test/buffer_test.rb
 - test/cli_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/fixtures/render_basic_snapshot.txt