From 632b649a375ef9775df3f40830039066d4508840 Mon Sep 17 00:00:00 2001 From: Stephan Seitz Date: Mon, 26 Dec 2022 14:10:02 +0100 Subject: [PATCH] chore: replace deprecated ts_utils.get_node_text Fixes #101 --- lua/nvim-treesitter-playground/internal.lua | 4 ++-- lua/nvim-treesitter-playground/query_linter.lua | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/nvim-treesitter-playground/internal.lua b/lua/nvim-treesitter-playground/internal.lua index 6d66a5a..fb9e298 100644 --- a/lua/nvim-treesitter-playground/internal.lua +++ b/lua/nvim-treesitter-playground/internal.lua @@ -517,7 +517,7 @@ function M.update_query(bufnr, query_bufnr) for capture_match in ts_query.iter_group_results(query_bufnr, "captures") do table.insert(M._entries[bufnr].captures, capture_match.capture) - local capture = ts_utils.get_node_text(capture_match.capture.name.node, query_bufnr)[1] + local capture = vim.treesitter.query.get_node_text(capture_match.capture.name.node, query_bufnr) if not capture_by_color[capture] then capture_by_color[capture] = "TSPlaygroundCapture" .. index @@ -581,7 +581,7 @@ function M.on_query_cursor_move(bufnr) local _, _, capture_end = capture.def.node:end_() local _, _, start = node_at_point:start() local _, _, _end = node_at_point:end_() - local capture_name = ts_utils.get_node_text(capture.name.node)[1] + local capture_name = vim.treesitter.query.get_node_text(capture.name.node, bufnr) if start >= capture_start and _end <= capture_end and capture_name then M.highlight_matched_query_nodes_from_capture(bufnr, capture_name) diff --git a/lua/nvim-treesitter-playground/query_linter.lua b/lua/nvim-treesitter-playground/query_linter.lua index cf63ea5..521bafa 100644 --- a/lua/nvim-treesitter-playground/query_linter.lua +++ b/lua/nvim-treesitter-playground/query_linter.lua @@ -20,7 +20,7 @@ local function lint_node(node, buf, error_type, complete_message) if error_type ~= "Invalid Query" then ts_utils.highlight_node(node, buf, hl_namespace, ERROR_HL) end - local node_text = table.concat(ts_utils.get_node_text(node, buf), " ") + local node_text = vim.treesitter.query.get_node_text(node, buf):gsub("\n", " ") local error_text = complete_message or error_type .. ": " .. node_text local error_range = { node:range() } if M.use_virtual_text then @@ -83,7 +83,7 @@ function M.lint(query_buf) local toplevel_node = utils.get_at_path(m, "toplevel-query.node") if toplevel_node and query_lang then - local query_text = table.concat(ts_utils.get_node_text(toplevel_node), "\n") + local query_text = vim.treesitter.query.get_node_text(toplevel_node, query_buf) local err ok, err = pcall(vim.treesitter.parse_query, query_lang, query_text) if not ok then @@ -96,7 +96,7 @@ function M.lint(query_buf) local anonymous_node = utils.get_at_path(m, "anonymous_node.node") local node = named_node or anonymous_node if node then - local node_type = ts_utils.get_node_text(node)[1] + local node_type = vim.treesitter.query.get_node_text(node, query_buf) if anonymous_node then node_type = node_type:gsub('"(.*)".*$', "%1"):gsub("\\(.)", "%1") @@ -117,7 +117,7 @@ function M.lint(query_buf) local field_node = utils.get_at_path(m, "field.node") if field_node then - local field_name = ts_utils.get_node_text(field_node)[1] + local field_name = vim.treesitter.query.get_node_text(field_node, query_buf) local found = vim.tbl_contains(parser_info.fields, field_name) if not found then lint_node(field_node, query_buf, "Invalid Field")