From f8ac713448c9d8f7ca0dc2aff7e8858c1371310b Mon Sep 17 00:00:00 2001
From: Peter Cardenas <16930781+PeterCardenas@users.noreply.github.com>
Date: Tue, 30 Dec 2025 07:44:18 -0800
Subject: [PATCH] fix(treesitter): use metadata in :EditQuery captures #37116

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.
---
 runtime/lua/vim/treesitter/dev.lua | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/runtime/lua/vim/treesitter/dev.lua b/runtime/lua/vim/treesitter/dev.lua
index 200f51c13e..589dc00fe1 100644
--- a/runtime/lua/vim/treesitter/dev.lua
+++ b/runtime/lua/vim/treesitter/dev.lua
@@ -597,10 +597,12 @@ local function update_editor_highlights(query_win, base_win, lang)
     end
     local root = tree:root()
     local topline, botline = vim.fn.line('w0', base_win), vim.fn.line('w$', base_win)
-    for id, node in query:iter_captures(root, base_buf, topline - 1, botline) do
+    for id, node, metadata in query:iter_captures(root, base_buf, topline - 1, botline) do
       local capture_name = query.captures[id]
       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, {
           end_row = end_lnum,
           end_col = end_col,