kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(treesitter): foldexpr tweaks

Browse Source 
Some small general fixes found working on developing async parsing.
This commit is contained in:
Lewis Russell 2023-05-01 10:32:29 +01:00 committed by GitHub
parent 37dd818722
commit 26cc946226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
runtime/lua/vim/treesitter/_fold.lua
View File

@ -1,3 +1,5 @@
local ts = vim.treesitter
local Range = require('vim.treesitter._range')
local api = vim.api
@ -90,21 +92,45 @@ local function trim_level(level)
return level
end
--- If a parser doesn't have any ranges explicitly set, treesitter will
--- return a range with end_row and end_bytes with a value of UINT32_MAX,
--- so clip end_row to the max buffer line.
---
--- TODO(lewis6991): Handle this generally
---
--- @param bufnr integer
--- @param erow integer?
--- @return integer
local function normalise_erow(bufnr, erow)
local max_erow = api.nvim_buf_line_count(bufnr) - 1
return math.min(erow or max_erow, max_erow)
end
---@param bufnr integer
---@param info TS.FoldInfo
---@param srow integer?
---@param erow integer?
local function get_folds_levels(bufnr, info, srow, erow)
if not api.nvim_buf_is_valid(bufnr) then
return false
end
srow = srow or 0
erow = erow or api.nvim_buf_line_count(bufnr)
erow = normalise_erow(bufnr, erow)
info:invalidate_range(srow, erow)
local prev_start = -1
local prev_stop = -1
vim.treesitter.get_parser(bufnr):for_each_tree(function(tree, ltree)
local query = vim.treesitter.query.get(ltree:lang(), 'folds')
local parser = ts.get_parser(bufnr)
if not parser:is_valid() then
return
end
parser:for_each_tree(function(tree, ltree)
local query = ts.query.get(ltree:lang(), 'folds')
if not query then
return
end
@ -112,9 +138,9 @@ local function get_folds_levels(bufnr, info, srow, erow)
-- erow in query is end-exclusive
local q_erow = erow and erow + 1 or -1
for id, node, metadata in query:iter_captures(tree:root(), bufnr, srow or 0, q_erow) do
for id, node, metadata in query:iter_captures(tree:root(), bufnr, srow, q_erow) do
if query.captures[id] == 'fold' then
local range = vim.treesitter.get_range(node, bufnr, metadata[id])
local range = ts.get_range(node, bufnr, metadata[id])
local start, _, stop, stop_col = Range.unpack4(range)
if stop_col == 0 then
@ -226,7 +252,7 @@ function M.foldexpr(lnum)
lnum = lnum or vim.v.lnum
local bufnr = api.nvim_get_current_buf()
if not vim.treesitter._has_parser(bufnr) or not lnum then
if not ts._has_parser(bufnr) or not lnum then
return '0'
end
@ -234,7 +260,7 @@ function M.foldexpr(lnum)
foldinfos[bufnr] = FoldInfo.new()
get_folds_levels(bufnr, foldinfos[bufnr])
local parser = vim.treesitter.get_parser(bufnr)
local parser = ts.get_parser(bufnr)
parser:register_cbs({
on_changedtree = function(tree_changes)
on_changedtree(bufnr, foldinfos[bufnr], tree_changes)

2
runtime/lua/vim/treesitter/languagetree.lua
View File

@ -262,7 +262,7 @@ function LanguageTree:parse()
tcall(self._parser.parse, self._parser, self._trees[i], self._source, true)
-- Pass ranges if this is an initial parse
local cb_changes = self._trees[i] and tree_changes or ranges
local cb_changes = self._trees[i] and tree_changes or tree:included_ranges(true)
self:_do_callback('changedtree', cb_changes, tree)
self._trees[i] = tree