Actually cleaned up implementation this time

Now it's perfectly testable and isn't a massive pile of spaghetti
sharkdp · Dec 4, 2024 · ff33886 · ff33886
1 parent e2163b4
commit ff33886
Show file tree

Hide file tree

Showing 2 changed files with 342 additions and 312 deletions.
diff --git a/numbat-cli/src/main.rs b/numbat-cli/src/main.rs
@@ -370,16 +370,22 @@ impl Cli {
 
                     rl.add_history_entry(&line)?;
 
-                    match cmd_runner.try_run_line(
+                    match cmd_runner.run_command(
                         &line,
                         CommandContext {
                             ctx: self.context.lock().unwrap(),
                             editor: rl,
                         },
                     ) {
-                        CommandControlFlow::Continue => continue,
-                        CommandControlFlow::Return => return Ok(()),
-                        CommandControlFlow::NotACommand => {}
+                        Ok(cf) => match cf {
+                            CommandControlFlow::Continue => continue,
+                            CommandControlFlow::Return => return Ok(()),
+                            CommandControlFlow::NotACommand => {}
+                        },
+                        Err(err) => {
+                            self.context.lock().unwrap().print_diagnostic(*err);
+                            continue;
+                        }
                     }
 
                     let ParseEvaluationOutcome {