mirror of
https://github.com/neovim/neovim
synced 2025-07-23 14:51:52 +00:00
perf(treesitter): calculate folds asynchronously
**Problem:** The treesitter `foldexpr` runs synchronous parses to calculate fold levels, which eliminates async parsing performance in the highlighter. **Solution:** Migrate the `foldexpr` to also calculate and apply fold levels asynchronously.
This commit is contained in:
committed by
Lewis Russell
parent
5a54681025
commit
b192d58284
@ -305,6 +305,7 @@ PERFORMANCE
|
|||||||
queries.
|
queries.
|
||||||
• Treesitter highlighting is now asynchronous. To force synchronous parsing,
|
• Treesitter highlighting is now asynchronous. To force synchronous parsing,
|
||||||
use `vim.g._ts_force_sync_parsing = true`.
|
use `vim.g._ts_force_sync_parsing = true`.
|
||||||
|
• Treesitter folding is now calculated asynchronously.
|
||||||
|
|
||||||
PLUGINS
|
PLUGINS
|
||||||
|
|
||||||
|
@ -69,7 +69,8 @@ end
|
|||||||
---@param info TS.FoldInfo
|
---@param info TS.FoldInfo
|
||||||
---@param srow integer?
|
---@param srow integer?
|
||||||
---@param erow integer? 0-indexed, exclusive
|
---@param erow integer? 0-indexed, exclusive
|
||||||
local function compute_folds_levels(bufnr, info, srow, erow)
|
---@param callback function?
|
||||||
|
local function compute_folds_levels(bufnr, info, srow, erow, callback)
|
||||||
srow = srow or 0
|
srow = srow or 0
|
||||||
erow = erow or api.nvim_buf_line_count(bufnr)
|
erow = erow or api.nvim_buf_line_count(bufnr)
|
||||||
|
|
||||||
@ -78,7 +79,10 @@ local function compute_folds_levels(bufnr, info, srow, erow)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
parser:parse()
|
parser:parse(nil, function(_, trees)
|
||||||
|
if not trees then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local enter_counts = {} ---@type table<integer, integer>
|
local enter_counts = {} ---@type table<integer, integer>
|
||||||
local leave_counts = {} ---@type table<integer, integer>
|
local leave_counts = {} ---@type table<integer, integer>
|
||||||
@ -176,6 +180,11 @@ local function compute_folds_levels(bufnr, info, srow, erow)
|
|||||||
leave_prev = leave_line
|
leave_prev = leave_line
|
||||||
level0_prev = adjusted
|
level0_prev = adjusted
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if callback then
|
||||||
|
callback()
|
||||||
|
end
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
local M = {}
|
local M = {}
|
||||||
@ -266,6 +275,8 @@ local function on_changedtree(bufnr, foldinfo, tree_changes)
|
|||||||
schedule_if_loaded(bufnr, function()
|
schedule_if_loaded(bufnr, function()
|
||||||
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
|
||||||
|
local iterations = 0
|
||||||
for _, change in ipairs(tree_changes) do
|
for _, change in ipairs(tree_changes) do
|
||||||
local srow, _, erow, ecol = Range.unpack4(change)
|
local srow, _, erow, ecol = Range.unpack4(change)
|
||||||
-- If a parser doesn't have any ranges explicitly set, treesitter will
|
-- If a parser doesn't have any ranges explicitly set, treesitter will
|
||||||
@ -279,15 +290,17 @@ local function on_changedtree(bufnr, foldinfo, tree_changes)
|
|||||||
end
|
end
|
||||||
-- Start from `srow - foldminlines`, because this edit may have shrunken the fold below limit.
|
-- Start from `srow - foldminlines`, because this edit may have shrunken the fold below limit.
|
||||||
srow = math.max(srow - vim.wo.foldminlines, 0)
|
srow = math.max(srow - vim.wo.foldminlines, 0)
|
||||||
compute_folds_levels(bufnr, foldinfo, srow, erow)
|
|
||||||
srow_upd = srow_upd and math.min(srow_upd, srow) or srow
|
srow_upd = srow_upd and math.min(srow_upd, srow) or srow
|
||||||
erow_upd = erow_upd and math.max(erow_upd, erow) or erow
|
erow_upd = erow_upd and math.max(erow_upd, erow) or erow
|
||||||
end
|
compute_folds_levels(bufnr, foldinfo, srow, erow, function()
|
||||||
if #tree_changes > 0 then
|
iterations = iterations + 1
|
||||||
|
if iterations == #tree_changes then
|
||||||
foldinfo:foldupdate(bufnr, srow_upd, erow_upd)
|
foldinfo:foldupdate(bufnr, srow_upd, erow_upd)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
---@param bufnr integer
|
---@param bufnr integer
|
||||||
---@param foldinfo TS.FoldInfo
|
---@param foldinfo TS.FoldInfo
|
||||||
@ -342,9 +355,10 @@ local function on_bytes(bufnr, foldinfo, start_row, start_col, old_row, old_col,
|
|||||||
foldinfo.on_bytes_range = nil
|
foldinfo.on_bytes_range = nil
|
||||||
-- Start from `srow - foldminlines`, because this edit may have shrunken the fold below limit.
|
-- Start from `srow - foldminlines`, because this edit may have shrunken the fold below limit.
|
||||||
srow = math.max(srow - vim.wo.foldminlines, 0)
|
srow = math.max(srow - vim.wo.foldminlines, 0)
|
||||||
compute_folds_levels(bufnr, foldinfo, srow, erow)
|
compute_folds_levels(bufnr, foldinfo, srow, erow, function()
|
||||||
foldinfo:foldupdate(bufnr, srow, erow)
|
foldinfo:foldupdate(bufnr, srow, erow)
|
||||||
end)
|
end)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -400,9 +414,10 @@ api.nvim_create_autocmd('OptionSet', {
|
|||||||
for _, bufnr in ipairs(bufs) do
|
for _, bufnr in ipairs(bufs) do
|
||||||
foldinfos[bufnr] = FoldInfo.new(bufnr)
|
foldinfos[bufnr] = FoldInfo.new(bufnr)
|
||||||
api.nvim_buf_call(bufnr, function()
|
api.nvim_buf_call(bufnr, function()
|
||||||
compute_folds_levels(bufnr, foldinfos[bufnr])
|
compute_folds_levels(bufnr, foldinfos[bufnr], nil, nil, function()
|
||||||
end)
|
|
||||||
foldinfos[bufnr]:foldupdate(bufnr, 0, api.nvim_buf_line_count(bufnr))
|
foldinfos[bufnr]:foldupdate(bufnr, 0, api.nvim_buf_line_count(bufnr))
|
||||||
|
end)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user