fix(treesitter): #trim! range for nodes ending at col 0 #31488

Problem:
char-wise folding for `#trim!` ranges are improperly calculated for nodes that
end at column 0, due to the way `get_node_text` works.

Solution:
Add the blank line that `get_node_text` removes for for nodes ending at column
0. Also properly set column positions when performing linewise trims.
This commit is contained in:
Riley Bruins
2024-12-07 03:01:59 -08:00
committed by GitHub
parent 5c245ec3e9
commit c63e49cce2
2 changed files with 40 additions and 4 deletions

View File

@@ -593,6 +593,11 @@ local directive_handlers = {
local start_row, start_col, end_row, end_col = node:range()
local node_text = vim.split(vim.treesitter.get_node_text(node, bufnr), '\n')
if end_col == 0 then
-- get_node_text() will ignore the last line if the node ends at column 0
node_text[#node_text + 1] = ''
end
local end_idx = #node_text
local start_idx = 1
@@ -600,6 +605,9 @@ local directive_handlers = {
while end_idx > 0 and node_text[end_idx]:find('^%s*$') do
end_idx = end_idx - 1
end_row = end_row - 1
-- set the end position to the last column of the next line, or 0 if we just trimmed the
-- last line
end_col = end_idx > 0 and #node_text[end_idx] or 0
end
end
if trim_end_cols then
@@ -616,6 +624,7 @@ local directive_handlers = {
while start_idx <= end_idx and node_text[start_idx]:find('^%s*$') do
start_idx = start_idx + 1
start_row = start_row + 1
start_col = 0
end
end
if trim_start_cols and node_text[start_idx] then