benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-01 19:17:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(statusline): adjust to the new API (query)

Browse source
This commit is contained in:
ranjithshegde 2022-04-18 17:28:40 +02:00 • committed by Christian Clason
parent 2248b64781
commit 2490a8bbca
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lua/nvim-treesitter.lua
View file

@ -4,6 +4,7 @@ local info = require "nvim-treesitter.info"
local configs = require "nvim-treesitter.configs"
local parsers = require "nvim-treesitter.parsers"
local ts_query = vim.treesitter.query
local ts_utils = require "nvim-treesitter.ts_utils"
-- Registers all query predicates
require "nvim-treesitter.query_predicates"
@ -21,7 +22,7 @@ function M.define_modules(...)
configs.define_modules(...)
end
local get_line_for_node = function(node, type_patterns, transform_fn)
local get_line_for_node = function(node, type_patterns, transform_fn, bufnr)
local node_type = node:type()
local is_valid = false
for _, rgx in ipairs(type_patterns) do
@ -33,7 +34,7 @@ local get_line_for_node = function(node, type_patterns, transform_fn)
if not is_valid then
return ""
end
local line = transform_fn(vim.trim(ts_query.get_node_text(node)[1] or ""))
local line = transform_fn(vim.trim(ts_query.get_node_text(node, bufnr) or ""))
-- Escape % to avoid statusline to evaluate content as expression
return line:gsub("%%", "%%%%")
end
@ -48,15 +49,16 @@ function M.statusline(opts)
return
end
local options = opts or {}
if type(opts) == "number" then
options = { indicator_size = opts }
end
-- if type(opts) == "number" then
-- options = { indicator_size = opts }
-- end
local bufnr = options.bufnr or 0
local indicator_size = options.indicator_size or 100
local type_patterns = options.type_patterns or { "class", "function", "method" }
local transform_fn = options.transform_fn or transform_line
local separator = options.separator or " -> "
local current_node = ts_query.get_node_at_cursor()
local current_node = ts_utils.get_node_at_cursor()
if not current_node then
return ""
end
@ -65,7 +67,7 @@ function M.statusline(opts)
local expr = current_node
while expr do
local line = get_line_for_node(expr, type_patterns, transform_fn)
local line = get_line_for_node(expr, type_patterns, transform_fn, bufnr)
if line ~= "" and not vim.tbl_contains(lines, line) then
table.insert(lines, 1, line)
end