From 8a4464cd14733401088d808ca999dcb11ef08c06 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 10:03:55 +0100
Subject: [PATCH] [Backport release-0.9] fix: vim.treesitter.get_node() now
 correctly takes opts.lang (#26382)

[Backport release-0.9] fix(treesitter): allow passing lang to get_node()
---
 runtime/doc/treesitter.txt               |  2 ++
 runtime/lua/vim/treesitter.lua           |  3 ++-
 test/functional/treesitter/node_spec.lua | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/runtime/doc/treesitter.txt b/runtime/doc/treesitter.txt
index 8716e62487..916b501dad 100644
--- a/runtime/doc/treesitter.txt
+++ b/runtime/doc/treesitter.txt
@@ -560,6 +560,8 @@ get_node({opts})                                   *vim.treesitter.get_node()*
                 • pos table|nil 0-indexed (row, col) tuple. Defaults to cursor
                   position in the current window. Required if {bufnr} is not
                   the current buffer
+                • lang string|nil Parser language. (default: from buffer
+                  filetype)
                 • ignore_injections boolean Ignore injected languages (default
                   true)
 
diff --git a/runtime/lua/vim/treesitter.lua b/runtime/lua/vim/treesitter.lua
index 12fbe1654f..1c3575dc58 100644
--- a/runtime/lua/vim/treesitter.lua
+++ b/runtime/lua/vim/treesitter.lua
@@ -355,6 +355,7 @@ end
 ---             - bufnr integer|nil Buffer number (nil or 0 for current buffer)
 ---             - pos table|nil 0-indexed (row, col) tuple. Defaults to cursor position in the
 ---                             current window. Required if {bufnr} is not the current buffer
+---             - lang string|nil Parser language. (default: from buffer filetype)
 ---             - ignore_injections boolean Ignore injected languages (default true)
 ---
 ---@return TSNode | nil Node at the given position
@@ -385,7 +386,7 @@ function M.get_node(opts)
 
   local ts_range = { row, col, row, col }
 
-  local root_lang_tree = M.get_parser(bufnr)
+  local root_lang_tree = M.get_parser(bufnr, opts.lang)
   if not root_lang_tree then
     return
   end
diff --git a/test/functional/treesitter/node_spec.lua b/test/functional/treesitter/node_spec.lua
index eef75d0e91..16ead69649 100644
--- a/test/functional/treesitter/node_spec.lua
+++ b/test/functional/treesitter/node_spec.lua
@@ -40,6 +40,20 @@ describe('treesitter node API', function()
     assert_alive()
   end)
 
+  it('get_node() with lang given', function()
+    -- this buffer doesn't have filetype set!
+    insert('local foo = function() end')
+    exec_lua([[
+      node = vim.treesitter.get_node({
+        bufnr = 0,
+        pos = { 0, 6 },  -- on "foo"
+        lang = 'lua',
+      })
+    ]])
+    eq('foo', lua_eval('vim.treesitter.query.get_node_text(node, 0)'))
+    eq('identifier', lua_eval('node:type()'))
+  end)
+
   it('can move between siblings', function()
     insert([[
       int main(int x, int y, int z) {