Allow indenting by pressing tab

coolreader18 · coolreader18 · commit e7a6b79023be · 2019-10-08T21:32:02.000-05:00
diff --git a/src/shell.rs b/src/shell.rs
@@ -106,6 +106,7 @@ impl<'vm> RustylineReadline<'vm> {
         let mut repl = Editor::with_config(
             Config::builder()
                 .completion_type(CompletionType::List)
+                .tab_stop(4)
                 .build(),
         );
         repl.set_helper(Some(ShellHelper::new(vm, scope)));
diff --git a/src/shell/rustyline_helper.rs b/src/shell/rustyline_helper.rs
@@ -155,7 +155,11 @@ impl Completer for ShellHelper<'_> {
         if pos != line.len() {
             return Ok((0, vec![]));
         }
-        Ok(self.complete_opt(line).unwrap_or((0, vec![])))
+        Ok(self
+            .complete_opt(line)
+            // as far as I can tell, there's no better way to do both completion
+            // and indentation (or even just indentation)
+            .unwrap_or_else(|| (line.len(), vec!["    ".to_string()])))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,11 @@ impl Completer for ShellHelper<'_> {`
`155`	`155`	`if pos != line.len() {`
`156`	`156`	`return Ok((0, vec![]));`
`157`	`157`	`}`
`158`		`- Ok(self.complete_opt(line).unwrap_or((0, vec![])))`
	`158`	`+ Ok(self`
	`159`	`+ .complete_opt(line)`
	`160`	`+ // as far as I can tell, there's no better way to do both completion`
	`161`	`+ // and indentation (or even just indentation)`
	`162`	`+ .unwrap_or_else(\|\| (line.len(), vec![" ".to_string()])))`
`159`	`163`	`}`
`160`	`164`	`}`
`161`	`165`