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

fix(treesitter): use metadata in :EditQuery captures #37116

Browse Source 
Problem:
When the `#offset!` directive is used with `:EditQuery`, the query does not take the offset into consideration when creating the extmark to preview the capture.

Solution:
Use the capture metadata to modify the node range before creating the extmark.
This commit is contained in:
Peter Cardenas
2025-12-30 07:44:18 -08:00
committed by Christian Clason
parent fda8d2c717
commit 46f569a890
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/lua/vim/treesitter/dev.lua
View File

@@ -583,10 +583,13 @@ local function update_editor_highlights(query_win, base_win, lang)
-- Remove the '@' from the cursor word -- Remove the '@' from the cursor word
cursor_word = cursor_word:sub(2) cursor_word = cursor_word:sub(2)
local topline, botline = vim.fn.line('w0', base_win), vim.fn.line('w$', base_win) local topline, botline = vim.fn.line('w0', base_win), vim.fn.line('w$', base_win)
for id, node in query:iter_captures(parser:trees()[1]:root(), base_buf, topline - 1, botline) do for id, node, metadata in
query:iter_captures(parser:trees()[1]:root(), base_buf, topline - 1, botline)
do
local capture_name = query.captures[id] local capture_name = query.captures[id]
if capture_name == cursor_word then if capture_name == cursor_word then
local lnum, col, end_lnum, end_col = node:range() local lnum, col, end_lnum, end_col =
Range.unpack4(vim.treesitter.get_range(node, base_buf, metadata[id]))
api.nvim_buf_set_extmark(base_buf, edit_ns, lnum, col, { api.nvim_buf_set_extmark(base_buf, edit_ns, lnum, col, {
end_row = end_lnum, end_row = end_lnum,
end_col = end_col, end_col = end_col,