ruvim 0.1.0 → 0.2.0

data/lib/ruvim/config_loader.rb

@@ -1,5 +1,7 @@
 module RuVim
   class ConfigLoader
+    SAFE_FILETYPE_RE = /\A[a-zA-Z0-9_+-]+\z/.freeze
+
     def initialize(command_registry:, ex_registry:, keymaps:, command_host:)
       @command_registry = command_registry
       @ex_registry = ex_registry
@@ -32,6 +34,7 @@ module RuVim
       filetype = buffer.options["filetype"].to_s
       return nil if filetype.empty?
       return nil if buffer.options["__ftplugin_loaded__"] == filetype
+      return nil unless safe_filetype_name?(filetype)
 
       path = ftplugin_path_for(filetype)
       return nil unless path && File.file?(path)
@@ -58,11 +61,22 @@ module RuVim
 
     def xdg_ftplugin_path(filetype)
       base = ::ENV["XDG_CONFIG_HOME"]
-      if base && !base.empty?
-        File.join(base, "ruvim", "ftplugin", "#{filetype}.rb")
-      else
-        File.expand_path("~/.config/ruvim/ftplugin/#{filetype}.rb")
-      end
+      root =
+        if base && !base.empty?
+          File.join(base, "ruvim", "ftplugin")
+        else
+          File.expand_path("~/.config/ruvim/ftplugin")
+        end
+
+      candidate = File.expand_path(File.join(root, "#{filetype}.rb"))
+      root_prefix = File.join(File.expand_path(root), "")
+      return nil unless candidate.start_with?(root_prefix)
+
+      candidate
+    end
+
+    def safe_filetype_name?(filetype)
+      SAFE_FILETYPE_RE.match?(filetype.to_s)
     end
   end
 end

data/lib/ruvim/context.rb

@@ -15,12 +15,5 @@ module RuVim
       editor.current_buffer
     end
 
-    def count
-      invocation&.count || 1
-    end
-
-    def bang?
-      invocation&.bang || false
-    end
   end
 end

data/lib/ruvim/dispatcher.rb

@@ -19,6 +19,16 @@ module RuVim
     end
 
     def dispatch_ex(editor, line)
+      raw = line.to_s.strip
+      if raw.start_with?("!")
+        command = raw[1..].to_s.strip
+        invocation = CommandInvocation.new(id: "__shell__", argv: [command])
+        ctx = Context.new(editor:, invocation:)
+        @command_host.ex_shell(ctx, command:)
+        editor.enter_normal_mode
+        return
+      end
+
       if (sub = parse_global_substitute(line))
         invocation = CommandInvocation.new(id: "__substitute__", kwargs: sub)
         ctx = Context.new(editor:, invocation:)

data/lib/ruvim/display_width.rb

@@ -11,6 +11,25 @@ module RuVim
       end
 
       code = ch.ord
+      return cached_codepoint_width(code) if codepoint_cacheable?(code)
+
+      uncached_codepoint_width(code)
+    end
+
+    def codepoint_cacheable?(code)
+      !code.nil? && !code.zero?
+    end
+
+    def cached_codepoint_width(code)
+      aw = ambiguous_width
+      @codepoint_width_cache ||= {}
+      key = [code, aw]
+      return @codepoint_width_cache[key] if @codepoint_width_cache.key?(key)
+
+      @codepoint_width_cache[key] = uncached_codepoint_width(code)
+    end
+
+    def uncached_codepoint_width(code)
       return 0 if code.zero?
       return 0 if combining_mark?(code)
       return 0 if zero_width_codepoint?(code)
@@ -102,9 +121,13 @@ module RuVim
 
     def ambiguous_width
       env = ::ENV["RUVIM_AMBIGUOUS_WIDTH"]
-      return 2 if env == "2"
+      if !defined?(@ambiguous_width_cached) || @ambiguous_width_env != env
+        @ambiguous_width_env = env
+        @ambiguous_width_cached = (env == "2" ? 2 : 1)
+        @codepoint_width_cache = {}
+      end
 
-      1
+      @ambiguous_width_cached
     end
   end
 end

data/lib/ruvim/editor.rb

@@ -3,15 +3,57 @@ module RuVim
     OPTION_DEFS = {
       "number" => { default_scope: :window, type: :bool, default: false },
       "relativenumber" => { default_scope: :window, type: :bool, default: false },
+      "wrap" => { default_scope: :window, type: :bool, default: true },
+      "linebreak" => { default_scope: :window, type: :bool, default: false },
+      "breakindent" => { default_scope: :window, type: :bool, default: false },
+      "cursorline" => { default_scope: :window, type: :bool, default: false },
+      "scrolloff" => { default_scope: :window, type: :int, default: 0 },
+      "sidescrolloff" => { default_scope: :window, type: :int, default: 0 },
+      "numberwidth" => { default_scope: :window, type: :int, default: 4 },
+      "colorcolumn" => { default_scope: :window, type: :string, default: nil },
+      "signcolumn" => { default_scope: :window, type: :string, default: "auto" },
+      "list" => { default_scope: :window, type: :bool, default: false },
+      "listchars" => { default_scope: :window, type: :string, default: "tab:>-,trail:-,nbsp:+" },
+      "showbreak" => { default_scope: :window, type: :string, default: ">" },
+      "showmatch" => { default_scope: :global, type: :bool, default: false },
+      "matchtime" => { default_scope: :global, type: :int, default: 5 },
+      "whichwrap" => { default_scope: :global, type: :string, default: "" },
+      "virtualedit" => { default_scope: :global, type: :string, default: "" },
       "ignorecase" => { default_scope: :global, type: :bool, default: false },
       "smartcase" => { default_scope: :global, type: :bool, default: false },
       "hlsearch" => { default_scope: :global, type: :bool, default: true },
+      "incsearch" => { default_scope: :global, type: :bool, default: false },
+      "splitbelow" => { default_scope: :global, type: :bool, default: false },
+      "splitright" => { default_scope: :global, type: :bool, default: false },
+      "hidden" => { default_scope: :global, type: :bool, default: false },
+      "autowrite" => { default_scope: :global, type: :bool, default: false },
+      "clipboard" => { default_scope: :global, type: :string, default: "" },
+      "timeoutlen" => { default_scope: :global, type: :int, default: 1000 },
+      "ttimeoutlen" => { default_scope: :global, type: :int, default: 50 },
+      "backspace" => { default_scope: :global, type: :string, default: "indent,eol,start" },
+      "completeopt" => { default_scope: :global, type: :string, default: "menu,menuone,noselect" },
+      "pumheight" => { default_scope: :global, type: :int, default: 10 },
+      "wildmode" => { default_scope: :global, type: :string, default: "full" },
+      "wildignore" => { default_scope: :global, type: :string, default: "" },
+      "wildignorecase" => { default_scope: :global, type: :bool, default: false },
+      "wildmenu" => { default_scope: :global, type: :bool, default: false },
+      "termguicolors" => { default_scope: :global, type: :bool, default: false },
+      "path" => { default_scope: :buffer, type: :string, default: nil },
+      "suffixesadd" => { default_scope: :buffer, type: :string, default: nil },
+      "textwidth" => { default_scope: :buffer, type: :int, default: 0 },
+      "formatoptions" => { default_scope: :buffer, type: :string, default: nil },
+      "expandtab" => { default_scope: :buffer, type: :bool, default: false },
+      "shiftwidth" => { default_scope: :buffer, type: :int, default: 2 },
+      "softtabstop" => { default_scope: :buffer, type: :int, default: 0 },
+      "autoindent" => { default_scope: :buffer, type: :bool, default: false },
+      "smartindent" => { default_scope: :buffer, type: :bool, default: false },
+      "iskeyword" => { default_scope: :buffer, type: :string, default: nil },
       "tabstop" => { default_scope: :buffer, type: :int, default: 2 },
       "filetype" => { default_scope: :buffer, type: :string, default: nil }
     }.freeze
 
     attr_reader :buffers, :windows
-    attr_accessor :current_window_id, :mode, :message, :pending_count, :alternate_buffer_id, :window_layout, :restricted_mode
+    attr_accessor :current_window_id, :mode, :message, :pending_count, :alternate_buffer_id, :window_layout, :restricted_mode, :current_window_view_height_hint
 
     def initialize
       @buffers = {}
@@ -29,8 +71,10 @@ module RuVim
       @window_layout = :single
       @message = ""
       @message_kind = :info
+      @message_deadline = nil
       @pending_count = nil
       @restricted_mode = false
+      @current_window_view_height_hint = 1
       @running = true
       @global_options = default_global_options
       @command_line = CommandLine.new
@@ -201,6 +245,12 @@ module RuVim
 
       payload = write_register_payload(key, text: text.to_s, type: type.to_sym)
       write_clipboard_register(key, payload)
+      if key == "\""
+        if (default_clip = clipboard_default_register_key)
+          mirror = write_register_payload(default_clip, text: payload[:text], type: payload[:type])
+          write_clipboard_register(default_clip, mirror)
+        end
+      end
       @registers["\""] = payload unless key == "\""
       payload
     end
@@ -225,6 +275,14 @@ module RuVim
 
     def get_register(name = "\"")
       key = name.to_s.downcase
+      if key == "\""
+        if (default_clip = clipboard_default_register_key)
+          if (payload = read_clipboard_register(default_clip))
+            @registers["\""] = dup_register_payload(payload)
+            return @registers["\""]
+          end
+        end
+      end
       return read_clipboard_register(key) if clipboard_register?(key)
 
       @registers[key]
@@ -458,10 +516,16 @@ module RuVim
       window
     end
 
-    def split_current_window(layout: :horizontal)
+    def split_current_window(layout: :horizontal, place: :after)
       save_current_tabpage_state! unless @suspend_tab_autosave
       src = current_window
-      win = add_window(buffer_id: src.buffer_id)
+      id = next_window_id
+      win = Window.new(id:, buffer_id: src.buffer_id)
+      @windows[id] = win
+      src_idx = @window_order.index(src.id) || (@window_order.length - 1)
+      insert_idx = (place.to_sym == :before ? src_idx : src_idx + 1)
+      @window_order.insert(insert_idx, win.id)
+      ensure_initial_tabpage!
       win.cursor_x = src.cursor_x
       win.cursor_y = src.cursor_y
       win.row_offset = src.row_offset
@@ -641,6 +705,45 @@ module RuVim
       ids[(idx + step) % ids.length]
     end
 
+    def delete_buffer(buffer_id)
+      id = buffer_id.to_i
+      buffer = @buffers[id]
+      return nil unless buffer
+
+      if @buffers.length <= 1
+        replacement = add_empty_buffer
+      else
+        replacement = nil
+      end
+
+      fallback_id =
+        if replacement
+          replacement.id
+        else
+          candidates = @buffers.keys.reject { |bid| bid == id }
+          alt = @alternate_buffer_id
+          (alt && alt != id && @buffers.key?(alt)) ? alt : candidates.first
+        end
+
+      @windows.each_value do |win|
+        next unless win.buffer_id == id
+        next unless fallback_id
+
+        win.buffer_id = fallback_id
+        win.cursor_x = 0
+        win.cursor_y = 0
+        win.row_offset = 0
+        win.col_offset = 0
+      end
+
+      @buffers.delete(id)
+      @local_marks.delete(id)
+      @alternate_buffer_id = nil if @alternate_buffer_id == id
+      save_current_tabpage_state! unless @suspend_tab_autosave
+      ensure_bootstrap_buffer! if @buffers.empty?
+      true
+    end
+
     def window_order
       @window_order
     end
@@ -692,6 +795,15 @@ module RuVim
       current_quickfix_item
     end
 
+    def select_quickfix(index)
+      items = @quickfix_list[:items]
+      return nil if items.empty?
+
+      i = [[index.to_i, 0].max, items.length - 1].min
+      @quickfix_list[:index] = i
+      current_quickfix_item
+    end
+
     def location_list(window_id = current_window_id)
       @location_lists[window_id]
     end
@@ -721,6 +833,16 @@ module RuVim
       current_location_list_item(window_id)
     end
 
+    def select_location_list(index, window_id: current_window_id)
+      list = location_list(window_id)
+      items = list[:items]
+      return nil if items.empty?
+
+      i = [[index.to_i, 0].max, items.length - 1].min
+      list[:index] = i
+      current_location_list_item(window_id)
+    end
+
     def find_window_ids_by_buffer_kind(kind)
       sym = kind.to_sym
       @window_order.select do |wid|
@@ -785,24 +907,62 @@ module RuVim
     def echo(msg)
       @message_kind = :info
       @message = msg.to_s
+      @message_deadline = nil
+    end
+
+    def echo_temporary(msg, duration_seconds:)
+      @message_kind = :info
+      @message = msg.to_s
+      dur = duration_seconds.to_f
+      @message_deadline = dur.positive? ? (Process.clock_gettime(Process::CLOCK_MONOTONIC) + dur) : nil
+    rescue StandardError
+      @message_deadline = nil
     end
 
     def echo_error(msg)
       @message_kind = :error
       @message = msg.to_s
+      @message_deadline = nil
     end
 
     def clear_message
       @message_kind = :info
       @message = ""
+      @message_deadline = nil
     end
 
     def message_error?
       !@message.to_s.empty? && @message_kind == :error
     end
 
+    def transient_message_timeout_seconds(now: nil)
+      return nil unless @message_deadline
+      return nil if message_error?
+      return nil if command_line_active?
+
+      now ||= Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      [@message_deadline - now, 0.0].max
+    rescue StandardError
+      nil
+    end
+
+    def clear_expired_transient_message!(now: nil)
+      return false unless @message_deadline
+      return false if message_error?
+      return false if command_line_active?
+
+      now ||= Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      return false if now < @message_deadline
+
+      clear_message
+      true
+    rescue StandardError
+      false
+    end
+
     def text_viewport_size(rows:, cols:)
-      text_rows = command_area_active? ? rows - 2 : rows - 1
+      # Reserve one status row + one command/error row at the bottom.
+      text_rows = rows - 2
       [text_rows, cols]
     end
 
@@ -950,6 +1110,15 @@ module RuVim
       key == "+" || key == "*"
     end
 
+    def clipboard_default_register_key
+      spec = @global_options["clipboard"].to_s
+      parts = spec.split(",").map { |s| s.strip.downcase }.reject(&:empty?)
+      return "+" if parts.include?("unnamedplus")
+      return "*" if parts.include?("unnamed")
+
+      nil
+    end
+
     def write_clipboard_register(key, payload)
       return unless clipboard_register?(key.downcase)