TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

wip

Browse source
This commit is contained in:
Blaž Hrastnik 2020-10-15 23:31:37 +09:00
parent 6e658aae1c
commit 16828d322a
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -96,10 +96,8 @@ fn walk(node: Option<Node>) -> usize {
walk(Some(parent)) + increment
}
fn suggested_indent_for_line(state: &State, line_num: usize) -> usize {
fn find_first_non_whitespace_char(state: &State, line_num: usize) -> usize {
let line = state.doc.line(line_num);
let current = indent_level_for_line(line);
let mut start = state.doc.line_to_char(line_num);
// find first non-whitespace char
@ -110,6 +108,14 @@ fn suggested_indent_for_line(state: &State, line_num: usize) -> usize {
}
start += 1;
}
start
}
fn suggested_indent_for_line(state: &State, line_num: usize) -> usize {
let line = state.doc.line(line_num);
let current = indent_level_for_line(line);
let start = find_first_non_whitespace_char(state, line_num);
suggested_indent_for_pos(state, start)
}
@ -126,7 +132,7 @@ pub fn suggested_indent_for_pos(state: &State, pos: usize) -> usize {
indentation
} else {
// TODO: case for non-tree sitter grammars
// TODO: heuristics for non-tree sitter grammars
0
}
}

1
helix-view/src/commands.rs
View file

@ -349,6 +349,7 @@ pub fn open_below(view: &mut View, _count: usize) {
})
.collect();
// TODO: use same logic as insert_newline for indentation
let changes = positions.iter().copied().map(|index|
// generate changes
(index, index, Some(Tendril::from_char('\n'))));