ruvim 0.4.0 → 0.6.0

data/lib/ruvim/window.rb

@@ -19,17 +19,17 @@ module RuVim
     end
 
     def cursor_x=(value)
-      @cursor_x = value.to_i
+      @cursor_x = value
       @preferred_x = nil
     end
 
     def cursor_y=(value)
-      @cursor_y = value.to_i
+      @cursor_y = value
     end
 
     def clamp_to_buffer(buffer, max_extra_col: 0)
       @cursor_y = [[@cursor_y, 0].max, buffer.line_count - 1].min
-      max_col = buffer.line_length(@cursor_y) + [max_extra_col.to_i, 0].max
+      max_col = buffer.line_length(@cursor_y) + [max_extra_col, 0].max
       @cursor_x = [[@cursor_x, 0].max, max_col].min
       self
     end
@@ -71,7 +71,7 @@ module RuVim
 
     def ensure_visible(buffer, height:, width:, tabstop: 2, scrolloff: 0, sidescrolloff: 0)
       clamp_to_buffer(buffer)
-      so = [[scrolloff.to_i, 0].max, [height.to_i - 1, 0].max].min
+      so = [[scrolloff, 0].max, [height - 1, 0].max].min
 
       top_target = @cursor_y - so
       bottom_target = @cursor_y + so
@@ -82,7 +82,7 @@ module RuVim
       line = buffer.line_at(@cursor_y)
       cursor_screen_col = RuVim::TextMetrics.screen_col_for_char_index(line, @cursor_x, tabstop:)
       offset_screen_col = RuVim::TextMetrics.screen_col_for_char_index(line, @col_offset, tabstop:)
-      sso = [[sidescrolloff.to_i, 0].max, [width.to_i - 1, 0].max].min
+      sso = [[sidescrolloff, 0].max, [width - 1, 0].max].min
 
       if cursor_screen_col < offset_screen_col + sso
         target_left = [cursor_screen_col - sso, 0].max

data/lib/ruvim.rb

@@ -13,12 +13,33 @@ require_relative "ruvim/display_width"
 require_relative "ruvim/keyword_chars"
 require_relative "ruvim/text_metrics"
 require_relative "ruvim/clipboard"
+require_relative "ruvim/browser"
+require_relative "ruvim/lang/registry"
 require_relative "ruvim/lang/base"
 require_relative "ruvim/lang/markdown"
 require_relative "ruvim/lang/ruby"
 require_relative "ruvim/lang/json"
 require_relative "ruvim/lang/scheme"
+require_relative "ruvim/lang/c"
+require_relative "ruvim/lang/cpp"
 require_relative "ruvim/lang/diff"
+require_relative "ruvim/lang/yaml"
+require_relative "ruvim/lang/sh"
+require_relative "ruvim/lang/python"
+require_relative "ruvim/lang/javascript"
+require_relative "ruvim/lang/typescript"
+require_relative "ruvim/lang/html"
+require_relative "ruvim/lang/toml"
+require_relative "ruvim/lang/go"
+require_relative "ruvim/lang/rust"
+require_relative "ruvim/lang/makefile"
+require_relative "ruvim/lang/dockerfile"
+require_relative "ruvim/lang/sql"
+require_relative "ruvim/lang/elixir"
+require_relative "ruvim/lang/perl"
+require_relative "ruvim/lang/lua"
+require_relative "ruvim/lang/ocaml"
+require_relative "ruvim/lang/erb"
 require_relative "ruvim/highlighter"
 require_relative "ruvim/context"
 require_relative "ruvim/buffer"
@@ -32,6 +53,8 @@ require_relative "ruvim/git/diff"
 require_relative "ruvim/git/log"
 require_relative "ruvim/git/branch"
 require_relative "ruvim/git/commit"
+require_relative "ruvim/git/grep"
+require_relative "ruvim/gh/link"
 require_relative "ruvim/git/handler"
 require_relative "ruvim/global_commands"
 require_relative "ruvim/dispatcher"
@@ -40,12 +63,6 @@ require_relative "ruvim/command_line"
 require_relative "ruvim/input"
 require_relative "ruvim/terminal"
 require_relative "ruvim/rich_view"
-
-# Register renderers after RichView is defined
-RuVim::RichView.register("markdown", RuVim::RichView::MarkdownRenderer)
-RuVim::RichView.register("json", RuVim::RichView::JsonRenderer)
-RuVim::RichView.register("jsonl", RuVim::RichView::JsonlRenderer)
-
 require_relative "ruvim/lang/tsv"
 require_relative "ruvim/lang/csv"
 require_relative "ruvim/screen"

data/test/app_command_test.rb

@@ -0,0 +1,382 @@
+# frozen_string_literal: true
+
+require_relative "test_helper"
+
+class AppCommandTest < 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
+
+  # --- cursor commands ---
+
+  def test_cursor_line_end
+    buf.replace_all_lines!(["hello world"])
+    win.cursor_x = 0
+    feed("$")
+    assert_equal buf.line_length(0), win.cursor_x
+  end
+
+  def test_cursor_buffer_start_gg
+    buf.replace_all_lines!(["line1", "line2", "line3"])
+    win.cursor_y = 2
+    feed("g", "g")
+    assert_equal 0, win.cursor_y
+  end
+
+  # --- insert mode variants ---
+
+  def test_append_mode_a
+    buf.replace_all_lines!(["abc"])
+    win.cursor_x = 1
+    feed("a", "X", :escape)
+    assert_equal ["abXc"], buf.lines
+  end
+
+  def test_insert_line_start_nonblank_I
+    buf.replace_all_lines!(["  hello"])
+    win.cursor_x = 4
+    feed("I", "X", :escape)
+    assert_equal ["  Xhello"], buf.lines
+  end
+
+  def test_open_line_below_o
+    buf.replace_all_lines!(["hello", "world"])
+    win.cursor_y = 0
+    feed("o", "new", :escape)
+    assert_equal ["hello", "new", "world"], buf.lines
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_open_line_above_O
+    buf.replace_all_lines!(["hello", "world"])
+    win.cursor_y = 1
+    feed("O", "new", :escape)
+    assert_equal ["hello", "new", "world"], buf.lines
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- undo / redo ---
+
+  def test_undo_and_redo
+    buf.replace_all_lines!(["hello"])
+    feed("x")
+    assert_equal ["ello"], buf.lines
+
+    feed("u")
+    assert_equal ["hello"], buf.lines
+    assert_match(/Undo/, @editor.message)
+
+    feed(:ctrl_r)
+    assert_equal ["ello"], buf.lines
+    assert_match(/Redo/, @editor.message)
+  end
+
+  def test_undo_at_oldest
+    buf.replace_all_lines!(["hello"])
+    buf.instance_variable_get(:@undo_stack)&.clear
+    feed("u")
+    assert_match(/oldest/, @editor.message)
+  end
+
+  # --- search ---
+
+  def test_search_backward_mode
+    buf.replace_all_lines!(["hello world"])
+    feed("?")
+    assert_equal :command_line, @editor.mode
+  end
+
+  def test_search_prev_N
+    buf.replace_all_lines!(["aaa", "bbb", "aaa"])
+    win.cursor_y = 0
+    feed("/", "b", "b", "b", :enter)
+    assert_equal 1, win.cursor_y
+
+    feed("N")
+    assert_operator win.cursor_y, :>=, 0
+  end
+
+  def test_search_word_backward
+    buf.replace_all_lines!(["foo bar foo"])
+    win.cursor_x = 8
+    feed("#")
+    assert_equal 0, win.cursor_x
+  end
+
+  def test_search_word_forward_partial
+    buf.replace_all_lines!(["foobar foo foobar"])
+    win.cursor_x = 0
+    feed("g", "*")
+    assert_operator win.cursor_x, :>, 0
+  end
+
+  def test_search_word_backward_partial
+    buf.replace_all_lines!(["foobar foo foobar"])
+    win.cursor_x = 11
+    feed("g", "#")
+    assert_operator win.cursor_x, :<, 11
+  end
+
+  # --- marks ---
+
+  def test_mark_set_and_jump
+    buf.replace_all_lines!(["line1", "line2", "line3"])
+    win.cursor_y = 1
+    feed("m", "a")
+
+    win.cursor_y = 0
+    feed("'", "a")
+    assert_equal 1, win.cursor_y
+  end
+
+  def test_mark_jump_unset
+    buf.replace_all_lines!(["line1"])
+    feed("`", "z")
+    assert_match(/Mark not set/, @editor.message)
+  end
+
+  def test_mark_pending_escape_cancels
+    buf.replace_all_lines!(["hello"])
+    feed("m", "\e")
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_mark_pending_invalid_char
+    buf.replace_all_lines!(["hello"])
+    feed("m", " ")
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- jump list ---
+
+  def test_jump_older_and_newer
+    buf.replace_all_lines!((1..20).map { |i| "line#{i}" })
+    win.cursor_y = 0
+
+    feed("G")
+    last_line = buf.line_count - 1
+    assert_equal last_line, win.cursor_y
+
+    feed(:ctrl_o)
+    old_y = win.cursor_y
+
+    feed(:ctrl_i)
+    new_y = win.cursor_y
+    assert_operator new_y, :>=, old_y
+  end
+
+  def test_jump_older_empty
+    buf.replace_all_lines!(["line1"])
+    @editor.instance_variable_get(:@jump_list)&.clear rescue nil
+    feed(:ctrl_o)
+    assert_match(/Jump list/, @editor.message.to_s) if @editor.message
+  end
+
+  def test_backtick_backtick_jumps_older
+    buf.replace_all_lines!((1..10).map { |i| "line#{i}" })
+    win.cursor_y = 0
+    feed("G")
+    feed("`", "`")
+    assert_equal 0, win.cursor_y
+  end
+
+  def test_jump_pending_escape_cancels
+    buf.replace_all_lines!(["hello"])
+    feed("'", "\e")
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_jump_pending_invalid_mark
+    buf.replace_all_lines!(["hello"])
+    feed("'", " ")
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- visual mode ---
+
+  def test_visual_line_yank
+    buf.replace_all_lines!(["aaa", "bbb", "ccc"])
+    win.cursor_y = 0
+    feed("V", "j", "y")
+
+    reg = @editor.get_register("\"")
+    assert_equal :normal, @editor.mode
+    assert_includes reg[:text], "aaa"
+    assert_includes reg[:text], "bbb"
+  end
+
+  def test_visual_line_delete
+    buf.replace_all_lines!(["aaa", "bbb", "ccc"])
+    win.cursor_y = 0
+    feed("V", "j", "d")
+
+    assert_equal ["ccc"], buf.lines
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_visual_char_delete
+    buf.replace_all_lines!(["abcdef"])
+    win.cursor_x = 1
+    feed("v", "l", "l", "d")
+
+    assert_equal ["aef"], buf.lines
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_visual_select_text_object_iw
+    buf.replace_all_lines!(["hello world"])
+    win.cursor_x = 0
+    feed("v", "i", "w")
+    assert_equal :visual_char, @editor.mode
+  end
+
+  # --- delete operator ---
+
+  def test_delete_gg_motion
+    buf.replace_all_lines!(["aaa", "bbb", "ccc"])
+    win.cursor_y = 2
+    feed("d", "g", "g")
+    assert_equal [""], buf.lines
+  end
+
+  def test_delete_j_motion
+    buf.replace_all_lines!(["aaa", "bbb", "ccc"])
+    win.cursor_y = 0
+    feed("d", "j")
+    assert_equal ["ccc"], buf.lines
+  end
+
+  def test_delete_k_motion
+    buf.replace_all_lines!(["aaa", "bbb", "ccc"])
+    win.cursor_y = 1
+    feed("d", "k")
+    assert_equal ["ccc"], buf.lines
+  end
+
+  def test_delete_word_dw
+    buf.replace_all_lines!(["hello world"])
+    win.cursor_x = 0
+    feed("d", "w")
+    assert_equal ["world"], buf.lines
+  end
+
+  def test_delete_aw
+    buf.replace_all_lines!(["hello world"])
+    win.cursor_x = 0
+    feed("d", "a", "w")
+    assert_equal ["world"], buf.lines
+  end
+
+  # --- yank operator ---
+
+  def test_yank_word_yw
+    buf.replace_all_lines!(["hello world"])
+    win.cursor_x = 0
+    feed("y", "w")
+    reg = @editor.get_register("\"")
+    assert_equal "hello ", reg[:text]
+  end
+
+  def test_yank_gg_motion
+    buf.replace_all_lines!(["aaa", "bbb", "ccc"])
+    win.cursor_y = 2
+    feed("y", "g", "g")
+    reg = @editor.get_register("\"")
+    assert_includes reg[:text], "aaa"
+    assert_includes reg[:text], "ccc"
+  end
+
+  def test_yank_iw
+    buf.replace_all_lines!(["hello world"])
+    win.cursor_x = 0
+    feed("y", "i", "w")
+    reg = @editor.get_register("\"")
+    assert_equal "hello", reg[:text]
+  end
+
+  def test_yank_aw
+    buf.replace_all_lines!(["hello world"])
+    win.cursor_x = 0
+    feed("y", "a", "w")
+    reg = @editor.get_register("\"")
+    assert_equal "hello ", reg[:text]
+  end
+
+  # --- indent operator ---
+
+  def test_indent_j_motion
+    buf.replace_all_lines!(["  aaa", "  bbb", "ccc"])
+    win.cursor_y = 0
+    feed("=", "j")
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_indent_gg_motion
+    buf.replace_all_lines!(["  aaa", "  bbb"])
+    win.cursor_y = 1
+    feed("=", "g", "g")
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_indent_k_motion
+    buf.replace_all_lines!(["aaa", "  bbb", "ccc"])
+    win.cursor_y = 1
+    feed("=", "k")
+    assert_equal :normal, @editor.mode
+  end
+
+  def test_indent_G_motion
+    buf.replace_all_lines!(["  aaa", "  bbb"])
+    win.cursor_y = 0
+    feed("=", "G")
+    assert_equal :normal, @editor.mode
+  end
+
+  # --- arrow and page keys ---
+
+  def test_arrow_keys_in_normal_mode
+    buf.replace_all_lines!(["abc", "def"])
+    win.cursor_y = 0
+    win.cursor_x = 0
+    feed(:right)
+    assert_equal 1, win.cursor_x
+    feed(:down)
+    assert_equal 1, win.cursor_y
+    feed(:left)
+    assert_equal 0, win.cursor_x
+    feed(:up)
+    assert_equal 0, win.cursor_y
+  end
+
+  def test_page_keys_in_normal_mode
+    buf.replace_all_lines!((1..30).map { |i| "line#{i}" })
+    @editor.current_window_view_height_hint = 10
+    win.cursor_y = 0
+    feed(:pagedown)
+    assert_operator win.cursor_y, :>, 0
+    feed(:pageup)
+    assert_equal 0, win.cursor_y
+  end
+
+  # --- escape clears message ---
+
+  def test_escape_clears_message
+    @editor.echo("test message")
+    feed("\e")
+  end
+end

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,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
 
@@ -217,7 +219,7 @@ class AppCompletionTest < Minitest::Test
     cmd = @editor.command_line
     cmd.replace_text("git bl")
 
-    @app.send(:command_line_complete)
+    @completion.command_line_complete
 
     # "bl" matches "blame", "blameback", "blamecommit", "blameprev", "branch"
     # With multiple matches, wildmode applies (longest common prefix or cycle)
@@ -229,10 +231,32 @@ class AppCompletionTest < Minitest::Test
     @editor.materialize_intro_buffer!
     @editor.enter_command_line_mode(":")
     cmd = @editor.command_line
-    cmd.replace_text("git co")
+    cmd.replace_text("git commi")
 
-    @app.send(:command_line_complete)
+    @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