suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: YAML formatting issues with injections

pull/12759/head
Nikita Revenco 2025-02-03 16:07:14 +00:00 committed by Nik Revenco
parent 4bb33459fa
commit 5b30bfe36e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helix-term/src/commands/typed.rs
View File

@ -1645,7 +1645,7 @@ fn tree_sitter_injections(
while let Some((range, language_name)) = ranges.next() { while let Some((range, language_name)) = ranges.next() {
while let Some((prev_start, prev_end)) = stack.last() { while let Some((prev_start, prev_end)) = stack.last() {
let is_contained = range.end_byte <= *prev_end && range.start_byte >= *prev_start; let is_contained = range.end_byte < *prev_end && range.start_byte > *prev_start;
if is_contained { if is_contained {
break; break;
} }
@ -1658,7 +1658,7 @@ fn tree_sitter_injections(
format!("[0, {}]", char_count) format!("[0, {}]", char_count)
}; };
let indent = stack.len() * 2; let indent = stack.len() * 4;
let indent = format!("{:indent$}", ""); let indent = format!("{:indent$}", "");
let next_is_contained = ranges.peek().as_ref().is_some_and(|(next, _)| { let next_is_contained = ranges.peek().as_ref().is_some_and(|(next, _)| {
@ -1671,9 +1671,15 @@ fn tree_sitter_injections(
"".into() "".into()
}; };
let dash = if !indent.is_empty() {
format!("{}- ", &indent)
} else {
"- ".into()
};
writeln!( writeln!(
contents, contents,
"{indent}- language: {language_name} "{dash}language: {language_name}
{indent} range: {language_range}{children}", {indent} range: {language_range}{children}",
)?; )?;