jonathan/u.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue caused by last commit
All checks were successful
NeoVim tests / plenary-tests (push) Successful in 10s
Details

Browse Source 
It seems that closures are not interacting well with the global nature
of operatorfunc's. That is just a hunch, and this feels like a hack, but
it fixes the issue.
This commit is contained in:
Jonathan Apodaca 2025-05-17 07:33:58 -06:00
parent 237bc9ba5e
commit 35b6e123ac
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lua/u/range.lua
View File

@ -131,14 +131,17 @@ function Range.from_motion(motion, opts)
pos_lbrack = vim.fn.getpos "'[", pos_lbrack = vim.fn.getpos "'[",
pos_rbrack = vim.fn.getpos "']", pos_rbrack = vim.fn.getpos "']",
opfunc = vim.go.operatorfunc, opfunc = vim.go.operatorfunc,
prev_captured_range = _G.Range__from_motion_opfunc_captured_range,
} }
--- @type u.Range|nil --- @type u.Range|nil
local captured_range = nil _G.Range__from_motion_opfunc_captured_range = nil
vim.api.nvim_buf_call(opts.bufnr, function() vim.api.nvim_buf_call(opts.bufnr, function()
if opts.pos ~= nil then opts.pos:save_to_pos '.' end if opts.pos ~= nil then opts.pos:save_to_pos '.' end
_G.Range__from_motion_opfunc = function(ty) captured_range = Range.from_op_func(ty) end _G.Range__from_motion_opfunc = function(ty)
_G.Range__from_motion_opfunc_captured_range = Range.from_op_func(ty)
end
vim.go.operatorfunc = 'v:lua.Range__from_motion_opfunc' vim.go.operatorfunc = 'v:lua.Range__from_motion_opfunc'
vim.cmd { vim.cmd {
cmd = 'normal', cmd = 'normal',
@ -147,6 +150,7 @@ function Range.from_motion(motion, opts)
mods = { silent = true }, mods = { silent = true },
} }
end) end)
local captured_range = _G.Range__from_motion_opfunc_captured_range
-- Restore original state: -- Restore original state:
vim.fn.winrestview(original_state.winview) vim.fn.winrestview(original_state.winview)
@ -155,6 +159,7 @@ function Range.from_motion(motion, opts)
vim.fn.setpos("'[", original_state.pos_lbrack) vim.fn.setpos("'[", original_state.pos_lbrack)
vim.fn.setpos("']", original_state.pos_rbrack) vim.fn.setpos("']", original_state.pos_rbrack)
vim.go.operatorfunc = original_state.opfunc vim.go.operatorfunc = original_state.opfunc
_G.Range__from_motion_opfunc_captured_range = original_state.prev_captured_range
if not captured_range then return nil end if not captured_range then return nil end