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

ensure normal-mode before running g@...
All checks were successful
NeoVim tests / code-quality (push) Successful in 1m21s
Details

Browse Source
This commit is contained in:
Jonathan Apodaca 2025-06-04 23:00:22 -06:00
parent 81ba1bb96b
commit 6f86bfaa42
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua/u/range.lua
View File

@ -1,5 +1,7 @@
local Pos = require 'u.pos' local Pos = require 'u.pos'
local ESC = vim.api.nvim_replace_termcodes('<Esc>', true, false, true)
--- @class u.Range --- @class u.Range
--- @field start u.Pos --- @field start u.Pos
--- @field stop u.Pos|nil --- @field stop u.Pos|nil
@ -132,6 +134,8 @@ function Range.from_motion(motion, opts)
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, prev_captured_range = _G.Range__from_motion_opfunc_captured_range,
prev_mode = vim.fn.mode(),
vinf = Range.from_vtext(),
} }
--- @type u.Range|nil --- @type u.Range|nil
_G.Range__from_motion_opfunc_captured_range = nil _G.Range__from_motion_opfunc_captured_range = nil
@ -146,7 +150,7 @@ function Range.from_motion(motion, opts)
vim.cmd { vim.cmd {
cmd = 'normal', cmd = 'normal',
bang = not opts.user_defined, bang = not opts.user_defined,
args = { 'g@' .. motion }, args = { ESC .. 'g@' .. motion },
mods = { silent = true }, mods = { silent = true },
} }
end) end)
@ -158,6 +162,7 @@ function Range.from_motion(motion, opts)
vim.fn.setpos('.', original_state.cursor) vim.fn.setpos('.', original_state.cursor)
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)
if original_state.prev_mode ~= 'n' then original_state.vinf:set_visual_selection() end
vim.go.operatorfunc = original_state.opfunc vim.go.operatorfunc = original_state.opfunc
_G.Range__from_motion_opfunc_captured_range = original_state.prev_captured_range _G.Range__from_motion_opfunc_captured_range = original_state.prev_captured_range

7
shell.nix
View File

@ -1,8 +1,11 @@
{ {
pkgs ? pkgs ?
import import
# neovim@0.11.1: https://history.nix-packages.com/package/neovim/0.11.1 # nixpkgs-unstable (neovim@0.11.2):
(fetchTarball "https://github.com/nixos/nixpkgs/tarball/e73c3bf29132da092f9c819b97b6e214367eb71f") (fetchTarball {
url = "https://github.com/nixos/nixpkgs/archive/e4b09e47ace7d87de083786b404bf232eb6c89d8.tar.gz";
sha256 = "1a2qvp2yz8j1jcggl1yvqmdxicbdqq58nv7hihmw3bzg9cjyqm26";
})
{ }, { },
}: }:
pkgs.mkShell { pkgs.mkShell {