git.iko.soy/helix
on master help sign in
wip
16828d3Blaž Hrastnik
helix-core/src/indent.rs+10−4
compare with master
unifiedsplit
@@ -96,10 +96,8 @@ fn walk(node: Option<Node>) -> usize {
96 walk(Some(parent)) + increment
96 walk(Some(parent)) + increment
97}
97}
98
98
99−fn suggested_indent_for_line(state: &State, line_num: usize) -> usize {
99+fn find_first_non_whitespace_char(state: &State, line_num: usize) -> usize {
100 let line = state.doc.line(line_num);
100 let line = state.doc.line(line_num);
101− let current = indent_level_for_line(line);
102−
103 let mut start = state.doc.line_to_char(line_num);
101 let mut start = state.doc.line_to_char(line_num);
104
102
105 // find first non-whitespace char
103 // find first non-whitespace char
@@ -110,6 +108,14 @@ fn suggested_indent_for_line(state: &State, line_num: usize) -> usize {
110 }
108 }
111 start += 1;
109 start += 1;
112 }
110 }
111+ start
112+}
113+
114+fn suggested_indent_for_line(state: &State, line_num: usize) -> usize {
115+ let line = state.doc.line(line_num);
116+ let current = indent_level_for_line(line);
117+
118+ let start = find_first_non_whitespace_char(state, line_num);
113
119
114 suggested_indent_for_pos(state, start)
120 suggested_indent_for_pos(state, start)
115}
121}
@@ -126,7 +132,7 @@ pub fn suggested_indent_for_pos(state: &State, pos: usize) -> usize {
126
132
127 indentation
133 indentation
128 } else {
134 } else {
129− // TODO: case for non-tree sitter grammars
135+ // TODO: heuristics for non-tree sitter grammars
130 0
136 0
131 }
137 }
132}
138}
helix-view/src/commands.rs+1
@@ -349,6 +349,7 @@ pub fn open_below(view: &mut View, _count: usize) {
349 })
349 })
350 .collect();
350 .collect();
351
351
352+ // TODO: use same logic as insert_newline for indentation
352 let changes = positions.iter().copied().map(|index|
353 let changes = positions.iter().copied().map(|index|
353 // generate changes
354 // generate changes
354 (index, index, Some(Tendril::from_char('\n'))));
355 (index, index, Some(Tendril::from_char('\n'))));