mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-04-02 05:39:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(treesitter): select with node ending with unicode char (#38557)

Browse Source 
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
altermo
2026-03-31 07:03:18 +02:00
committed by GitHub
parent da58fe8fd2
commit 1bcf2d7f90
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/lua/vim/treesitter/_select.lua
View File

@@ -381,14 +381,17 @@ local function get_selection()
--- @type Range4,Range4
pos1, pos2 = pos2, pos1
end
local range = { pos1[2] - 1, pos1[3] - 1, pos2[2] - 1, pos2[3] }
if range[4] == #vim.fn.getline(range[3] + 1) + 1 then
range[3] = range[3] + 1
range[4] = 0
if pos2[3] == #vim.fn.getline(pos2[2]) + 1 then
pos2[2] = pos2[2] + 1
pos2[3] = 0
else
-- set {pos2} to pos of last byte of character under {pos2} (rather than first)
local r = vim.fn.getregionpos(pos2, pos2, { exclusive = false })
pos2 = r[#r][2]
end
return range
return { pos1[2] - 1, pos1[3] - 1, pos2[2] - 1, pos2[3] }
end
local function get_parent_from_range(range)

15
test/functional/treesitter/select_spec.lua
View File

@@ -176,6 +176,21 @@ describe('treesitter incremental-selection', function()
treeselect('select_parent')
eq('foo(1)\nbar(2)\n', get_selected())
end)
it('handles unicode', function()
set_lines {
'',
'foo("abö")',
'',
}
feed('gg', 'jfb', 'v')
treeselect('select_node')
eq('abö', get_selected())
treeselect('select_parent')
eq('"abö"', get_selected())
end)
end)
describe('treesitter incremental-selection with injections', function()