Skip to content

Commit 65ad2ec

Browse files
committed
fix: avoid deprecated ts_utils.get_node_text
1 parent 34c1d80 commit 65ad2ec

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

lua/nvim-treesitter-refactor/navigation.lua

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
local ts_utils = require "nvim-treesitter.ts_utils"
44
local locals = require "nvim-treesitter.locals"
55
local configs = require "nvim-treesitter.configs"
6-
local ts_query = vim.treesitter.query
76
local api = vim.api
87

98
local M = {}
@@ -16,6 +15,8 @@ local function index_of(tbl, obj)
1615
end
1716
end
1817

18+
local get_node_text = vim.treesitter.get_node_text or vim.treesitter.query.get_node_text
19+
1920
function M.goto_definition(bufnr, fallback_function)
2021
local bufnr = bufnr or api.nvim_get_current_buf()
2122
local node_at_point = ts_utils.get_node_at_cursor()
@@ -78,7 +79,7 @@ function M.list_definitions(bufnr)
7879
for _, node in ipairs(definitions) do
7980
local lnum, col, _ = node.node:start()
8081
local type = string.upper(node.type:sub(1, 1))
81-
local text = ts_query.get_node_text(node.node, bufnr) or ""
82+
local text = get_node_text(node.node, bufnr) or ""
8283
table.insert(qf_list, {
8384
bufnr = bufnr,
8485
lnum = lnum + 1,
@@ -133,7 +134,7 @@ function M.list_definitions_toc()
133134

134135
local lnum, col, _ = def.node:start()
135136
local type = string.upper(def.type:sub(1, 1))
136-
local text = ts_query.get_node_text(def.node, bufnr) or ""
137+
local text = get_node_text(def.node, bufnr) or ""
137138
table.insert(loc_list, {
138139
bufnr = bufnr,
139140
lnum = lnum + 1,

lua/nvim-treesitter-refactor/smart_rename.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ local ts_utils = require "nvim-treesitter.ts_utils"
55
local locals = require "nvim-treesitter.locals"
66
local configs = require "nvim-treesitter.configs"
77
local utils = require "nvim-treesitter.utils"
8-
local ts_query = vim.treesitter.query
98
local api = vim.api
109

10+
local get_node_text = vim.treesitter.get_node_text or vim.treesitter.query.get_node_text
11+
1112
local M = {}
1213

1314
function M.smart_rename(bufnr)
@@ -43,7 +44,7 @@ function M.smart_rename(bufnr)
4344
return
4445
end
4546

46-
local node_text = ts_query.get_node_text(node_at_point, bufnr)
47+
local node_text = get_node_text(node_at_point, bufnr)
4748
local input = { prompt = "New name: ", default = node_text or "" }
4849
if not vim.ui.input then
4950
local new_name = vim.fn.input(input.prompt, input.default)

0 commit comments

Comments
 (0)