helix-editor/helix
1
1
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-10 10:35:16 +03:00
Code Issues Projects Releases Wiki Activity

Fix issues with "enum A {|}" <Enter> indent calculation.

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-04-07 16:39:13 +09:00
parent 4103349be1
commit 63e602bda6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,8 +106,11 @@ fn calculate_indentation(node: Option<Node>, newline: bool) -> usize {
let parent_kind = parent.kind();
let start = parent.start_position().row;
// println!(
// "name: {}\tparent: {}\trange:\t{} {}\tfirst={:?}\tlast={:?} start={} prev={}",
// detect deeply nested indents in the same line
let starts_same_line = start == prev_start;
// log::error!(
// "name: {}\tparent: {}\trange:\t{} {}\tfirst={:?}\tlast={:?} start={} prev={} same_line={}",
// node.kind(),
// parent.kind(),
// node.range().start_point,
@ -116,14 +119,11 @@ fn calculate_indentation(node: Option<Node>, newline: bool) -> usize {
// node.next_sibling().is_none(),
// node.start_position(),
// prev_start,
// starts_same_line
// );
// detect deeply nested indents in the same line
let starts_same_line = start == prev_start;
if outdent.contains(&node.kind()) {
if outdent.contains(&node.kind()) && !starts_same_line {
// we outdent by skipping the rules for the current level and jumping up
// println!("skipping..");
// node = parent;
increment -= 1;
// continue;