Skip to content

Commit 75f5895

Browse files
authored
Merge pull request #33 from tzachar/master
adapt to vim.treesitter.query.get_node_text
2 parents 0dc8069 + 3afb083 commit 75f5895

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

Diff for: lua/nvim-treesitter-refactor/navigation.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ local ts_utils = require "nvim-treesitter.ts_utils"
44
local utils = require "nvim-treesitter.utils"
55
local locals = require "nvim-treesitter.locals"
66
local configs = require "nvim-treesitter.configs"
7+
local ts_query = vim.treesitter.query
78
local api = vim.api
89

910
local M = {}
@@ -70,7 +71,7 @@ function M.list_definitions(bufnr)
7071
for _, node in ipairs(definitions) do
7172
local lnum, col, _ = node.node:start()
7273
local type = string.upper(node.type:sub(1, 1))
73-
local text = ts_utils.get_node_text(node.node)[1] or ""
74+
local text = ts_query.get_node_text(node.node, bufnr) or ""
7475
table.insert(qf_list, {
7576
bufnr = bufnr,
7677
lnum = lnum + 1,
@@ -125,7 +126,7 @@ function M.list_definitions_toc()
125126

126127
local lnum, col, _ = def.node:start()
127128
local type = string.upper(def.type:sub(1, 1))
128-
local text = ts_utils.get_node_text(def.node)[1] or ""
129+
local text = ts_query.get_node_text(def.node, bufnr) or ""
129130
table.insert(loc_list, {
130131
bufnr = bufnr,
131132
lnum = lnum + 1,

Diff for: lua/nvim-treesitter-refactor/smart_rename.lua

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ 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
89
local api = vim.api
910

1011
local M = {}
@@ -42,7 +43,7 @@ function M.smart_rename(bufnr)
4243
return
4344
end
4445

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

0 commit comments

Comments
 (0)