GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 01:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(treesitter): avoid computing foldlevels for reloaded buffer #32233

Browse Source
This commit is contained in:
luukvbaal
2025-01-28 17:34:07 +01:00
committed by GitHub
parent cb924764a4
commit a119dab40f
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,10 +269,15 @@ local function schedule_if_loaded(bufnr, fn)
end end
---@param bufnr integer ---@param bufnr integer
---@param foldinfo TS.FoldInfo
---@param tree_changes Range4[] ---@param tree_changes Range4[]
local function on_changedtree(bufnr, foldinfo, tree_changes) local function on_changedtree(bufnr, tree_changes)
schedule_if_loaded(bufnr, function() schedule_if_loaded(bufnr, function()
-- Buffer reload clears `foldinfos[bufnr]`, which may still be nil when callback is invoked.
local foldinfo = foldinfos[bufnr]
if not foldinfo then
return
end
local srow_upd, erow_upd ---@type integer?, integer? local srow_upd, erow_upd ---@type integer?, integer?
local max_erow = api.nvim_buf_line_count(bufnr) local max_erow = api.nvim_buf_line_count(bufnr)
-- TODO(ribru17): Replace this with a proper .all() awaiter once #19624 is resolved -- TODO(ribru17): Replace this with a proper .all() awaiter once #19624 is resolved
@ -303,13 +308,18 @@ local function on_changedtree(bufnr, foldinfo, tree_changes)
end end
---@param bufnr integer ---@param bufnr integer
---@param foldinfo TS.FoldInfo
---@param start_row integer ---@param start_row integer
---@param old_row integer ---@param old_row integer
---@param old_col integer ---@param old_col integer
---@param new_row integer ---@param new_row integer
---@param new_col integer ---@param new_col integer
local function on_bytes(bufnr, foldinfo, start_row, start_col, old_row, old_col, new_row, new_col) local function on_bytes(bufnr, start_row, start_col, old_row, old_col, new_row, new_col)
-- Buffer reload clears `foldinfos[bufnr]`, which may still be nil when callback is invoked.
local foldinfo = foldinfos[bufnr]
if not foldinfo then
return
end
-- extend the end to fully include the range -- extend the end to fully include the range
local end_row_old = start_row + old_row + 1 local end_row_old = start_row + old_row + 1
local end_row_new = start_row + new_row + 1 local end_row_new = start_row + new_row + 1
@ -348,7 +358,7 @@ local function on_bytes(bufnr, foldinfo, start_row, start_col, old_row, old_col,
-- is invoked. For example, `J` with non-zero count triggers multiple on_bytes before executing -- is invoked. For example, `J` with non-zero count triggers multiple on_bytes before executing
-- the scheduled callback. So we accumulate the edited ranges in `on_bytes_range`. -- the scheduled callback. So we accumulate the edited ranges in `on_bytes_range`.
schedule_if_loaded(bufnr, function() schedule_if_loaded(bufnr, function()
if not foldinfo.on_bytes_range then if not (foldinfo.on_bytes_range and foldinfos[bufnr]) then
return return
end end
local srow, erow = foldinfo.on_bytes_range[1], foldinfo.on_bytes_range[2] local srow, erow = foldinfo.on_bytes_range[1], foldinfo.on_bytes_range[2]
@ -387,13 +397,11 @@ function M.foldexpr(lnum)
parser:register_cbs({ parser:register_cbs({
on_changedtree = function(tree_changes) on_changedtree = function(tree_changes)
if foldinfos[bufnr] then on_changedtree(bufnr, tree_changes)
on_changedtree(bufnr, foldinfos[bufnr], tree_changes)
end
end, end,
on_bytes = function(_, _, start_row, start_col, _, old_row, old_col, _, new_row, new_col, _) on_bytes = function(_, _, start_row, start_col, _, old_row, old_col, _, new_row, new_col, _)
on_bytes(bufnr, foldinfos[bufnr], start_row, start_col, old_row, old_col, new_row, new_col) on_bytes(bufnr, start_row, start_col, old_row, old_col, new_row, new_col)
end, end,
on_detach = function() on_detach = function()