ilyakooo0/nvim-autopairs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nvim-autopairs.git synced 2024-10-26 08:41:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: use vim.treesitter.query instead of deprecated nvim-treesitter.ts_query

Browse Source
This commit is contained in:
ecosse3 2022-04-19 11:26:37 +02:00 committed by windwp
parent 38d486a1c4
commit e9b47f0f68
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua/nvim-autopairs/ts-conds.lua
View File

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

5
lua/nvim-autopairs/ts-utils.lua
View File

@ -1,11 +1,10 @@
local ts_query = vim.treesitter.query
local _, ts_utils = pcall(require, 'nvim-treesitter.ts_utils')
local M = {} local M = {}
function M.get_tag_name(node) function M.get_tag_name(node)
local tag_name = nil local tag_name = nil
if node ~=nil then if node ~=nil then
tag_name = ts_utils.get_node_text(node) tag_name = ts_query.get_node_text(node)
end end
return tag_name return tag_name
end end

6
tests/test_utils.lua
View File

@ -1,7 +1,7 @@
local utils = require('nvim-autopairs.utils') local utils = require('nvim-autopairs.utils')
local _, ts_utils = pcall(require, 'nvim-treesitter.ts_utils')
local log = require('nvim-autopairs._log') local log = require('nvim-autopairs._log')
local api = vim.api local api = vim.api
local ts_query = vim.treesitter.query
local helpers = {} local helpers = {}
@ -164,7 +164,7 @@ _G.Test_withfile = function(test_data, cb)
end end
_G.dump_node = function(node) _G.dump_node = function(node)
local text = ts_utils.get_node_text(node) local text = ts_query.get_node_text(node)
for _, txt in pairs(text) do for _, txt in pairs(text) do
print(txt) print(txt)
end end
@ -173,7 +173,7 @@ end
_G.dump_node_text = function(target) _G.dump_node_text = function(target)
for node in target:iter_children() do for node in target:iter_children() do
local node_type = node:type() local node_type = node:type()
local text = ts_utils.get_node_text(node) local text = ts_query.get_node_text(node)
log.debug('type:' .. node_type .. ' ') log.debug('type:' .. node_type .. ' ')
log.debug(text) log.debug(text)
end end