cleanup some vim.cmd calls

- Range:replace now updates its bounds to reflect the replacement
- Support the notion of an empty range

.gitignore

@@ -0,0 +1 @@
+*.src.rock

README.md

@@ -17,7 +17,7 @@ lazy.nvim:
 ```lua
 -- Setting `lazy = true` ensures that the library is only loaded
 -- when `require 'u.<utility>' is called.
-{ 'https://codeberg.org/jrop/u.nvim', lazy = true }
+{ 'jrop/u.nvim', lazy = true }
 ```
 
 ## Usage

examples/splitjoin.lua

@@ -0,0 +1,86 @@
+local vim_repeat = require 'u.repeat'
+local CodeWriter = require 'u.codewriter'
+local Range = require 'u.range'
+
+local M = {}
+
+---@param bracket_range Range
+---@param left string
+---@param right string
+local function split(bracket_range, left, right)
+  local code = CodeWriter.from_pos(bracket_range.start)
+  code:write_raw(left)
+
+  local curr = bracket_range.start:next()
+  if curr == nil then return end
+  local last_start = curr
+
+  -- Sanity check: if we "skipped" past the start/stop of the overall range, then something is wrong:
+  -- This can happen with greater-/less- than signs that are mathematical, and not brackets:
+  while curr > bracket_range.start and curr < bracket_range.stop do
+    if vim.tbl_contains({ '{', '[', '(', '<' }, curr:char()) then
+      -- skip over bracketed groups:
+      local next = curr:find_match()
+      if next == nil then break end
+      curr = next
+    else
+      if vim.tbl_contains({ ',', ';' }, curr:char()) then
+        -- accumulate item:
+        local item = vim.trim(Range.new(last_start, curr):text())
+        if item ~= '' then code:indent():write(item) end
+
+        local next_last_start = curr:next()
+        if next_last_start == nil then break end
+        last_start = next_last_start
+      end
+
+      -- Prepare for next iteration:
+      local next = curr:next()
+      if next == nil then break end
+      curr = next
+    end
+  end
+
+  -- accumulate last, unfinished item:
+  local pos_before_right = bracket_range.stop:must_next(-1)
+  if last_start < pos_before_right then
+    local item = vim.trim(Range.new(last_start, pos_before_right):text())
+    if item ~= '' then code:indent():write(item) end
+  end
+
+  code:write(right)
+  bracket_range:replace(code.lines)
+end
+
+---@param bracket_range Range
+---@param left string
+---@param right string
+local function join(bracket_range, left, right)
+  local inner_range = Range.new(bracket_range.start:must_next(), bracket_range.stop:must_next(-1), bracket_range.mode)
+  local newline = vim
+    .iter(inner_range:lines())
+    :map(function(l) return vim.trim(l) end)
+    :filter(function(l) return l ~= '' end)
+    :join ' '
+  bracket_range:replace { left .. newline .. right }
+end
+
+local function splitjoin()
+  local bracket_range = Range.find_nearest_brackets()
+  if bracket_range == nil then return end
+  local lines = bracket_range:lines()
+  local left = lines[1]:sub(1, 1) -- left bracket
+  local right = lines[#lines]:sub(-1, -1) -- right bracket
+
+  if #lines == 1 then
+    split(bracket_range, left, right)
+  else
+    join(bracket_range, left, right)
+  end
+end
+
+function M.setup()
+  vim.keymap.set('n', 'gS', function() vim_repeat.run(splitjoin) end)
+end
+
+return M

examples/surround.lua

@@ -0,0 +1,254 @@
+local vim_repeat = require 'u.repeat'
+local opkeymap = require 'u.opkeymap'
+local Pos = require 'u.pos'
+local Range = require 'u.range'
+local Buffer = require 'u.buffer'
+local CodeWriter = require 'u.codewriter'
+
+local M = {}
+
+local surrounds = {
+  [')'] = { left = '(', right = ')' },
+  ['('] = { left = '( ', right = ' )' },
+  [']'] = { left = '[', right = ']' },
+  ['['] = { left = '[ ', right = ' ]' },
+  ['}'] = { left = '{', right = '}' },
+  ['{'] = { left = '{ ', right = ' }' },
+  ['>'] = { left = '<', right = '>' },
+  ['<'] = { left = '< ', right = ' >' },
+  ["'"] = { left = "'", right = "'" },
+  ['"'] = { left = '"', right = '"' },
+  ['`'] = { left = '`', right = '`' },
+}
+
+---@return { left: string; right: string }|nil
+local function prompt_for_bounds()
+  local cn = vim.fn.getchar()
+  -- Check for non-printable characters:
+  if type(cn) ~= 'number' or cn < 32 or cn > 126 then return end
+  local c = vim.fn.nr2char(cn)
+
+  if c == '<' then
+    -- Surround with a tag:
+    vim.keymap.set('c', '>', '><CR>')
+    local tag = '<' .. vim.fn.input '<'
+    if tag == '<' then return end
+    vim.keymap.del('c', '>')
+    local endtag = '</' .. tag:sub(2):match '[^ >]*' .. '>'
+    -- selene: allow(global_usage)
+    return { left = tag, right = endtag }
+  else
+    -- Default surround:
+    return (surrounds)[c] or { left = c, right = c }
+  end
+end
+
+---@param range Range
+---@param bounds { left: string; right: string }
+local function do_surround(range, bounds)
+  local left = bounds.left
+  local right = bounds.right
+  if range.mode == 'V' then
+    -- If we are surrounding multiple lines, we don't care about
+    -- space-padding:
+    left = vim.trim(left)
+    right = vim.trim(right)
+  end
+
+  if range.mode == 'v' then
+    range:replace(left .. range:text() .. right)
+  elseif range.mode == 'V' then
+    local buf = Buffer.current()
+    local cw = CodeWriter.from_line(buf:line0(range.start.lnum):text(), buf.buf)
+
+    -- write the left bound at the current indent level:
+    cw:write(left)
+
+    local curr_ident_prefix = cw.indent_str:rep(cw.indent_level)
+    cw:indent(function(cw2)
+      for _, line in ipairs(range:lines()) do
+        -- trim the current indent prefix from the line:
+        if line:sub(1, #curr_ident_prefix) == curr_ident_prefix then
+          --
+          line = line:sub(#curr_ident_prefix + 1)
+        end
+
+        cw2:write(line)
+      end
+    end)
+
+    -- write the right bound at the current indent level:
+    cw:write(right)
+
+    range:replace(cw.lines)
+  end
+
+  range.start:save_to_pos '.'
+end
+
+function M.setup()
+  require('u.repeat').setup()
+
+  -- Visual
+  vim.keymap.set('v', 'S', function()
+    local c = vim.fn.getcharstr()
+    local range = Range.from_vtext()
+    local bounds = surrounds[c] or { left = c, right = c }
+    vim_repeat.run(function()
+      do_surround(range, bounds)
+      -- this is a visual mapping: end in normal mode:
+      vim.cmd { cmd = 'normal', args = { '' }, bang = true }
+    end)
+  end, { noremap = true, silent = true })
+
+  -- Change
+  vim.keymap.set('n', 'cs', function()
+    local from_cn = vim.fn.getchar()
+    -- Check for non-printable characters:
+    if from_cn < 32 or from_cn > 126 then return end
+    local from_c = vim.fn.nr2char(from_cn)
+    local from = surrounds[from_c] or { left = from_c, right = from_c }
+    local function get_fresh_arange()
+      local arange = Range.from_text_object('a' .. from_c, { user_defined = true })
+      if arange == nil then return nil end
+      if from_c == 'q' then
+        from.left = arange.start:char()
+        from.right = arange.stop:char()
+      end
+      return arange
+    end
+
+    local arange = get_fresh_arange()
+    if arange == nil then return nil end
+
+    local hl_info1 = Range.new(arange.start, arange.start, 'v'):highlight('IncSearch', { priority = 999 })
+    local hl_info2 = Range.new(arange.stop, arange.stop, 'v'):highlight('IncSearch', { priority = 999 })
+    local hl_clear = function()
+      if hl_info1 then hl_info1.clear() end
+      if hl_info2 then hl_info2.clear() end
+    end
+
+    local to = prompt_for_bounds()
+    hl_clear()
+    if to == nil then return end
+
+    vim_repeat.run(function()
+      -- Re-fetch the arange, just in case this action is being repeated:
+      arange = get_fresh_arange()
+      if arange == nil then return nil end
+
+      if from_c == 't' then
+        -- For tags, we want to replace the inner text, not the tag:
+        local irange = Range.from_text_object('i' .. from_c, { user_defined = true })
+        if arange == nil or irange == nil then return nil end
+
+        local lrange = Range.new(arange.start, irange.start:must_next(-1))
+        local rrange = Range.new(irange.stop:must_next(1), arange.stop)
+
+        rrange:replace(to.right)
+        lrange:replace(to.left)
+      else
+        -- replace `from.right` with `to.right`:
+        local last_line = arange:line0(-1).text() --[[@as string]]
+        local from_right_match = last_line:match(vim.pesc(from.right) .. '$')
+        if from_right_match then
+          local match_start = arange.stop:clone()
+          match_start.col = match_start.col - #from_right_match + 1
+          Range.new(match_start, arange.stop):replace(to.right)
+        end
+
+        -- replace `from.left` with `to.left`:
+        local first_line = arange:line0(0).text() --[[@as string]]
+        local from_left_match = first_line:match('^' .. vim.pesc(from.left))
+        if from_left_match then
+          local match_end = arange.start:clone()
+          match_end.col = match_end.col + #from_left_match - 1
+          Range.new(arange.start, match_end):replace(to.left)
+        end
+      end
+    end)
+  end, { noremap = true, silent = true })
+
+  -- Delete
+  vim.keymap.set('n', 'ds', function()
+    local txt_obj = vim.fn.getcharstr()
+    vim_repeat.run(function()
+      local buf = Buffer.current()
+      local irange = Range.from_text_object('i' .. txt_obj)
+      local arange = Range.from_text_object('a' .. txt_obj)
+      if arange == nil or irange == nil then return nil end
+      local starting_cursor_pos = arange.start:clone()
+
+      -- Now, replace `arange` with the content of `irange`.  If `arange` was multiple lines,
+      -- dedent the contents first, and operate in linewise mode
+      if arange.start.lnum ~= arange.stop.lnum then
+        -- Auto dedent:
+        vim.cmd.normal('<i' .. vim.trim(txt_obj))
+        -- Dedenting moves the cursor, so we need to set the cursor to a consistent starting spot:
+        arange.start:save_to_pos '.'
+        -- Dedenting also changed the inner text, so re-acquire it:
+        arange = Range.from_text_object('a' .. txt_obj)
+        irange = Range.from_text_object('i' .. txt_obj)
+        if arange == nil or irange == nil then return end -- should never be true
+        arange:replace(irange:lines())
+
+        local final_range = Range.new(
+          arange.start,
+          Pos.new(
+            arange.stop.buf,
+            irange.start.lnum + (arange.stop.lnum + arange.start.lnum),
+            arange.stop.col,
+            arange.stop.off
+          ),
+          irange.mode
+        )
+
+        -- delete last line, if it is empty:
+        local last = buf:line0(final_range.stop.lnum)
+        if last:text():match '^%s*$' then last:replace(nil) end
+
+        -- delete first line, if it is empty:
+        local first = buf:line0(final_range.start.lnum)
+        if first:text():match '^%s*$' then first:replace(nil) end
+      else
+        -- trim start:
+        irange = irange:trim_start():trim_stop()
+        arange:replace(irange:lines())
+      end
+
+      starting_cursor_pos:save_to_pos '.'
+    end)
+  end, { noremap = true, silent = true })
+
+  opkeymap('n', 'ys', function(range)
+    local hl_info = range:highlight('IncSearch', { priority = 999 })
+
+    ---@type { left: string; right: string }
+    local bounds
+    -- selene: allow(global_usage)
+    if _G.my_surround_bounds ~= nil then
+      -- This command was repeated with `.`, we don't need
+      -- to prompt for the bounds:
+      -- selene: allow(global_usage)
+      bounds = _G.my_surround_bounds
+    else
+      local prompted_bounds = prompt_for_bounds()
+      if prompted_bounds == nil and hl_info then return hl_info.clear() end
+      if prompted_bounds then bounds = prompted_bounds end
+    end
+
+    if hl_info then hl_info.clear() end
+    do_surround(range, bounds)
+    -- selene: allow(global_usage)
+    _G.my_surround_bounds = nil
+
+    -- return repeatable injection
+    return function()
+      -- on_repeat, we "stage" the bounds that we were originally called with:
+      -- selene: allow(global_usage)
+      _G.my_surround_bounds = bounds
+    end
+  end)
+end
+
+return M

examples/text-objects.lua

@@ -0,0 +1,126 @@
+local utils = require 'u.utils'
+local Pos = require 'u.pos'
+local Range = require 'u.range'
+local Buffer = require 'u.buffer'
+
+local M = {}
+
+function M.setup()
+  -- Select whole file:
+  utils.define_text_object('ag', function() return Buffer.current():all() end)
+
+  -- Select current line:
+  utils.define_text_object('a.', function()
+    local lnum = Pos.from_pos('.').lnum
+    return Buffer.current():line0(lnum)
+  end)
+
+  -- Select the nearest quote:
+  utils.define_text_object('aq', function() return Range.find_nearest_quotes() end)
+  utils.define_text_object('iq', function()
+    local range = Range.find_nearest_quotes()
+    if range == nil then return end
+    return range:shrink(1)
+  end)
+
+  ---Selects the next quote object (searches forward)
+  ---@param q string
+  local function define_quote_obj(q)
+    local function select_around()
+      -- Operator mappings are effectively running in visual mode, the way
+      -- `define_text_object` is implemented, so feed the keys `a${q}` to vim
+      -- to select the appropriate text-object
+      vim.cmd { cmd = 'normal', args = { 'a' .. q }, bang = true }
+
+      -- Now check on the visually selected text:
+      local range = Range.from_vtext()
+      if range:is_empty() then return range.start end
+      range.start = range.start:find_next(1, q) or range.start
+      range.stop = range.stop:find_next(-1, q) or range.stop
+      return range
+    end
+
+    utils.define_text_object('a' .. q, function() return select_around() end)
+    utils.define_text_object('i' .. q, function()
+      local range_or_pos = select_around()
+      if Range.is(range_or_pos) then
+        local start_next = range_or_pos.start:next(1)
+        local stop_prev = range_or_pos.stop:next(-1)
+        if start_next > stop_prev then return start_next end
+
+        local range = range_or_pos:shrink(1)
+        return range
+      else
+        return range_or_pos
+      end
+    end)
+  end
+  define_quote_obj [["]]
+  define_quote_obj [[']]
+  define_quote_obj [[`]]
+
+  ---Selects the "last" quote object (searches backward)
+  ---@param q string
+  local function define_last_quote_obj(q)
+    local function select_around()
+      local curr = Pos.from_pos('.'):find_next(-1, q)
+      if not curr then return end
+      -- Reset visual selection to current context:
+      Range.new(curr, curr):set_visual_selection()
+      vim.cmd.normal('a' .. q)
+      local range = Range.from_vtext()
+      if range:is_empty() then return range.start end
+      range.start = range.start:find_next(1, q) or range.start
+      range.stop = range.stop:find_next(-1, q) or range.stop
+      return range
+    end
+
+    utils.define_text_object('al' .. q, function() return select_around() end)
+    utils.define_text_object('il' .. q, function()
+      local range_or_pos = select_around()
+      if range_or_pos == nil then return end
+
+      if Range.is(range_or_pos) then
+        local start_next = range_or_pos.start:next(1)
+        local stop_prev = range_or_pos.stop:next(-1)
+        if start_next > stop_prev then return start_next end
+
+        local range = range_or_pos:shrink(1)
+        return range
+      else
+        return range_or_pos
+      end
+    end)
+  end
+  define_last_quote_obj [["]]
+  define_last_quote_obj [[']]
+  define_last_quote_obj [[`]]
+
+  -- Selects the "last" bracket object (searches backward):
+  local function define_last_bracket_obj(b, ...)
+    local function select_around()
+      local curr = Pos.from_pos('.'):find_next(-1, b)
+      if not curr then return end
+
+      local other = curr:find_match(1000)
+      if not other then return end
+
+      return Range.new(curr, other)
+    end
+
+    local keybinds = { ... }
+    table.insert(keybinds, b)
+    for _, k in ipairs(keybinds) do
+      utils.define_text_object('al' .. k, function() return select_around() end)
+      utils.define_text_object('il' .. k, function()
+        local range = select_around()
+        return range and range:shrink(1)
+      end)
+    end
+  end
+  define_last_bracket_obj('}', 'B')
+  define_last_bracket_obj ']'
+  define_last_bracket_obj(')', 'b')
+  define_last_bracket_obj '>'
+end
+return M

lua/u/range.lua

@@ -10,16 +10,16 @@ end
 
 ---@class Range
 ---@field start Pos
----@field stop Pos
+---@field stop Pos|nil
 ---@field mode 'v'|'V'
 local Range = {}
 
 ---@param start Pos
----@param stop Pos
+---@param stop Pos|nil
 ---@param mode? 'v'|'V'
 ---@return Range
 function Range.new(start, stop, mode)
-  if stop < start then
+  if stop ~= nil and stop < start then
     start, stop = stop, start
   end
 
@@ -27,7 +27,9 @@ function Range.new(start, stop, mode)
   local function str()
     ---@param p Pos
     local function posstr(p)
-      if p.off ~= 0 then
+      if p == nil then
+        return 'nil'
+      elseif p.off ~= 0 then
         return string.format('Pos(%d:%d){off=%d}', p.lnum, p.col, p.off)
       else
         return string.format('Pos(%d:%d)', p.lnum, p.col)
@@ -125,7 +127,7 @@ function Range.from_text_object(text_obj, opts)
 
       local prev_on_yank_enabled = on_yank_enabled
       on_yank_enabled = false
-      vim.cmd.normal {
+      vim.cmd {
         cmd = 'normal',
         bang = not opts.user_defined,
         args = { '""y' .. text_obj },
@@ -254,22 +256,27 @@ function Range.smallest(ranges)
   return result
 end
 
-function Range:clone() return Range.new(self.start:clone(), self.stop:clone(), self.mode) end
+function Range:clone() return Range.new(self.start:clone(), self.stop ~= nil and self.stop:clone() or nil, self.mode) end
-function Range:line_count() return self.stop.lnum - self.start.lnum + 1 end
+function Range:line_count()
+  if self:is_empty() then return 0 end
+  return self.stop.lnum - self.start.lnum + 1
+end
 
 function Range:to_linewise()
   local r = self:clone()
 
   r.mode = 'V'
   r.start.col = 0
-  r.stop.col = Pos.MAX_COL
+  if r.stop ~= nil then r.stop.col = Pos.MAX_COL end
 
   return r
 end
 
-function Range:is_empty() return self.start == self.stop end
+function Range:is_empty() return self.stop == nil end
 
 function Range:trim_start()
+  if self:is_empty() then return end
+
   local r = self:clone()
   while r.start:char():match '%s' do
     local next = r.start:next(1)
@@ -280,6 +287,8 @@ function Range:trim_start()
 end
 
 function Range:trim_stop()
+  if self:is_empty() then return end
+
   local r = self:clone()
   while r.stop:char():match '%s' do
     local next = r.stop:next(-1)
@@ -290,10 +299,12 @@ function Range:trim_stop()
 end
 
 ---@param p Pos
-function Range:contains(p) return p >= self.start and p <= self.stop end
+function Range:contains(p) return not self:is_empty() and p >= self.start and p <= self.stop end
 
 ---@return string[]
 function Range:lines()
+  if self:is_empty() then return {} end
+
   local lines = {}
   for i = 0, self.stop.lnum - self.start.lnum do
     local line = self:line0(i)
@@ -313,6 +324,8 @@ function Range:sub(i, j) return self:text():sub(i, j) end
 ---@return { line: string; idx0: { start: number; stop: number; }; lnum: number; range: fun():Range; text: fun():string }|nil
 function Range:line0(l)
   if l < 0 then return self:line0(self:line_count() + l) end
+  if l > self:line_count() then return end
+
   local line = vim.api.nvim_buf_get_lines(self.start.buf, self.start.lnum + l, self.start.lnum + l + 1, false)[1]
   if line == nil then return end
 
@@ -340,30 +353,57 @@ end
 
 ---@param replacement nil|string|string[]
 function Range:replace(replacement)
+  if replacement == nil then replacement = {} end
   if type(replacement) == 'string' then replacement = vim.fn.split(replacement, '\n') end
 
-  if replacement == nil and self.mode == 'V' then
+  local buf = self.start.buf
-    -- delete the lines:
+  -- convert to start-inclusive, stop-exclusive coordinates:
-    vim.api.nvim_buf_set_lines(self.start.buf, self.start.lnum, self.stop.lnum + 1, false, {})
+  local start_lnum, stop_lnum = self.start.lnum, (self.stop and self.stop.lnum or self.start.lnum) + 1
-  else
+  local start_col, stop_col = self.start.col, (self.stop and self.stop.col or self.start.col) + 1
-    if replacement == nil then replacement = { '' } end
 
-    if self.mode == 'v' then
+  local replace_type = (self:is_empty() and 'insert') or (self.mode == 'v' and 'region') or 'lines'
-      -- Fixup the bounds:
-      local last_line = vim.api.nvim_buf_get_lines(self.stop.buf, self.stop.lnum, self.stop.lnum + 1, false)[1] or ''
-      local max_col = #last_line
 
-      vim.api.nvim_buf_set_text(
+  ---@param alnum number
-        self.start.buf,
+  ---@param acol number
-        self.start.lnum,
+  ---@param blnum number
-        self.start.col,
+  ---@param bcol number
-        self.stop.lnum,
+  local function set_text(alnum, acol, blnum, bcol, repl)
-        math.min(self.stop.col + 1, max_col),
+    -- row indices are end-inclusive, and column indices are end-exclusive.
-        replacement
+    vim.api.nvim_buf_set_text(buf, alnum, acol, blnum, bcol, repl)
-      )
+
-    else
+    local new_last_line_num = self.start.lnum + #replacement - 1
-      vim.api.nvim_buf_set_lines(self.start.buf, self.start.lnum, self.stop.lnum + 1, false, replacement)
+    local new_last_col = #(replacement[#replacement] or '')
+    if new_last_line_num == start_lnum then new_last_col = new_last_col + start_col - 1 end
+
+    self.stop = Pos.new(buf, new_last_line_num, new_last_col)
   end
+
+  ---@param alnum number
+  ---@param blnum number
+  local function set_lines(alnum, blnum, repl)
+    -- indexing is zero-based, end-exclusive
+    vim.api.nvim_buf_set_lines(buf, alnum, blnum, false, repl)
+
+    if #repl == 0 then
+      self.stop = nil
+    else
+      local new_last_line_num = start_lnum + #replacement - 1
+      self.stop = Pos.new(self.start.buf, new_last_line_num, Pos.MAX_COL, self.stop.off)
+    end
+    self.mode = 'v'
+  end
+
+  if replace_type == 'insert' then
+    set_text(start_lnum, start_col, start_lnum, start_col, replacement)
+  elseif replace_type == 'region' then
+    -- Fixup the bounds:
+    local last_line = vim.api.nvim_buf_get_lines(buf, stop_lnum - 1, stop_lnum, false)[1] or ''
+    local max_col = #last_line
+    set_text(start_lnum, start_col, stop_lnum - 1, math.min(stop_col, max_col), replacement)
+  elseif replace_type == 'lines' then
+    set_lines(start_lnum, stop_lnum, replacement)
+  else
+    error 'unreachable'
   end
 end
 
@@ -371,6 +411,8 @@ end
 function Range:shrink(amount)
   local start = self.start
   local stop = self.stop
+  if stop == nil then return self:clone() end
+
   for _ = 1, amount do
     local next_start = start:next(1)
     local next_stop = stop:next(-1)
@@ -379,7 +421,7 @@ function Range:shrink(amount)
     stop = next_stop
     if next_start > next_stop then break end
   end
-  if start > stop then stop = start end
+  if start > stop then stop = nil end
   return Range.new(start, stop, self.mode)
 end
 
@@ -393,18 +435,30 @@ end
 ---@param left string
 ---@param right string
 function Range:save_to_pos(left, right)
+  if self:is_empty() then
+    self.start:save_to_pos(left)
+    self.start:save_to_pos(right)
+  else
     self.start:save_to_pos(left)
     self.stop:save_to_pos(right)
   end
+end
 
 ---@param left string
 ---@param right string
 function Range:save_to_marks(left, right)
+  if self:is_empty() then
+    self.start:save_to_mark(left)
+    self.start:save_to_mark(right)
+  else
     self.start:save_to_mark(left)
     self.stop:save_to_mark(right)
   end
+end
 
 function Range:set_visual_selection()
+  if self:is_empty() then return end
+
   if vim.api.nvim_get_current_buf() ~= self.start.buf then vim.api.nvim_set_current_buf(self.start.buf) end
 
   State.run(self.start.buf, function(s)
@@ -427,6 +481,8 @@ end
 ---@param group string
 ---@param opts? { timeout?: number, priority?: number, on_macro?: boolean }
 function Range:highlight(group, opts)
+  if self:is_empty() then return end
+
   opts = opts or { on_macro = false }
   if opts.on_macro == nil then opts.on_macro = false end
 

lua/u/repeat.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-local function _normal(cmd) vim.cmd.normal { cmd = 'normal', args = { cmd }, bang = true } end
+local function _normal(cmd) vim.cmd { cmd = 'normal', args = { cmd }, bang = true } end
 
 M.native_repeat = function() _normal '.' end
 M.native_undo = function() _normal 'u' end

lua/u/utils.lua

@@ -49,6 +49,7 @@ function M.define_text_object(key_seq, fn, opts)
   local function handle_visual()
     local range_or_pos = fn(key_seq)
     if range_or_pos == nil then return end
+    if Range.is(range_or_pos) and range_or_pos:is_empty() then range_or_pos = range_or_pos.start end
 
     if Range.is(range_or_pos) then
       local range = range_or_pos --[[@as Range]]
@@ -67,6 +68,7 @@ function M.define_text_object(key_seq, fn, opts)
 
     local range_or_pos = fn(key_seq)
     if range_or_pos == nil then return end
+    if Range.is(range_or_pos) and range_or_pos:is_empty() then range_or_pos = range_or_pos.start end
 
     if Range.is(range_or_pos) then
       range_or_pos:set_visual_selection()

spec/range_spec.lua

@@ -391,7 +391,7 @@ describe('Range', function()
 
   it('is_empty', function()
     withbuf({ 'line one', 'and line two' }, function()
-      local range = Range.new(Pos.new(nil, 0, 0), Pos.new(nil, 0, 0), 'v')
+      local range = Range.new(Pos.new(nil, 0, 0), nil, 'v')
       assert.is_true(range:is_empty())
 
       local range2 = Range.new(Pos.new(nil, 0, 0), Pos.new(nil, 0, 1), 'v')
@@ -471,4 +471,90 @@ describe('Range', function()
       assert.are.same({ 'Rg bleh' }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
     end)
   end)
+
+  it('replace updates Range.stop: same line', function()
+    withbuf({ 'The quick brown fox jumps over the lazy dog' }, function()
+      local b = vim.api.nvim_get_current_buf()
+      local r = Range.new(Pos.new(b, 0, 4), Pos.new(b, 0, 8), 'v')
+
+      r:replace 'bleh1'
+      assert.are.same({ 'The bleh1 brown fox jumps over the lazy dog' }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+
+      r:replace 'bleh2'
+      assert.are.same({ 'The bleh2 brown fox jumps over the lazy dog' }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+    end)
+  end)
+
+  it('replace updates Range.stop: multi-line', function()
+    withbuf({
+      'The quick brown fox jumps',
+      'over the lazy dog',
+    }, function()
+      local b = vim.api.nvim_get_current_buf()
+      local r = Range.new(Pos.new(b, 0, 20), Pos.new(b, 1, 3), 'v')
+      assert.are.same({ 'jumps', 'over' }, r:lines())
+
+      r:replace 'bleh1'
+      assert.are.same({ 'The quick brown fox bleh1 the lazy dog' }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+
+      r:replace 'blehGoo2'
+      assert.are.same({ 'The quick brown fox blehGoo2 the lazy dog' }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+    end)
+  end)
+
+  it('replace updates Range.stop: multi-line (blockwise)', function()
+    withbuf({
+      'The quick brown',
+      'fox',
+      'jumps',
+      'over',
+      'the lazy dog',
+    }, function()
+      local b = vim.api.nvim_get_current_buf()
+      local r = Range.new(Pos.new(b, 1, 0), Pos.new(b, 3, Pos.MAX_COL), 'V')
+      assert.are.same({ 'fox', 'jumps', 'over' }, r:lines())
+
+      r:replace { 'bleh1', 'bleh2' }
+      assert.are.same({
+        'The quick brown',
+        'bleh1',
+        'bleh2',
+        'the lazy dog',
+      }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+
+      r:replace 'blehGoo2'
+      assert.are.same({
+        'The quick brown',
+        'blehGoo2',
+        'the lazy dog',
+      }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+    end)
+  end)
+
+  it('replace after delete', function()
+    withbuf({
+      'The quick brown',
+      'fox',
+      'jumps',
+      'over',
+      'the lazy dog',
+    }, function()
+      local b = vim.api.nvim_get_current_buf()
+      local r = Range.new(Pos.new(b, 1, 0), Pos.new(b, 3, Pos.MAX_COL), 'V')
+      assert.are.same({ 'fox', 'jumps', 'over' }, r:lines())
+
+      r:replace(nil)
+      assert.are.same({
+        'The quick brown',
+        'the lazy dog',
+      }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+
+      r:replace { 'blehGoo2', '' }
+      assert.are.same({
+        'The quick brown',
+        'blehGoo2',
+        'the lazy dog',
+      }, vim.api.nvim_buf_get_lines(b, 0, -1, false))
+    end)
+  end)
 end)

u.nvim-0.2.0-1.rockspec

@@ -0,0 +1,24 @@
+package = "u.nvim"
+version = "0.2.0-1"
+source = {
+   url = "git+https://github.com/jrop/u.nvim"
+}
+description = {
+   summary = "nvim – a powerful Lua library designed to enhance your text manipulation experience in NeoVim, focusing primarily on a context-aware \"Range\" utility.",
+   detailed = "Welcome to u.nvim – a powerful Lua library designed to enhance your text manipulation experience in NeoVim, focusing primarily on a context-aware \"Range\" utility. This utility allows you to work efficiently with text selections based on various conditions, in a variety of contexts, making coding and editing more intuitive and productive.",
+   homepage = "https://github.com/jrop/u.nvim",
+   license = "MIT"
+}
+build = {
+   type = "builtin",
+   modules = {
+      ["u.buffer"] = "lua/u/buffer.lua",
+      ["u.codewriter"] = "lua/u/codewriter.lua",
+      ["u.opkeymap"] = "lua/u/opkeymap.lua",
+      ["u.pos"] = "lua/u/pos.lua",
+      ["u.range"] = "lua/u/range.lua",
+      ["u.repeat"] = "lua/u/repeat.lua",
+      ["u.state"] = "lua/u/state.lua",
+      ["u.utils"] = "lua/u/utils.lua"
+   }
+}