ruvim 0.3.0 → 0.6.0

data/test/app_completion_test.rb

@@ -6,6 +6,8 @@ class AppCompletionTest < Minitest::Test
   def setup
     @app = RuVim::App.new
     @editor = @app.instance_variable_get(:@editor)
+    @key_handler = @app.instance_variable_get(:@key_handler)
+    @completion = @app.instance_variable_get(:@completion)
   end
 
   def test_app_starts_with_intro_buffer_without_path
@@ -20,7 +22,7 @@ class AppCompletionTest < Minitest::Test
     cmd = @editor.command_line
     cmd.replace_text("set nu")
 
-    @app.send(:command_line_complete)
+    @completion.command_line_complete
 
     assert_equal "set number", cmd.text
   end
@@ -33,7 +35,7 @@ class AppCompletionTest < Minitest::Test
     @editor.current_window.cursor_x = 2
     @editor.enter_insert_mode
 
-    @app.send(:handle_insert_key, :ctrl_n)
+    @key_handler.send(:handle_insert_key, :ctrl_n)
 
     assert_equal "foobar", b.line_at(0)
     assert_equal 6, @editor.current_window.cursor_x
@@ -45,7 +47,7 @@ class AppCompletionTest < Minitest::Test
       File.write(File.join(dir, "a.o"), "")
       @editor.set_option("wildignore", "*.o", scope: :global)
 
-      matches = @app.send(:path_completion_candidates, File.join(dir, "a"))
+      matches = @completion.send(:path_completion_candidates, File.join(dir, "a"))
 
       assert_includes matches, File.join(dir, "a.rb")
       refute_includes matches, File.join(dir, "a.o")
@@ -57,7 +59,7 @@ class AppCompletionTest < Minitest::Test
       Dir.chdir(dir) do
         FileUtils.mkdir_p("lib")
 
-        matches = @app.send(:path_completion_candidates, "li")
+        matches = @completion.send(:path_completion_candidates, "li")
 
         assert_includes matches, "lib/"
       end
@@ -70,7 +72,7 @@ class AppCompletionTest < Minitest::Test
       File.write(File.join(dir, "aaa.txt"), "")
       File.write(File.join(dir, "bbb.txt"), "")
 
-      matches = @app.send(:path_completion_candidates, File.join(dir, ""))
+      matches = @completion.send(:path_completion_candidates, File.join(dir, ""))
 
       assert_includes matches, File.join(dir, ".git/")
       visible_idx = matches.index(File.join(dir, "aaa.txt"))
@@ -96,10 +98,10 @@ class AppCompletionTest < Minitest::Test
       cmd = @editor.command_line
       cmd.replace_text("e #{File.join(dir, "a")}")
 
-      @app.send(:command_line_complete)
+      @completion.command_line_complete
       first = cmd.text.dup
       first_msg = @editor.message.dup
-      @app.send(:command_line_complete)
+      @completion.command_line_complete
       second = cmd.text.dup
       second_msg = @editor.message.dup
 
@@ -125,10 +127,10 @@ class AppCompletionTest < Minitest::Test
       cmd = @editor.command_line
       cmd.replace_text("e #{File.join(dir, "a")}")
 
-      @app.send(:command_line_complete)
+      @completion.command_line_complete
       assert_equal "e #{File.join(dir, "a")}", cmd.text
 
-      @app.send(:command_line_complete)
+      @completion.command_line_complete
       assert([a, b].any? { |p| cmd.text.end_with?(p) })
     end
   end
@@ -148,9 +150,9 @@ class AppCompletionTest < Minitest::Test
       cmd = @editor.command_line
       cmd.replace_text("e #{File.join(dir, "a")}")
 
-      @app.send(:command_line_complete)
+      @completion.command_line_complete
       first = cmd.text.dup
-      @app.send(:command_line_complete)
+      @completion.command_line_complete
       second = cmd.text.dup
 
       refute_equal first, second
@@ -168,7 +170,7 @@ class AppCompletionTest < Minitest::Test
     cmd = @editor.command_line
     cmd.replace_text("se")
 
-    @app.send(:command_line_complete)
+    @completion.command_line_complete
 
     assert_equal "se", cmd.text
     assert_includes @editor.message, "set"
@@ -186,11 +188,11 @@ class AppCompletionTest < Minitest::Test
     @editor.current_window.cursor_x = 2
     @editor.enter_insert_mode
 
-    @app.send(:handle_insert_key, :ctrl_n)
+    @key_handler.send(:handle_insert_key, :ctrl_n)
     assert_equal "fo", b.line_at(0)
     assert_includes @editor.message, "..."
 
-    @app.send(:handle_insert_key, :ctrl_n)
+    @key_handler.send(:handle_insert_key, :ctrl_n)
     assert_equal "foobar", b.line_at(0)
   end
 
@@ -203,11 +205,58 @@ class AppCompletionTest < Minitest::Test
     @editor.current_window.cursor_x = 2
     @editor.enter_insert_mode
 
-    @app.send(:handle_insert_key, :ctrl_n)
+    @key_handler.send(:handle_insert_key, :ctrl_n)
     assert_equal "fo", b.line_at(0)
     assert_includes @editor.message, "["
 
-    @app.send(:handle_insert_key, :ctrl_n)
+    @key_handler.send(:handle_insert_key, :ctrl_n)
     assert_equal "foobar", b.line_at(0)
   end
+
+  def test_git_subcommand_completion
+    @editor.materialize_intro_buffer!
+    @editor.enter_command_line_mode(":")
+    cmd = @editor.command_line
+    cmd.replace_text("git bl")
+
+    @completion.command_line_complete
+
+    # "bl" matches "blame", "blameback", "blamecommit", "blameprev", "branch"
+    # With multiple matches, wildmode applies (longest common prefix or cycle)
+    text = cmd.text
+    assert text.start_with?("git bl"), "Expected completion to keep 'git bl' prefix, got: #{text}"
+  end
+
+  def test_git_subcommand_completion_unique
+    @editor.materialize_intro_buffer!
+    @editor.enter_command_line_mode(":")
+    cmd = @editor.command_line
+    cmd.replace_text("git commi")
+
+    @completion.command_line_complete
+
+    assert_equal "git commit", cmd.text
+  end
+
+  def test_git_subcommand_completion_includes_external
+    @editor.materialize_intro_buffer!
+    @editor.enter_command_line_mode(":")
+    cmd = @editor.command_line
+    cmd.replace_text("git stas")
+
+    @completion.command_line_complete
+
+    assert_equal "git stash", cmd.text
+  end
+
+  def test_gh_subcommand_completion_includes_external
+    @editor.materialize_intro_buffer!
+    @editor.enter_command_line_mode(":")
+    cmd = @editor.command_line
+    cmd.replace_text("gh issu")
+
+    @completion.command_line_complete
+
+    assert_equal "gh issue", cmd.text
+  end
 end

data/test/app_dot_repeat_test.rb

@@ -4,13 +4,14 @@ class AppDotRepeatTest < Minitest::Test
   def setup
     @app = RuVim::App.new(clean: true)
     @editor = @app.instance_variable_get(:@editor)
+    @key_handler = @app.instance_variable_get(:@key_handler)
     @editor.materialize_intro_buffer!
     @buffer = @editor.current_buffer
     @win = @editor.current_window
   end
 
   def press(*keys)
-    keys.each { |k| @app.send(:handle_normal_key, k) }
+    keys.each { |k| @key_handler.send(:handle_normal_key, k) }
   end
 
   def test_dot_repeats_x
@@ -57,11 +58,34 @@ class AppDotRepeatTest < Minitest::Test
     @win.cursor_x = 0
 
     press("s")
-    @app.send(:handle_key, "X")
-    @app.send(:handle_key, :escape)
+    @key_handler.handle("X")
+    @key_handler.handle(:escape)
     press("l")
     press(".")
 
     assert_equal "XbXd", @buffer.line_at(0)
   end
+
+  def test_dot_repeats_counted_x
+    @buffer.replace_all_lines!(["abcdefgh"])
+    @win.cursor_x = 0
+
+    @key_handler.handle("3")
+    press("x")
+    assert_equal "defgh", @buffer.line_at(0)
+
+    press(".")
+    assert_equal "gh", @buffer.line_at(0)
+  end
+
+  def test_dot_repeats_counted_dd
+    @buffer.replace_all_lines!(["a", "b", "c", "d", "e", "f"])
+
+    @key_handler.handle("2")
+    press("d", "d")
+    assert_equal ["c", "d", "e", "f"], @buffer.lines
+
+    press(".")
+    assert_equal ["e", "f"], @buffer.lines
+  end
 end

data/test/app_ex_command_test.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class AppExCommandTest < Minitest::Test
+  def setup
+    @app = RuVim::App.new(clean: true)
+    @editor = @app.instance_variable_get(:@editor)
+    @key_handler = @app.instance_variable_get(:@key_handler)
+    @editor.materialize_intro_buffer!
+  end
+
+  def feed(*keys)
+    keys.each { |k| @key_handler.handle(k) }
+  end
+
+  def buf
+    @editor.current_buffer
+  end
+
+  def win
+    @editor.current_window
+  end
+
+  # --- :set ---
+
+  def test_set_number_on_off
+    feed(":", "s", "e", "t", " ", "n", "u", "m", "b", "e", "r", :enter)
+    assert @editor.get_option("number")
+
+    feed(":", "s", "e", "t", " ", "n", "o", "n", "u", "m", "b", "e", "r", :enter)
+    refute @editor.get_option("number")
+  end
+
+  def test_set_tabstop_value
+    feed(":", "s", "e", "t", " ", "t", "a", "b", "s", "t", "o", "p", "=", "8", :enter)
+    assert_equal 8, @editor.get_option("tabstop")
+  end
+
+  def test_set_option_query
+    feed(":", "s", "e", "t", " ", "n", "u", "m", "b", "e", "r", "?", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :bindings ---
+
+  def test_bindings_command
+    feed(":", "b", "i", "n", "d", "i", "n", "g", "s", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_bindings_with_mode_filter
+    feed(":", "b", "i", "n", "d", "i", "n", "g", "s", " ", "n", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :tabnew / :tabnext / :tabprev ---
+
+  def test_tabnext_tabprev_via_ex
+    feed(":", "t", "a", "b", "n", "e", "w", :enter)
+    feed(":", "t", "a", "b", "p", "r", "e", "v", :enter)
+    feed(":", "t", "a", "b", "n", "e", "x", "t", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :bnext / :bprev ---
+
+  def test_bnext_bprev_via_ex
+    feed(":", "b", "n", "e", "x", "t", :enter)
+    feed(":", "b", "p", "r", "e", "v", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :copen / :cclose / :cprev / :lclose / :lprev ---
+
+  def test_copen_and_cclose
+    feed(":", "c", "o", "p", "e", "n", :enter)
+    feed(":", "c", "c", "l", "o", "s", "e", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_cprev_with_empty_list
+    feed(":", "c", "p", "r", "e", "v", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_lclose_without_open
+    feed(":", "l", "c", "l", "o", "s", "e", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_lprev_with_empty_list
+    feed(":", "l", "p", "r", "e", "v", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :args ---
+
+  def test_arglist_operations
+    feed(":", "a", "r", "g", "s", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :wq ---
+
+  def test_wq_with_no_filename_shows_error
+    feed(":", "w", "q", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :edit ---
+
+  def test_edit_no_file_reloads_or_errors
+    feed(":", "e", "d", "i", "t", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :split / :vsplit + window focus ---
+
+  def test_window_focus_after_split
+    feed(":", "s", "p", "l", "i", "t", :enter)
+    original_win_id = @editor.current_window.id
+
+    feed(:ctrl_w, "w")
+    refute_equal original_win_id, @editor.current_window.id
+
+    feed(:ctrl_w, "j")
+    feed(:ctrl_w, "k")
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_window_focus_left_right
+    feed(":", "v", "s", "p", "l", "i", "t", :enter)
+    feed(:ctrl_w, "h")
+    feed(:ctrl_w, "l")
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- :b# (alternate buffer) ---
+
+  def test_buffer_alternate_hash
+    feed(":", "s", "p", "l", "i", "t", :enter)
+    feed(":", "b", "#", :enter)
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- rich view toggle ---
+
+  def test_rich_toggle
+    buf.replace_all_lines!(["hello world"])
+    feed("g", "r")
+    assert_equal :normal, @editor.mode
+  end
+end

data/test/app_motion_test.rb

@@ -4,11 +4,12 @@ class AppMotionTest < Minitest::Test
   def setup
     @app = RuVim::App.new(clean: true)
     @editor = @app.instance_variable_get(:@editor)
+    @key_handler = @app.instance_variable_get(:@key_handler)
     @editor.materialize_intro_buffer!
   end
 
   def press(*keys)
-    keys.each { |k| @app.send(:handle_normal_key, k) }
+    keys.each { |k| @key_handler.send(:handle_normal_key, k) }
   end
 
   def test_find_char_and_repeat
@@ -59,14 +60,14 @@ class AppMotionTest < Minitest::Test
 
     @editor.current_window_view_height_hint = 5
 
-    @app.send(:handle_normal_key, :pagedown)
+    @key_handler.send(:handle_normal_key, :pagedown)
     assert_equal 4, @editor.current_window.cursor_y
 
     @editor.pending_count = 2
-    @app.send(:handle_normal_key, :pagedown)
+    @key_handler.send(:handle_normal_key, :pagedown)
     assert_equal 12, @editor.current_window.cursor_y
 
-    @app.send(:handle_normal_key, :pageup)
+    @key_handler.send(:handle_normal_key, :pageup)
     assert_equal 8, @editor.current_window.cursor_y
   end
 
@@ -78,16 +79,16 @@ class AppMotionTest < Minitest::Test
 
     @editor.current_window_view_height_hint = 10
 
-    @app.send(:handle_normal_key, :ctrl_d)
+    @key_handler.send(:handle_normal_key, :ctrl_d)
     assert_equal 5, @editor.current_window.cursor_y
 
-    @app.send(:handle_normal_key, :ctrl_u)
+    @key_handler.send(:handle_normal_key, :ctrl_u)
     assert_equal 0, @editor.current_window.cursor_y
 
-    @app.send(:handle_normal_key, :ctrl_f)
+    @key_handler.send(:handle_normal_key, :ctrl_f)
     assert_equal 9, @editor.current_window.cursor_y
 
-    @app.send(:handle_normal_key, :ctrl_b)
+    @key_handler.send(:handle_normal_key, :ctrl_b)
     assert_equal 0, @editor.current_window.cursor_y
   end
 
@@ -100,11 +101,11 @@ class AppMotionTest < Minitest::Test
 
     @editor.current_window_view_height_hint = 10
 
-    @app.send(:handle_normal_key, :ctrl_e)
+    @key_handler.send(:handle_normal_key, :ctrl_e)
     assert_equal 6, @editor.current_window.row_offset
     assert_equal 6, @editor.current_window.cursor_y
 
-    @app.send(:handle_normal_key, :ctrl_y)
+    @key_handler.send(:handle_normal_key, :ctrl_y)
     assert_equal 5, @editor.current_window.row_offset
     assert_equal 6, @editor.current_window.cursor_y
   end
@@ -118,7 +119,7 @@ class AppMotionTest < Minitest::Test
     keymaps = @app.instance_variable_get(:@keymaps)
     keymaps.bind(:normal, ["<C-d>"], "cursor.down")
 
-    @app.send(:handle_normal_key, :ctrl_d)
+    @key_handler.send(:handle_normal_key, :ctrl_d)
     assert_equal 1, @editor.current_window.cursor_y
   end
 
@@ -131,7 +132,7 @@ class AppMotionTest < Minitest::Test
     keymaps = @app.instance_variable_get(:@keymaps)
     keymaps.bind(:normal, ["<PageDown>"], "cursor.down")
 
-    @app.send(:handle_normal_key, :pagedown)
+    @key_handler.send(:handle_normal_key, :pagedown)
     assert_equal 1, @editor.current_window.cursor_y
   end
 

data/test/app_register_test.rb

@@ -4,12 +4,13 @@ class AppRegisterTest < Minitest::Test
   def setup
     @app = RuVim::App.new(clean: true)
     @editor = @app.instance_variable_get(:@editor)
+    @key_handler = @app.instance_variable_get(:@key_handler)
     @editor.materialize_intro_buffer!
     @buffer = @editor.current_buffer
   end
 
   def press(*keys)
-    keys.each { |k| @app.send(:handle_normal_key, k) }
+    keys.each { |k| @key_handler.send(:handle_normal_key, k) }
   end
 
   def test_yy_updates_register_zero