From 05832f90cbff18a8d8f0ccb6680cd74e19c75378 Mon Sep 17 00:00:00 2001 From: Triton171 Date: Thu, 11 Aug 2022 10:56:19 +0200 Subject: [PATCH] Fix a bug that caused the indent for the line below to also be added in rare cases at the beginning of a file. --- helix-core/src/indent.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs index df69eb73e..97fe00cde 100644 --- a/helix-core/src/indent.rs +++ b/helix-core/src/indent.rs @@ -662,7 +662,13 @@ pub fn treesitter_indent_for_pos( node = parent; first_in_line.pop(); } else { - result.add_line(&indent_for_line_below); + // Only add the indentation for the line below if that line + // is not after the line that the indentation is calculated for. + if (node.start_position().row < line) + || (new_line && node.start_position().row == line && node.start_byte() < byte_pos) + { + result.add_line(&indent_for_line_below); + } result.add_line(&indent_for_line); break; }