fix(fold): don't include whitespace end regions

Some languages that are difficult to parse via Treesitter may
incorrectly include whitespace lines at the end of regions. This can
makes the calculated folds sub-optimal.

To recitfy, use a custom directive (trim), to calculate the range with
the trailing whitespace lines removed. Note this only works if the
region end column is 0.

Also added folds for Make.
This commit is contained in:
Lewis Russell 2022-04-21 10:48:47 +01:00 committed by Lewis Russell
parent 2bc82e814b
commit 2eaf188269
5 changed files with 59 additions and 9 deletions

View file

@ -39,8 +39,13 @@ local folds_levels = tsutils.memoize_by_buf_tick(function(bufnr)
local min_fold_lines = api.nvim_win_get_option(0, "foldminlines")
for _, node in ipairs(matches) do
local start, _, stop, stop_col = node.node:range()
for _, match in ipairs(matches) do
local start, stop, stop_col
if match.metadata and match.metadata.range then
start, _, stop, stop_col = unpack(match.metadata.range)
else
start, _, stop, stop_col = match.node:range()
end
if stop_col == 0 then
stop = stop - 1