mirror/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-11-10 10:34:45 +01:00
Code Issues

Fix precedence order of @align captures in indent computation (#8659)

Browse Source 
precedence when multiple occur on the same line in an indent query.
This commit is contained in:
Triton171 2023-10-29 17:48:58 +01:00 committed by GitHub
parent f992c3b597
commit ef0c31db02
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helix-core/src/indent.rs
View File

@ -271,7 +271,9 @@ impl Indentation {
} }
/// Add an indent capture to this indent. /// 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) { fn add_capture(&mut self, added: IndentCaptureType) {
match added { match added {
IndentCaptureType::Indent => { IndentCaptureType::Indent => {
@ -295,7 +297,9 @@ impl Indentation {
self.outdent = 0; self.outdent = 0;
} }
IndentCaptureType::Align(align) => { IndentCaptureType::Align(align) => {
self.align = Some(align); if self.align.is_none() {
self.align = Some(align);
}
} }
} }
} }