ruvim 0.2.0 → 0.4.0

data/test/config_dsl_test.rb

@@ -75,4 +75,91 @@ class ConfigDSLTest < Minitest::Test
     assert_equal :match, match.status
     assert match.invocation.id.start_with?("user.keymap.global.")
   end
+
+  def test_nmap_with_command_id_string
+    @command_registry.register("test.cmd", call: ->(_ctx, **) {}, desc: "test", source: :builtin)
+    @dsl.nmap("T", "test.cmd")
+    match = @keymaps.resolve(:normal, ["T"])
+    assert_equal :match, match.status
+    assert_equal "test.cmd", match.invocation.id
+  end
+
+  def test_nmap_without_command_id_or_block_raises
+    # ConfigDSL < BasicObject, so raise becomes NoMethodError for ::ArgumentError
+    assert_raises(NoMethodError, ArgumentError) { @dsl.nmap("T") }
+  end
+
+  def test_imap_without_block_or_id_raises
+    assert_raises(NoMethodError, ArgumentError) { @dsl.imap("T") }
+  end
+
+  def test_command_registers_user_command
+    @dsl.command("my.cmd", desc: "custom") { |_ctx, **| }
+    spec = @command_registry.fetch("my.cmd")
+    assert_equal :user, spec.source
+    assert_equal "custom", spec.desc
+  end
+
+  def test_command_without_block_raises
+    assert_raises(NoMethodError, ArgumentError) { @dsl.command("my.cmd") }
+  end
+
+  def test_nmap_with_filetype
+    dsl = RuVim::ConfigDSL.new(
+      command_registry: @command_registry,
+      ex_registry: @ex_registry,
+      keymaps: @keymaps,
+      command_host: RuVim::GlobalCommands.instance,
+      filetype: "ruby"
+    )
+    dsl.nmap("K", desc: "ft test") { |_ctx, **| }
+    editor = fresh_editor
+    editor.current_buffer.options["filetype"] = "ruby"
+    match = @keymaps.resolve_with_context(:normal, ["K"], editor: editor)
+    assert_equal :match, match.status
+  end
+
+  def test_set_option_requires_editor
+    assert_raises(NoMethodError, ArgumentError) { @dsl.set("number") }
+  end
+
+  def test_set_boolean_option
+    editor = fresh_editor
+    dsl = RuVim::ConfigDSL.new(
+      command_registry: @command_registry,
+      ex_registry: @ex_registry,
+      keymaps: @keymaps,
+      command_host: RuVim::GlobalCommands.instance,
+      editor: editor
+    )
+    dsl.set("number")
+    assert editor.get_option("number")
+  end
+
+  def test_set_no_prefix_disables_option
+    editor = fresh_editor
+    dsl = RuVim::ConfigDSL.new(
+      command_registry: @command_registry,
+      ex_registry: @ex_registry,
+      keymaps: @keymaps,
+      command_host: RuVim::GlobalCommands.instance,
+      editor: editor
+    )
+    dsl.set("number")
+    dsl.set("nonumber")
+    refute editor.get_option("number")
+  end
+
+  def test_set_with_value
+    editor = fresh_editor
+    dsl = RuVim::ConfigDSL.new(
+      command_registry: @command_registry,
+      ex_registry: @ex_registry,
+      keymaps: @keymaps,
+      command_host: RuVim::GlobalCommands.instance,
+      editor: editor
+    )
+    dsl.set("tabstop=4")
+    assert_equal 4, editor.get_option("tabstop")
+  end
 end

data/test/dispatcher_test.rb

@@ -33,6 +33,53 @@ class DispatcherTest < Minitest::Test
     assert_includes body, "Write current buffer"
   end
 
+  def test_dispatch_ex_bindings_lists_buffer_filetype_and_app_layers
+    keymaps = @app.instance_variable_get(:@keymaps)
+    @editor.current_buffer.options["filetype"] = "ruby"
+    keymaps.bind_buffer(@editor.current_buffer.id, "Q", "ui.clear_message")
+    keymaps.bind_filetype("ruby", "K", "cursor.up", mode: :normal)
+
+    @dispatcher.dispatch_ex(@editor, "bindings")
+
+    assert_equal "[Bindings]", @editor.message
+    assert_equal :help, @editor.current_buffer.kind
+    body = @editor.current_buffer.lines.join("\n")
+    assert_includes body, "Layer: buffer"
+    assert_includes body, "Layer: filetype"
+    assert_includes body, "Layer: app"
+    assert_operator body.index("Layer: buffer"), :<, body.index("Layer: filetype")
+    assert_operator body.index("Layer: filetype"), :<, body.index("Layer: app")
+    assert_includes body, "Q"
+    assert_includes body, "K"
+    assert_includes body, "gg"
+    assert_includes body, "f"
+    assert_includes body, "normal.find_char_forward_start"
+    assert_includes body, "Move to start of buffer"
+    assert_includes body, "Start char find forward"
+    assert_includes body, "Clear message"
+  end
+
+  def test_dispatch_ex_bindings_sort_command_sorts_within_group_by_command_id
+    keymaps = @app.instance_variable_get(:@keymaps)
+    keymaps.bind_buffer(@editor.current_buffer.id, "K", "ui.clear_message")
+    keymaps.bind_buffer(@editor.current_buffer.id, "Q", "cursor.up")
+
+    @dispatcher.dispatch_ex(@editor, "bindings sort=command")
+
+    body = @editor.current_buffer.lines.join("\n")
+    assert_includes body, "Sort: command"
+
+    buffer_section = body.split("Layer: buffer", 2).last
+    refute_nil buffer_section
+    buffer_section = buffer_section.split("Layer: app", 2).first.to_s
+
+    up_idx = buffer_section.index("cursor.up")
+    clear_idx = buffer_section.index("ui.clear_message")
+    refute_nil up_idx
+    refute_nil clear_idx
+    assert_operator up_idx, :<, clear_idx
+  end
+
   def test_dispatch_ex_command_and_ruby
     @dispatcher.dispatch_ex(@editor, "command Hi help")
     assert_equal "Defined :Hi", @editor.message
@@ -44,6 +91,20 @@ class DispatcherTest < Minitest::Test
     assert_equal "ruby: 3", @editor.message
   end
 
+  def test_dispatch_ex_commands_shows_description_and_bound_keys
+    keymaps = @app.instance_variable_get(:@keymaps)
+    keymaps.bind(:normal, "K", "editor.buffer_next")
+
+    @dispatcher.dispatch_ex(@editor, "commands")
+
+    assert_equal "[Commands]", @editor.message
+    assert_equal :help, @editor.current_buffer.kind
+    body = @editor.current_buffer.lines.join("\n")
+    assert_includes body, "bnext"
+    assert_includes body, "Next buffer"
+    assert_includes body, "keys: K"
+  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")
 
@@ -224,6 +285,21 @@ class DispatcherTest < Minitest::Test
     refute @editor.message_error?
   end
 
+  def test_tabs_lists_all_tabpages
+    @editor.tabnew(path: nil)
+    @editor.tabnew(path: nil)
+    assert_equal 3, @editor.tabpage_count
+
+    @dispatcher.dispatch_ex(@editor, "tabs")
+
+    lines = @editor.hit_enter_lines
+    refute_nil lines, "tabs should produce multiline output"
+    joined = lines.join("\n")
+    assert_includes joined, "Tab page 1"
+    assert_includes joined, "Tab page 2"
+    assert_includes joined, "Tab page 3"
+  end
+
   def test_splitbelow_and_splitright_change_insertion_side
     @editor.set_option("splitbelow", false, scope: :global)
     first = @editor.current_window_id
@@ -237,4 +313,250 @@ class DispatcherTest < Minitest::Test
     idx = @editor.window_order.index(@editor.current_window_id)
     assert_equal 1, idx
   end
+
+  # --- Range parser tests ---
+
+  def test_parse_range_percent
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+    result = @dispatcher.parse_range("%", @editor)
+    assert_equal 0, result[:range_start]
+    assert_equal 4, result[:range_end]
+    assert_equal "", result[:rest]
+  end
+
+  def test_parse_range_numeric_pair
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+    result = @dispatcher.parse_range("1,5", @editor)
+    assert_equal 0, result[:range_start]
+    assert_equal 4, result[:range_end]
+    assert_equal "", result[:rest]
+  end
+
+  def test_parse_range_dot_and_dollar
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+    @editor.current_window.cursor_y = 2
+
+    result = @dispatcher.parse_range(".,$", @editor)
+    assert_equal 2, result[:range_start]
+    assert_equal 4, result[:range_end]
+    assert_equal "", result[:rest]
+  end
+
+  def test_parse_range_with_offset
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+    @editor.current_window.cursor_y = 1
+
+    result = @dispatcher.parse_range(".+2,$-1", @editor)
+    assert_equal 3, result[:range_start]
+    assert_equal 3, result[:range_end]
+    assert_equal "", result[:rest]
+  end
+
+  def test_parse_range_single_address
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c"])
+    result = @dispatcher.parse_range("2", @editor)
+    assert_equal 1, result[:range_start]
+    assert_equal 1, result[:range_end]
+    assert_equal "", result[:rest]
+  end
+
+  def test_parse_range_returns_nil_for_no_range
+    @editor.materialize_intro_buffer!
+    result = @dispatcher.parse_range("help", @editor)
+    assert_nil result
+  end
+
+  def test_parse_range_with_rest
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+    result = @dispatcher.parse_range("%s/a/b/g", @editor)
+    assert_equal 0, result[:range_start]
+    assert_equal 4, result[:range_end]
+    assert_equal "s/a/b/g", result[:rest]
+  end
+
+  def test_parse_range_mark_address
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+    @editor.current_window.cursor_y = 1
+    @editor.set_mark("a")
+    @editor.current_window.cursor_y = 3
+    @editor.set_mark("b")
+
+    result = @dispatcher.parse_range("'a,'b", @editor)
+    assert_equal 1, result[:range_start]
+    assert_equal 3, result[:range_end]
+    assert_equal "", result[:rest]
+  end
+
+  # --- Substitute parser tests ---
+
+  def test_parse_substitute_basic
+    result = @dispatcher.parse_substitute("s/foo/bar/")
+    assert_equal "foo", result[:pattern]
+    assert_equal "bar", result[:replacement]
+    assert_equal "", result[:flags_str]
+  end
+
+  def test_parse_substitute_with_flags
+    result = @dispatcher.parse_substitute("s/foo/bar/gi")
+    assert_equal "foo", result[:pattern]
+    assert_equal "bar", result[:replacement]
+    assert_equal "gi", result[:flags_str]
+  end
+
+  def test_parse_substitute_returns_nil_for_non_substitute
+    assert_nil @dispatcher.parse_substitute("help")
+    assert_nil @dispatcher.parse_substitute("set number")
+  end
+
+  # --- Substitute with range integration ---
+
+  def test_substitute_with_range
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["foo", "foo", "foo", "foo", "foo"])
+
+    @dispatcher.dispatch_ex(@editor, "1,3s/foo/bar/")
+
+    assert_equal "bar", @editor.current_buffer.line_at(0)
+    assert_equal "bar", @editor.current_buffer.line_at(1)
+    assert_equal "bar", @editor.current_buffer.line_at(2)
+    assert_equal "foo", @editor.current_buffer.line_at(3)
+    assert_equal "foo", @editor.current_buffer.line_at(4)
+  end
+
+  def test_substitute_percent_range
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["foo", "bar", "foo"])
+
+    @dispatcher.dispatch_ex(@editor, "%s/foo/baz/")
+
+    assert_equal "baz", @editor.current_buffer.line_at(0)
+    assert_equal "bar", @editor.current_buffer.line_at(1)
+    assert_equal "baz", @editor.current_buffer.line_at(2)
+  end
+
+  def test_substitute_ignore_case_flag
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["FOO", "foo", "Foo"])
+
+    @dispatcher.dispatch_ex(@editor, "%s/foo/bar/gi")
+
+    assert_equal "bar", @editor.current_buffer.line_at(0)
+    assert_equal "bar", @editor.current_buffer.line_at(1)
+    assert_equal "bar", @editor.current_buffer.line_at(2)
+  end
+
+  def test_substitute_count_only_flag
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["foo", "bar", "foo baz foo"])
+
+    @dispatcher.dispatch_ex(@editor, "%s/foo/x/gn")
+
+    # n flag: count only, no changes
+    assert_equal "foo", @editor.current_buffer.line_at(0)
+    assert_equal "foo baz foo", @editor.current_buffer.line_at(2)
+    assert_match(/3 match/, @editor.message)
+  end
+
+  def test_substitute_no_range_defaults_to_whole_buffer
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["aaa", "bbb", "aaa"])
+
+    @dispatcher.dispatch_ex(@editor, "s/aaa/zzz/")
+
+    assert_equal "zzz", @editor.current_buffer.line_at(0)
+    assert_equal "bbb", @editor.current_buffer.line_at(1)
+    assert_equal "zzz", @editor.current_buffer.line_at(2)
+  end
+
+  # --- :d (delete lines) tests ---
+
+  def test_delete_lines_with_range
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+
+    @dispatcher.dispatch_ex(@editor, "2,4d")
+
+    assert_equal 2, @editor.current_buffer.line_count
+    assert_equal "a", @editor.current_buffer.line_at(0)
+    assert_equal "e", @editor.current_buffer.line_at(1)
+    assert_match(/3 line/, @editor.message)
+  end
+
+  def test_delete_lines_without_range_deletes_current
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c"])
+    @editor.current_window.cursor_y = 1
+
+    @dispatcher.dispatch_ex(@editor, "d")
+
+    assert_equal 2, @editor.current_buffer.line_count
+    assert_equal "a", @editor.current_buffer.line_at(0)
+    assert_equal "c", @editor.current_buffer.line_at(1)
+  end
+
+  # --- :y (yank lines) tests ---
+
+  def test_yank_lines_with_range
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c", "d", "e"])
+
+    @dispatcher.dispatch_ex(@editor, "1,3y")
+
+    assert_match(/3 line/, @editor.message)
+    # Buffer unchanged
+    assert_equal 5, @editor.current_buffer.line_count
+  end
+
+  def test_yank_lines_without_range_yanks_current
+    @editor.materialize_intro_buffer!
+    @editor.current_buffer.replace_all_lines!(["a", "b", "c"])
+    @editor.current_window.cursor_y = 1
+
+    @dispatcher.dispatch_ex(@editor, "y")
+
+    assert_match(/1 line/, @editor.message)
+    assert_equal 3, @editor.current_buffer.line_count
+  end
+
+  # --- :grep tests ---
+
+  def test_grep_populates_quickfix
+    Dir.mktmpdir("ruvim-grep") do |dir|
+      File.write(File.join(dir, "a.txt"), "hello world\ngoodbye\n")
+      File.write(File.join(dir, "b.txt"), "hello again\n")
+
+      @editor.materialize_intro_buffer!
+      @dispatcher.dispatch_ex(@editor, "grep hello #{File.join(dir, '*.txt')}")
+
+      assert_operator @editor.quickfix_items.length, :>=, 2
+      refute @editor.message_error?
+    end
+  end
+
+  def test_grep_no_matches_shows_error
+    @editor.materialize_intro_buffer!
+    @dispatcher.dispatch_ex(@editor, "grep ZZZZUNMATCHABLE /dev/null")
+
+    assert @editor.message_error?
+  end
+
+  def test_lgrep_populates_location_list
+    Dir.mktmpdir("ruvim-lgrep") do |dir|
+      File.write(File.join(dir, "c.txt"), "alpha\nbeta\nalpha\n")
+
+      @editor.materialize_intro_buffer!
+      wid = @editor.current_window_id
+      @dispatcher.dispatch_ex(@editor, "lgrep alpha #{File.join(dir, 'c.txt')}")
+
+      assert_operator @editor.location_items(wid).length, :>=, 2
+      refute @editor.message_error?
+    end
+  end
 end

data/test/display_width_test.rb

@@ -15,4 +15,45 @@ class DisplayWidthTest < Minitest::Test
       ENV["RUVIM_AMBIGUOUS_WIDTH"] = prev
     end
   end
+
+  def test_zero_codepoint_returns_zero
+    assert_equal 0, RuVim::DisplayWidth.uncached_codepoint_width(0)
+  end
+
+  def test_expand_tabs_basic
+    assert_equal "  hello", RuVim::DisplayWidth.expand_tabs("\thello", tabstop: 2)
+  end
+
+  def test_expand_tabs_mid_column
+    assert_equal "a hello", RuVim::DisplayWidth.expand_tabs("a\thello", tabstop: 2)
+  end
+
+  def test_expand_tabs_with_tabstop_4
+    assert_equal "    hello", RuVim::DisplayWidth.expand_tabs("\thello", tabstop: 4)
+  end
+
+  def test_expand_tabs_preserves_non_tab_chars
+    assert_equal "hello", RuVim::DisplayWidth.expand_tabs("hello", tabstop: 2)
+  end
+
+  def test_expand_tabs_with_start_col
+    result = RuVim::DisplayWidth.expand_tabs("\tx", tabstop: 4, start_col: 1)
+    assert_equal "   x", result
+  end
+
+  def test_wide_codepoint_cjk
+    assert_equal 2, RuVim::DisplayWidth.cell_width("漢")
+  end
+
+  def test_wide_codepoint_fullwidth_form
+    assert_equal 2, RuVim::DisplayWidth.cell_width("Ａ")
+  end
+
+  def test_combining_mark_returns_zero
+    assert_equal 0, RuVim::DisplayWidth.cell_width("\u0300")
+  end
+
+  def test_zero_width_joiner_returns_zero
+    assert_equal 0, RuVim::DisplayWidth.cell_width("\u200D")
+  end
 end

data/test/editor_register_test.rb

@@ -1,4 +1,5 @@
 require_relative "test_helper"
+require "tmpdir"
 
 class EditorRegisterTest < Minitest::Test
   def test_named_register_and_append_register
@@ -61,4 +62,26 @@ class EditorRegisterTest < Minitest::Test
     buffer = editor.add_empty_buffer(path: "/tmp/example.rb")
     assert_equal "ruby", buffer.options["filetype"]
   end
+
+  def test_detect_filetype_from_shebang_when_extension_is_missing
+    editor = RuVim::Editor.new
+    Dir.mktmpdir("ruvim-shebang-ft") do |dir|
+      path = File.join(dir, "script")
+      File.binwrite(path, "#!/usr/bin/env ruby\nputs :ok\n")
+
+      buffer = editor.add_buffer_from_file(path)
+      assert_equal "ruby", buffer.options["filetype"]
+    end
+  end
+
+  def test_detect_filetype_from_env_shebang_with_dash_s
+    editor = RuVim::Editor.new
+    Dir.mktmpdir("ruvim-shebang-envs") do |dir|
+      path = File.join(dir, "tool")
+      File.binwrite(path, "#!/usr/bin/env -S python3 -u\nprint('ok')\n")
+
+      buffer = editor.add_buffer_from_file(path)
+      assert_equal "python", buffer.options["filetype"]
+    end
+  end
 end