ruvim 0.1.0 → 0.3.0

data/lib/ruvim/terminal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "io/console"
 
 module RuVim
@@ -20,11 +22,26 @@ module RuVim
 
     def with_ui
       @stdin.raw do
-        write("\e[?1049h\e[?25l")
+        write("\e]112\a\e[?1049h\e[?25l")
         yield
       ensure
         write("\e[?25h\e[?1049l")
       end
     end
+
+    def suspend_for_tstp
+      prev_tstp = Signal.trap("TSTP", "DEFAULT")
+      @stdin.cooked do
+        write("\e[?25h\e[?1049l")
+        Process.kill("TSTP", 0)
+      end
+    ensure
+      begin
+        Signal.trap("TSTP", prev_tstp) if defined?(prev_tstp)
+      rescue StandardError
+        nil
+      end
+      write("\e[?1049h\e[?25l")
+    end
   end
 end

data/lib/ruvim/text_metrics.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RuVim
   module TextMetrics
     module_function
@@ -76,6 +78,15 @@ module RuVim
         end
 
         w = RuVim::DisplayWidth.cell_width(ch, col: display_col, tabstop:)
+        if terminal_unsafe_control_char?(ch)
+          w = [w, 1].max
+          break if display_col + w > max_width
+
+          cells << Cell.new(glyph: terminal_safe_placeholder(ch), source_col:, display_width: w)
+          display_col += w
+          source_col += 1
+          next
+        end
         break if display_col + w > max_width
 
         cells << Cell.new(glyph: ch, source_col:, display_width: w)
@@ -92,5 +103,22 @@ module RuVim
       out << (" " * [width.to_i - used, 0].max)
       out
     end
+
+    def terminal_safe_text(text)
+      text.to_s.each_char.map { |ch| terminal_unsafe_control_char?(ch) ? terminal_safe_placeholder(ch) : ch }.join
+    end
+
+    def terminal_unsafe_control_char?(ch)
+      return false if ch.nil? || ch.empty? || ch == "\t"
+
+      code = ch.ord
+      (code >= 0x00 && code < 0x20) || code == 0x7F || (0x80..0x9F).cover?(code)
+    rescue StandardError
+      false
+    end
+
+    def terminal_safe_placeholder(_ch)
+      "?"
+    end
   end
 end

data/lib/ruvim/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RuVim
-  VERSION = "0.1.0"
-end
+  VERSION = "0.3.0"
+end

data/lib/ruvim/window.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module RuVim
   class Window
     attr_reader :id
-    attr_accessor :buffer_id, :cursor_x, :cursor_y, :row_offset, :col_offset
+    attr_accessor :buffer_id, :row_offset, :col_offset
+    attr_reader :cursor_x, :cursor_y
     attr_reader :options
 
     def initialize(id:, buffer_id:)
@@ -11,16 +14,28 @@ module RuVim
       @cursor_y = 0
       @row_offset = 0
       @col_offset = 0
+      @preferred_x = nil
       @options = {}
     end
 
-    def clamp_to_buffer(buffer)
+    def cursor_x=(value)
+      @cursor_x = value.to_i
+      @preferred_x = nil
+    end
+
+    def cursor_y=(value)
+      @cursor_y = value.to_i
+    end
+
+    def clamp_to_buffer(buffer, max_extra_col: 0)
       @cursor_y = [[@cursor_y, 0].max, buffer.line_count - 1].min
-      @cursor_x = [[@cursor_x, 0].max, buffer.line_length(@cursor_y)].min
+      max_col = buffer.line_length(@cursor_y) + [max_extra_col.to_i, 0].max
+      @cursor_x = [[@cursor_x, 0].max, max_col].min
       self
     end
 
     def move_left(buffer, count = 1)
+      @preferred_x = nil
       count.times do
         break if @cursor_x <= 0
         @cursor_x = RuVim::TextMetrics.previous_grapheme_char_index(buffer.line_at(@cursor_y), @cursor_x)
@@ -29,6 +44,7 @@ module RuVim
     end
 
     def move_right(buffer, count = 1)
+      @preferred_x = nil
       count.times do
         line = buffer.line_at(@cursor_y)
         break if @cursor_x >= line.length
@@ -38,30 +54,41 @@ module RuVim
     end
 
     def move_up(buffer, count = 1)
+      desired_x = @preferred_x || @cursor_x
       @cursor_y -= count
       clamp_to_buffer(buffer)
+      @cursor_x = [desired_x, buffer.line_length(@cursor_y)].min
+      @preferred_x = desired_x
     end
 
     def move_down(buffer, count = 1)
+      desired_x = @preferred_x || @cursor_x
       @cursor_y += count
       clamp_to_buffer(buffer)
+      @cursor_x = [desired_x, buffer.line_length(@cursor_y)].min
+      @preferred_x = desired_x
     end
 
-    def ensure_visible(buffer, height:, width:, tabstop: 2)
+    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
 
-      @row_offset = @cursor_y if @cursor_y < @row_offset
-      @row_offset = @cursor_y - height + 1 if @cursor_y >= @row_offset + height
+      top_target = @cursor_y - so
+      bottom_target = @cursor_y + so
+      @row_offset = top_target if top_target < @row_offset
+      @row_offset = bottom_target - height + 1 if bottom_target >= @row_offset + height
       @row_offset = 0 if @row_offset.negative?
 
       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
 
-      if cursor_screen_col < offset_screen_col
-        @col_offset = RuVim::TextMetrics.char_index_for_screen_col(line, cursor_screen_col, tabstop:)
-      elsif cursor_screen_col >= offset_screen_col + width
-        target_left = cursor_screen_col - width + 1
+      if cursor_screen_col < offset_screen_col + sso
+        target_left = [cursor_screen_col - sso, 0].max
+        @col_offset = RuVim::TextMetrics.char_index_for_screen_col(line, target_left, tabstop:)
+      elsif cursor_screen_col >= offset_screen_col + width - sso
+        target_left = cursor_screen_col - width + sso + 1
         @col_offset = RuVim::TextMetrics.char_index_for_screen_col(line, target_left, tabstop:, align: :ceil)
       end
       @col_offset = 0 if @col_offset.negative?

data/lib/ruvim.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "singleton"
 
 module RuVim
@@ -8,8 +10,14 @@ end
 require_relative "ruvim/version"
 require_relative "ruvim/command_invocation"
 require_relative "ruvim/display_width"
+require_relative "ruvim/keyword_chars"
 require_relative "ruvim/text_metrics"
 require_relative "ruvim/clipboard"
+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/highlighter"
 require_relative "ruvim/context"
 require_relative "ruvim/buffer"
@@ -23,6 +31,13 @@ require_relative "ruvim/keymap_manager"
 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)
+
+require_relative "ruvim/lang/tsv"
+require_relative "ruvim/lang/csv"
 require_relative "ruvim/screen"
 require_relative "ruvim/config_dsl"
 require_relative "ruvim/config_loader"

data/test/app_completion_test.rb

@@ -1,4 +1,6 @@
 require_relative "test_helper"
+require "tmpdir"
+require "fileutils"
 
 class AppCompletionTest < Minitest::Test
   def setup
@@ -36,4 +38,176 @@ class AppCompletionTest < Minitest::Test
     assert_equal "foobar", b.line_at(0)
     assert_equal 6, @editor.current_window.cursor_x
   end
+
+  def test_path_completion_respects_wildignore
+    Dir.mktmpdir("ruvim-complete") do |dir|
+      File.write(File.join(dir, "a.rb"), "")
+      File.write(File.join(dir, "a.o"), "")
+      @editor.set_option("wildignore", "*.o", scope: :global)
+
+      matches = @app.send(:path_completion_candidates, File.join(dir, "a"))
+
+      assert_includes matches, File.join(dir, "a.rb")
+      refute_includes matches, File.join(dir, "a.o")
+    end
+  end
+
+  def test_path_completion_returns_relative_match_without_dot_slash_prefix
+    Dir.mktmpdir("ruvim-complete-rel") do |dir|
+      Dir.chdir(dir) do
+        FileUtils.mkdir_p("lib")
+
+        matches = @app.send(:path_completion_candidates, "li")
+
+        assert_includes matches, "lib/"
+      end
+    end
+  end
+
+  def test_path_completion_sorts_hidden_entries_after_visible_by_default
+    Dir.mktmpdir("ruvim-complete-hidden") do |dir|
+      FileUtils.mkdir_p(File.join(dir, ".git"))
+      File.write(File.join(dir, "aaa.txt"), "")
+      File.write(File.join(dir, "bbb.txt"), "")
+
+      matches = @app.send(:path_completion_candidates, File.join(dir, ""))
+
+      assert_includes matches, File.join(dir, ".git/")
+      visible_idx = matches.index(File.join(dir, "aaa.txt"))
+      hidden_idx = matches.index(File.join(dir, ".git/"))
+      refute_nil visible_idx
+      refute_nil hidden_idx
+      assert_operator visible_idx, :<, hidden_idx
+    end
+  end
+
+  def test_command_line_completion_respects_wildmode_list_full_and_wildmenu
+    @editor.materialize_intro_buffer!
+    @editor.set_option("wildmode", "list,full", scope: :global)
+    @editor.set_option("wildmenu", true, scope: :global)
+
+    Dir.mktmpdir("ruvim-wild") do |dir|
+      a = File.join(dir, "aa.txt")
+      b = File.join(dir, "ab.txt")
+      File.write(a, "")
+      File.write(b, "")
+
+      @editor.enter_command_line_mode(":")
+      cmd = @editor.command_line
+      cmd.replace_text("e #{File.join(dir, "a")}")
+
+      @app.send(:command_line_complete)
+      first = cmd.text.dup
+      first_msg = @editor.message.dup
+      @app.send(:command_line_complete)
+      second = cmd.text.dup
+      second_msg = @editor.message.dup
+
+      assert_equal "e #{File.join(dir, "a")}", first
+      refute_equal first, second
+      assert_includes first_msg, "aa.txt"
+      assert_includes second_msg, "["
+      assert([a, b].any? { |p| second.end_with?(p) })
+    end
+  end
+
+  def test_command_line_completion_accepts_wildmode_list_colon_full
+    @editor.materialize_intro_buffer!
+    @editor.set_option("wildmode", "list:full", scope: :global)
+
+    Dir.mktmpdir("ruvim-wild-colon") do |dir|
+      a = File.join(dir, "aa.txt")
+      b = File.join(dir, "ab.txt")
+      File.write(a, "")
+      File.write(b, "")
+
+      @editor.enter_command_line_mode(":")
+      cmd = @editor.command_line
+      cmd.replace_text("e #{File.join(dir, "a")}")
+
+      @app.send(:command_line_complete)
+      assert_equal "e #{File.join(dir, "a")}", cmd.text
+
+      @app.send(:command_line_complete)
+      assert([a, b].any? { |p| cmd.text.end_with?(p) })
+    end
+  end
+
+  def test_command_line_completion_full_cycles_across_original_match_set
+    @editor.materialize_intro_buffer!
+    @editor.set_option("wildmode", "full", scope: :global)
+
+    Dir.mktmpdir("ruvim-wild-full") do |dir|
+      FileUtils.mkdir_p(File.join(dir, ".git"))
+      a = File.join(dir, "aa.txt")
+      b = File.join(dir, "ab.txt")
+      File.write(a, "")
+      File.write(b, "")
+
+      @editor.enter_command_line_mode(":")
+      cmd = @editor.command_line
+      cmd.replace_text("e #{File.join(dir, "a")}")
+
+      @app.send(:command_line_complete)
+      first = cmd.text.dup
+      @app.send(:command_line_complete)
+      second = cmd.text.dup
+
+      refute_equal first, second
+      assert([a, b].any? { |p| first.end_with?(p) })
+      assert([a, b].any? { |p| second.end_with?(p) })
+    end
+  end
+
+  def test_command_line_completion_menu_is_not_limited_by_pumheight
+    @editor.materialize_intro_buffer!
+    @editor.set_option("wildmode", "list", scope: :global)
+    @editor.set_option("pumheight", 1, scope: :global)
+
+    @editor.enter_command_line_mode(":")
+    cmd = @editor.command_line
+    cmd.replace_text("se")
+
+    @app.send(:command_line_complete)
+
+    assert_equal "se", cmd.text
+    assert_includes @editor.message, "set"
+    assert_includes @editor.message, "setlocal"
+    assert_includes @editor.message, "setglobal"
+  end
+
+  def test_insert_completion_respects_completeopt_noselect_and_pumheight
+    @editor.materialize_intro_buffer!
+    @editor.set_option("completeopt", "menu,menuone,noselect", scope: :global)
+    @editor.set_option("pumheight", 1, scope: :global)
+    b = @editor.current_buffer
+    b.replace_all_lines!(["fo", "foobar", "fookey"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 2
+    @editor.enter_insert_mode
+
+    @app.send(:handle_insert_key, :ctrl_n)
+    assert_equal "fo", b.line_at(0)
+    assert_includes @editor.message, "..."
+
+    @app.send(:handle_insert_key, :ctrl_n)
+    assert_equal "foobar", b.line_at(0)
+  end
+
+  def test_insert_completion_respects_completeopt_noinsert
+    @editor.materialize_intro_buffer!
+    @editor.set_option("completeopt", "menu,noinsert", scope: :global)
+    b = @editor.current_buffer
+    b.replace_all_lines!(["fo", "foobar", "fookey"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 2
+    @editor.enter_insert_mode
+
+    @app.send(:handle_insert_key, :ctrl_n)
+    assert_equal "fo", b.line_at(0)
+    assert_includes @editor.message, "["
+
+    @app.send(:handle_insert_key, :ctrl_n)
+    assert_equal "foobar", b.line_at(0)
+  end
 end

data/test/app_dot_repeat_test.rb

@@ -51,4 +51,17 @@ class AppDotRepeatTest < Minitest::Test
 
     assert_equal "xxcd", @buffer.line_at(0)
   end
+
+  def test_dot_repeats_substitute_char
+    @buffer.replace_all_lines!(["abcd"])
+    @win.cursor_x = 0
+
+    press("s")
+    @app.send(:handle_key, "X")
+    @app.send(:handle_key, :escape)
+    press("l")
+    press(".")
+
+    assert_equal "XbXd", @buffer.line_at(0)
+  end
 end

data/test/app_motion_test.rb

@@ -57,8 +57,7 @@ class AppMotionTest < Minitest::Test
     @editor.current_window.cursor_y = 0
     @editor.current_window.cursor_x = 0
 
-    screen = @app.instance_variable_get(:@screen)
-    screen.define_singleton_method(:current_window_view_height) { |_editor| 5 }
+    @editor.current_window_view_height_hint = 5
 
     @app.send(:handle_normal_key, :pagedown)
     assert_equal 4, @editor.current_window.cursor_y
@@ -70,4 +69,113 @@ class AppMotionTest < Minitest::Test
     @app.send(:handle_normal_key, :pageup)
     assert_equal 8, @editor.current_window.cursor_y
   end
+
+  def test_ctrl_d_u_and_ctrl_f_b_move_by_half_and_full_page
+    b = @editor.current_buffer
+    b.replace_all_lines!((1..40).map { |i| "line#{i}" })
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 0
+
+    @editor.current_window_view_height_hint = 10
+
+    @app.send(:handle_normal_key, :ctrl_d)
+    assert_equal 5, @editor.current_window.cursor_y
+
+    @app.send(:handle_normal_key, :ctrl_u)
+    assert_equal 0, @editor.current_window.cursor_y
+
+    @app.send(:handle_normal_key, :ctrl_f)
+    assert_equal 9, @editor.current_window.cursor_y
+
+    @app.send(:handle_normal_key, :ctrl_b)
+    assert_equal 0, @editor.current_window.cursor_y
+  end
+
+  def test_ctrl_e_and_ctrl_y_scroll_window_without_primary_cursor_motion
+    b = @editor.current_buffer
+    b.replace_all_lines!((1..40).map { |i| "line#{i}" })
+    @editor.current_window.cursor_y = 6
+    @editor.current_window.cursor_x = 0
+    @editor.current_window.row_offset = 5
+
+    @editor.current_window_view_height_hint = 10
+
+    @app.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)
+    assert_equal 5, @editor.current_window.row_offset
+    assert_equal 6, @editor.current_window.cursor_y
+  end
+
+  def test_ctrl_d_can_be_overridden_by_normal_keymap
+    b = @editor.current_buffer
+    b.replace_all_lines!((1..40).map { |i| "line#{i}" })
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 0
+
+    keymaps = @app.instance_variable_get(:@keymaps)
+    keymaps.bind(:normal, ["<C-d>"], "cursor.down")
+
+    @app.send(:handle_normal_key, :ctrl_d)
+    assert_equal 1, @editor.current_window.cursor_y
+  end
+
+  def test_pagedown_can_be_overridden_by_normal_keymap
+    b = @editor.current_buffer
+    b.replace_all_lines!((1..40).map { |i| "line#{i}" })
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 0
+
+    keymaps = @app.instance_variable_get(:@keymaps)
+    keymaps.bind(:normal, ["<PageDown>"], "cursor.down")
+
+    @app.send(:handle_normal_key, :pagedown)
+    assert_equal 1, @editor.current_window.cursor_y
+  end
+
+  def test_virtualedit_onemore_allows_right_move_past_eol_once
+    b = @editor.current_buffer
+    b.replace_all_lines!(["abc"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 3
+
+    press("l")
+    assert_equal 3, @editor.current_window.cursor_x
+
+    @editor.set_option("virtualedit", "onemore", scope: :global)
+    press("l")
+    assert_equal 4, @editor.current_window.cursor_x
+
+    press("l")
+    assert_equal 4, @editor.current_window.cursor_x
+  end
+
+  def test_virtualedit_all_allows_multiple_columns_past_eol
+    b = @editor.current_buffer
+    b.replace_all_lines!(["abc"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 3
+    @editor.set_option("virtualedit", "all", scope: :global)
+
+    press("l", "l", "l")
+    assert_equal 6, @editor.current_window.cursor_x
+
+    press("h", "h")
+    assert_equal 4, @editor.current_window.cursor_x
+  end
+
+  def test_e_moves_to_next_word_end_when_already_on_word_end
+    b = @editor.current_buffer
+    b.replace_all_lines!(["one two three"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 2 # end of "one"
+
+    press("e")
+    assert_equal 6, @editor.current_window.cursor_x # end of "two"
+
+    press("e")
+    assert_equal 12, @editor.current_window.cursor_x # end of "three"
+  end
 end