fix: indent command with spaces

Adjust the number of spaces to align indentation on columns.

Author: sylvainterrien

helix-term/src/commands.rs

@@ -4875,7 +4875,16 @@ fn indent(cx: &mut Context) {
                 return None;
             }
             let pos = doc.text().line_to_char(line);
-            Some((pos, pos, Some(indent.clone())))
+
+            let indent = if let IndentStyle::Spaces(indent_width) = doc.indent_style {
+                let line = doc.text().line(line);
+                let offset = line.first_non_whitespace_char().unwrap_or(0) % indent_width as usize;
+                indent.clone().split_off(offset)
+            } else {
+                indent.clone()
+            };
+
+            Some((pos, pos, Some(indent)))
         }),
     );
     doc.apply(&transaction, view.id);

helix-term/tests/test/commands/insert.rs

@@ -585,7 +585,7 @@ async fn test_jump_undo_redo() -> anyhow::Result<()> {
 }
 
 #[tokio::test(flavor = "multi_thread")]
-async fn test_spaces_alignment_on_insert_tab() -> anyhow::Result<()> {
+async fn test_indent_with_spaces() -> anyhow::Result<()> {
     let tests = vec![
         // at start of line
         (
@@ -615,6 +615,22 @@ async fn test_spaces_alignment_on_insert_tab() -> anyhow::Result<()> {
                 WHERE   #(|condition)#
             "},
         ),
+        // indentation in normal mode
+        (
+            indoc! {"\
+                -- comment
+                #[|SELECT *
+                  FROM table
+                 WHERE condition]#
+            "},
+            "<gt>",
+            indoc! {"\
+                -- comment
+                    #[|SELECT *
+                    FROM table
+                    WHERE condition]#
+            "},
+        ),
     ];
 
     for test in tests {