vim.treesitter.query.get_node_text() deprecated (#419)

try new `vim.treesitter.get_node_text`, falling back to deprecated `vim.treesitter.query.get_node_text`
windwp · Dec 20, 2023 · 776c742 · 776c742
1 parent 0f04d78
commit 776c742
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/lua/nvim-autopairs/ts-conds.lua b/lua/nvim-autopairs/ts-conds.lua
@@ -3,7 +3,7 @@ local _, ts_utils = pcall(require, 'nvim-treesitter.ts_utils')
 local log = require('nvim-autopairs._log')
 local parsers = require'nvim-treesitter.parsers'
 local utils = require('nvim-autopairs.utils')
-local ts_query = vim.treesitter.query
+local ts_get_node_text = vim.treesitter.get_node_text or vim.treesitter.query.get_node_text
 
 local conds = {}
 
@@ -20,7 +20,7 @@ conds.is_endwise_node = function(nodes)
         parsers.get_parser():parse()
         local target = ts_utils.get_node_at_cursor()
         if target ~= nil and utils.is_in_table(nodes, target:type()) then
-            local text = ts_query.get_node_text(target) or {""}
+            local text = ts_get_node_text(target) or {""}
             local last = text[#text]:match(opts.rule.end_pair)
             -- check last character is match with end_pair
             if last == nil then
@@ -32,9 +32,9 @@ conds.is_endwise_node = function(nodes)
                 local begin_target,_, end_target = target:range()
                 local begin_parent,_, end_parent = target:parent():range()
                 -- log.debug(target:range())
-                -- log.debug(ts_query.get_node_text(target))
+                -- log.debug(ts_get_node_text(target))
                 -- log.debug(target:parent():range())
-                -- log.debug(ts_query.get_node_text(target:parent()))
+                -- log.debug(ts_get_node_text(target:parent()))
                 if
                     (
                         begin_target ~= begin_parent

diff --git a/lua/nvim-autopairs/ts-utils.lua b/lua/nvim-autopairs/ts-utils.lua
@@ -1,10 +1,10 @@
-local ts_query = vim.treesitter.query
+local ts_get_node_text = vim.treesitter.get_node_text or vim.treesitter.query.get_node_text
 local M = {}
 
 function M.get_tag_name(node)
   local tag_name = nil
   if node ~=nil then
-    tag_name = ts_query.get_node_text(node)
+    tag_name = ts_get_node_text(node)
   end
   return tag_name
 end

diff --git a/tests/test_utils.lua b/tests/test_utils.lua
@@ -1,7 +1,7 @@
 local utils = require('nvim-autopairs.utils')
 local log = require('nvim-autopairs._log')
 local api = vim.api
-local ts_query = vim.treesitter.query
+local ts_get_node_text = vim.treesitter.get_node_text or vim.treesitter.query.get_node_text
 
 local helpers = {}
 
@@ -169,7 +169,7 @@ _G.Test_withfile = function(test_data, cb)
 end
 
 _G.dump_node = function(node)
-    local text = ts_query.get_node_text(node)
+    local text = ts_get_node_text(node)
     for _, txt in pairs(text) do
         print(txt)
     end
@@ -178,7 +178,7 @@ end
 _G.dump_node_text = function(target)
     for node in target:iter_children() do
         local node_type = node:type()
-        local text = ts_query.get_node_text(node)
+        local text = ts_get_node_text(node)
         log.debug('type:' .. node_type .. ' ')
         log.debug(text)
     end