From 16828d322a13be5b6f9adb680742cdc2570fbf17 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Thu, 15 Oct 2020 23:31:37 +0900
Subject: wip

---
 helix-core/src/indent.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'helix-core')

diff --git a/helix-core/src/indent.rs b/helix-core/src/indent.rs
index c834d8e2..2e1a095e 100644
--- a/helix-core/src/indent.rs
+++ b/helix-core/src/indent.rs
@@ -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
     }
 }
-- 
cgit v1.2.3-70-g09d2