From dadc3548477d6c5d583c0cb4ab0e3a0eb2e4cc03 Mon Sep 17 00:00:00 2001
From: Fernando Herrera <fernando.j.herrera@gmail.com>
Date: Sat, 25 Sep 2021 16:58:50 +0100
Subject: [PATCH] move print to function

---
 src/main.rs | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index f98195f999..9f0a43f5d5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@ use nu_parser::parse;
 use nu_protocol::{
     ast::Call,
     engine::{EngineState, EvaluationContext, StateWorkingSet},
-    Value,
+    ShellError, Value,
 };
 use reedline::DefaultCompletionActionHandler;
 
@@ -128,28 +128,7 @@ fn main() -> Result<()> {
                     };
 
                     match eval_block(&state, &block, Value::nothing()) {
-                        Ok(value) => {
-                            // If the table function is in the declarations, then we can use it
-                            // to create the table value that will be printed in the terminal
-                            let engine_state = engine_state.borrow();
-                            let output = match engine_state.find_decl("table".as_bytes()) {
-                                Some(decl_id) => {
-                                    let table = engine_state.get_decl(decl_id).run(
-                                        &state,
-                                        &Call::new(),
-                                        value,
-                                    )?;
-                                    table.into_string()
-                                }
-                                None => value.into_string(),
-                            };
-                            let stdout = std::io::stdout();
-
-                            match stdout.lock().write_all(output.as_bytes()) {
-                                Ok(_) => (),
-                                Err(err) => eprintln!("{}", err),
-                            };
-                        }
+                        Ok(value) => print_value(value, &state)?,
                         Err(err) => {
                             let engine_state = engine_state.borrow();
                             let working_set = StateWorkingSet::new(&*engine_state);
@@ -179,3 +158,26 @@ fn main() -> Result<()> {
         Ok(())
     }
 }
+
+fn print_value(value: Value, state: &EvaluationContext) -> Result<(), ShellError> {
+    // If the table function is in the declarations, then we can use it
+    // to create the table value that will be printed in the terminal
+    let engine_state = state.engine_state.borrow();
+    let output = match engine_state.find_decl("table".as_bytes()) {
+        Some(decl_id) => {
+            let table = engine_state
+                .get_decl(decl_id)
+                .run(&state, &Call::new(), value)?;
+            table.into_string()
+        }
+        None => value.into_string(),
+    };
+    let stdout = std::io::stdout();
+
+    match stdout.lock().write_all(output.as_bytes()) {
+        Ok(_) => (),
+        Err(err) => eprintln!("{}", err),
+    };
+
+    Ok(())
+}