ruvim 0.1.0 → 0.2.0

data/lib/ruvim/window.rb

@@ -1,7 +1,8 @@
 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 +12,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 +42,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 +52,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

@@ -8,6 +8,7 @@ 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/highlighter"

data/test/app_completion_test.rb

@@ -1,4 +1,5 @@
 require_relative "test_helper"
+require "tmpdir"
 
 class AppCompletionTest < Minitest::Test
   def setup
@@ -36,4 +37,104 @@ 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_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_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_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,100 @@ 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
 end

data/test/app_scenario_test.rb

@@ -1,9 +1,12 @@
 require_relative "test_helper"
+require "fileutils"
+require "tmpdir"
 
 class AppScenarioTest < Minitest::Test
   def setup
     @app = RuVim::App.new(clean: true)
     @editor = @app.instance_variable_get(:@editor)
+    @dispatcher = @app.instance_variable_get(:@dispatcher)
     @editor.materialize_intro_buffer!
   end
 
@@ -74,4 +77,271 @@ class AppScenarioTest < Minitest::Test
 
     assert_equal ["bc", "bc", "bc"], @editor.current_buffer.lines
   end
+
+  def test_expandtab_and_autoindent_in_insert_mode
+    @editor.set_option("expandtab", true, scope: :buffer)
+    @editor.set_option("tabstop", 4, scope: :buffer)
+    @editor.set_option("softtabstop", 4, scope: :buffer)
+    @editor.set_option("autoindent", true, scope: :buffer)
+    @editor.current_buffer.replace_all_lines!(["  foo"])
+
+    feed("A", :ctrl_i, :enter, :escape)
+
+    assert_equal ["  foo   ", "  "], @editor.current_buffer.lines
+  end
+
+  def test_smartindent_adds_shiftwidth_after_open_brace
+    @editor.set_option("autoindent", true, scope: :buffer)
+    @editor.set_option("smartindent", true, scope: :buffer)
+    @editor.set_option("shiftwidth", 2, scope: :buffer)
+    @editor.current_buffer.replace_all_lines!(["if x {"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = @editor.current_buffer.line_length(0)
+
+    feed("A", :enter, :escape)
+
+    assert_equal ["if x {", "  "], @editor.current_buffer.lines
+  end
+
+  def test_incsearch_moves_cursor_while_typing_and_escape_restores
+    @editor.set_option("incsearch", true, scope: :global)
+    @editor.current_buffer.replace_all_lines!(["alpha", "beta", "gamma"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 0
+
+    feed("/", "b")
+    assert_equal :command_line, @editor.mode
+    assert_equal 1, @editor.current_window.cursor_y
+    assert_equal 0, @editor.current_window.cursor_x
+
+    feed(:escape)
+    assert_equal :normal, @editor.mode
+    assert_equal 0, @editor.current_window.cursor_y
+    assert_equal 0, @editor.current_window.cursor_x
+  end
+
+  def test_search_command_line_backspace_on_empty_cancels
+    @editor.current_buffer.replace_all_lines!(["alpha", "beta"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 0
+
+    feed("/")
+    assert_equal :command_line, @editor.mode
+    assert_equal "/", @editor.command_line.prefix
+    assert_equal "", @editor.command_line.text
+
+    feed(:backspace)
+
+    assert_equal :normal, @editor.mode
+    assert_equal 0, @editor.current_window.cursor_y
+    assert_equal 0, @editor.current_window.cursor_x
+  end
+
+  def test_lopen_enter_jumps_to_selected_location_and_returns_to_source_window
+    @editor.current_buffer.replace_all_lines!(["aa", "bb aa", "cc aa"])
+    source_window_id = @editor.current_window_id
+
+    @dispatcher.dispatch_ex(@editor, "lvimgrep /aa/")
+    @dispatcher.dispatch_ex(@editor, "lopen")
+
+    assert_equal :location_list, @editor.current_buffer.kind
+    assert_equal 2, @editor.window_count
+
+    # Header lines are: title, blank, then items...
+    @editor.current_window.cursor_y = 4 # 3rd item
+    feed(:enter)
+
+    refute_equal :location_list, @editor.current_buffer.kind
+    assert_equal source_window_id, @editor.current_window_id
+    assert_equal 2, @editor.current_window.cursor_y
+    assert_equal 3, @editor.current_window.cursor_x
+  end
+
+  def test_incsearch_submit_stays_on_previewed_match
+    @editor.set_option("incsearch", true, scope: :global)
+    @editor.current_buffer.replace_all_lines!(["foo", "bar", "baz", "bar"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 0
+
+    feed("/", "b", "a", "r", :enter)
+
+    assert_equal :normal, @editor.mode
+    assert_equal 1, @editor.current_window.cursor_y
+    assert_equal 0, @editor.current_window.cursor_x
+  end
+
+  def test_whichwrap_allows_h_and_l_to_cross_lines
+    @editor.set_option("whichwrap", "h,l", scope: :global)
+    @editor.current_buffer.replace_all_lines!(["ab", "cd"])
+    @editor.current_window.cursor_y = 1
+    @editor.current_window.cursor_x = 0
+
+    feed("h")
+    assert_equal [0, 2], [@editor.current_window.cursor_y, @editor.current_window.cursor_x]
+
+    feed("l")
+    assert_equal [1, 0], [@editor.current_window.cursor_y, @editor.current_window.cursor_x]
+  end
+
+  def test_iskeyword_affects_word_motion
+    @editor.set_option("iskeyword", "@,-", scope: :buffer)
+    @editor.current_buffer.replace_all_lines!(["foo-bar baz"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 0
+
+    feed("w")
+
+    assert_equal 8, @editor.current_window.cursor_x
+  end
+
+  def test_backspace_start_option_blocks_deleting_before_insert_start
+    @editor.set_option("backspace", "indent,eol", scope: :global)
+    @editor.current_buffer.replace_all_lines!(["ab"])
+    @editor.current_window.cursor_x = 1
+
+    feed("i", :backspace)
+
+    assert_equal ["ab"], @editor.current_buffer.lines
+    assert_equal 1, @editor.current_window.cursor_x
+    assert_equal :insert, @editor.mode
+  end
+
+  def test_backspace_eol_option_blocks_joining_previous_line
+    @editor.set_option("backspace", "start", scope: :global)
+    @editor.current_buffer.replace_all_lines!(["a", "b"])
+    @editor.current_window.cursor_y = 1
+    @editor.current_window.cursor_x = 0
+
+    feed("i", :backspace)
+
+    assert_equal ["a", "b"], @editor.current_buffer.lines
+    assert_equal [1, 0], [@editor.current_window.cursor_y, @editor.current_window.cursor_x]
+  end
+
+  def test_backspace_indent_allows_deleting_autoindent_before_insert_start
+    @editor.set_option("backspace", "indent,eol", scope: :global)
+    @editor.current_buffer.replace_all_lines!(["  abc"])
+    @editor.current_window.cursor_x = 2
+
+    feed("i", :backspace)
+
+    assert_equal [" abc"], @editor.current_buffer.lines
+    assert_equal 1, @editor.current_window.cursor_x
+  end
+
+  def test_softtabstop_backspace_deletes_spaces_in_chunks_when_expandtab
+    @editor.set_option("expandtab", true, scope: :buffer)
+    @editor.set_option("tabstop", 4, scope: :buffer)
+    @editor.set_option("softtabstop", 4, scope: :buffer)
+    @editor.current_buffer.replace_all_lines!(["        "])
+    @editor.current_window.cursor_x = 8
+
+    feed("i", :backspace)
+
+    assert_equal ["    "], @editor.current_buffer.lines
+    assert_equal 4, @editor.current_window.cursor_x
+  end
+
+  def test_gf_uses_path_and_suffixesadd
+    Dir.mktmpdir("ruvim-gf") do |dir|
+      FileUtils.mkdir_p(File.join(dir, "lib"))
+      target = File.join(dir, "lib", "foo.rb")
+      File.write(target, "puts :ok\n")
+      @editor.current_buffer.path = File.join(dir, "main.txt")
+      @editor.current_buffer.replace_all_lines!(["foo"])
+      @editor.current_window.cursor_y = 0
+      @editor.current_window.cursor_x = 0
+      @editor.set_option("hidden", true, scope: :global)
+      @editor.set_option("path", "lib", scope: :buffer)
+      @editor.set_option("suffixesadd", ".rb", scope: :buffer)
+
+      feed("g", "f")
+
+      assert_equal File.expand_path(target), File.expand_path(@editor.current_buffer.path)
+      assert_equal "puts :ok", @editor.current_buffer.line_at(0)
+    end
+  end
+
+  def test_gf_supports_recursive_path_entry_with_double_star
+    Dir.mktmpdir("ruvim-gf-rec") do |dir|
+      FileUtils.mkdir_p(File.join(dir, "lib", "deep", "nest"))
+      target = File.join(dir, "lib", "deep", "nest", "foo.rb")
+      File.write(target, "puts :deep\n")
+      @editor.current_buffer.path = File.join(dir, "main.txt")
+      @editor.current_buffer.replace_all_lines!(["foo"])
+      @editor.current_window.cursor_y = 0
+      @editor.current_window.cursor_x = 0
+      @editor.set_option("hidden", true, scope: :global)
+      @editor.set_option("path", "lib/**", scope: :buffer)
+      @editor.set_option("suffixesadd", ".rb", scope: :buffer)
+
+      feed("g", "f")
+
+      assert_equal File.expand_path(target), File.expand_path(@editor.current_buffer.path)
+    end
+  end
+
+  def test_showmatch_message_respects_matchtime_and_clears
+    @editor.set_option("showmatch", true, scope: :global)
+    @editor.set_option("matchtime", 1, scope: :global) # 0.1 sec
+    @editor.current_buffer.replace_all_lines!([""])
+
+    feed("i", ")")
+    assert_equal "match", @editor.message
+
+    sleep 0.12
+    @app.send(:clear_expired_transient_message_if_any)
+    assert_equal "", @editor.message
+  end
+
+  def test_insert_arrow_left_respects_whichwrap
+    @editor.set_option("whichwrap", "left,right", scope: :global)
+    @editor.current_buffer.replace_all_lines!(["ab", "cd"])
+    @editor.current_window.cursor_y = 1
+    @editor.current_window.cursor_x = 0
+
+    feed("i", :left)
+
+    assert_equal :insert, @editor.mode
+    assert_equal [0, 2], [@editor.current_window.cursor_y, @editor.current_window.cursor_x]
+  end
+
+  def test_star_search_uses_iskeyword
+    @editor.set_option("iskeyword", "@,-", scope: :buffer)
+    @editor.current_buffer.replace_all_lines!(["foo-bar x", "foo y", "foo-bar z"])
+    @editor.current_window.cursor_y = 0
+    @editor.current_window.cursor_x = 1
+
+    feed("*")
+
+    assert_equal 2, @editor.current_window.cursor_y
+    assert_equal 0, @editor.current_window.cursor_x
+    assert_includes @editor.last_search[:pattern], "foo\\-bar"
+  end
+
+  def test_unknown_key_error_clears_on_next_successful_key
+    @editor.current_buffer.replace_all_lines!(["a", "b"])
+    @editor.current_window.cursor_y = 0
+
+    feed("z")
+    assert @editor.message_error?
+    assert_match(/Unknown key:/, @editor.message)
+
+    feed("j")
+    refute @editor.message_error?
+    assert_equal "", @editor.message
+    assert_equal 1, @editor.current_window.cursor_y
+  end
+
+  def test_normal_message_clears_on_next_key
+    @editor.current_buffer.replace_all_lines!(["a", "b"])
+    @editor.current_window.cursor_y = 0
+    @editor.echo("written")
+
+    feed("j")
+
+    refute @editor.message_error?
+    assert_equal "", @editor.message
+    assert_equal 1, @editor.current_window.cursor_y
+  end
 end

data/test/app_startup_test.rb

@@ -131,6 +131,16 @@ class AppStartupTest < Minitest::Test
     assert_match(/Restricted mode/, editor.message)
   end
 
+  def test_restricted_mode_disables_ex_shell
+    app = RuVim::App.new(clean: true, restricted: true)
+    editor = app.instance_variable_get(:@editor)
+    dispatcher = app.instance_variable_get(:@dispatcher)
+
+    dispatcher.dispatch_ex(editor, "!echo hi")
+
+    assert_match(/Restricted mode/, editor.message)
+  end
+
   def test_verbose_logs_startup_and_startup_ex_actions
     log = StringIO.new
     app = RuVim::App.new(

data/test/config_loader_test.rb

@@ -0,0 +1,37 @@
+require_relative "test_helper"
+require "fileutils"
+require "tmpdir"
+
+class ConfigLoaderTest < Minitest::Test
+  def setup
+    @loader = RuVim::ConfigLoader.new(
+      command_registry: RuVim::CommandRegistry.instance,
+      ex_registry: RuVim::ExCommandRegistry.instance,
+      keymaps: RuVim::KeymapManager.new,
+      command_host: RuVim::GlobalCommands.instance
+    )
+  end
+
+  def test_load_ftplugin_rejects_path_traversal_filetype
+    Dir.mktmpdir("ruvim-ftplugin") do |dir|
+      xdg = File.join(dir, "xdg")
+      FileUtils.mkdir_p(File.join(xdg, "ruvim", "ftplugin"))
+      evil = File.join(xdg, "ruvim", "evil.rb")
+      File.write(evil, "raise 'should not load'\n")
+
+      editor = RuVim::Editor.new
+      buffer = editor.add_empty_buffer
+      editor.add_window(buffer_id: buffer.id)
+      buffer.options["filetype"] = "../evil"
+
+      old = ENV["XDG_CONFIG_HOME"]
+      ENV["XDG_CONFIG_HOME"] = xdg
+      begin
+        assert_nil @loader.load_ftplugin!(editor, buffer)
+        refute_equal "../evil", buffer.options["__ftplugin_loaded__"]
+      ensure
+        ENV["XDG_CONFIG_HOME"] = old
+      end
+    end
+  end
+end