Skip to content

Commit

Permalink
Fix precedence order of @align captures in indent computation (helix-…
Browse files Browse the repository at this point in the history
…editor#8659)

precedence when multiple occur on the same line in an indent query.
  • Loading branch information
Triton171 authored and mtoohey31 committed Jun 2, 2024
1 parent 51502df commit 0fc2571
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions helix-core/src/indent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,9 @@ impl Indentation {
}

/// Add an indent capture to this indent.
/// All the captures that are added in this way should be on the same line.
/// Only captures that apply to the same line should be added together in this way (otherwise use `add_line`)
/// and the captures should be added starting from the innermost tree-sitter node (currently this only matters
/// if multiple `@align` patterns occur on the same line).
fn add_capture(&mut self, added: IndentCaptureType) {
match added {
IndentCaptureType::Indent => {
Expand All @@ -295,7 +297,9 @@ impl Indentation {
self.outdent = 0;
}
IndentCaptureType::Align(align) => {
self.align = Some(align);
if self.align.is_none() {
self.align = Some(align);
}
}
}
}
Expand Down

0 comments on commit 0fc2571

Please sign in to comment.