Terminal with code history

README.md

@@ -290,6 +290,7 @@ require'sniprun'.setup({
     -- "TempFloatingWindow",      --# display results in a floating window
     -- "LongTempFloatingWindow",  --# same as above, but only long results. To use with VirtualText__
     -- "Terminal",                --# display results in a vertical split
+    -- "TerminalWithCode",        --# display results and code history in a vertical split
     -- "NvimNotify",              --# display with the nvim-notify plugin
     -- "Api"                      --# return output to a programming interface
   },

doc/sniprun.txt

@@ -104,6 +104,7 @@ require'sniprun'.setup({
     -- "TempFloatingWindow",      -- "display results in a floating window
     -- "LongTempFloatingWindow",  -- "same as above, but only long results. To use with VirtualText__
     -- "Terminal"                 -- "display results in a vertical split
+    -- "TerminalWithCode",        --# display results and code history in a vertical split
     -- "NvimNotify",              --# display with the nvim-notify plugin
     -- "Api"                      --# return output to a programming interface
   },

lua/sniprun.lua

@@ -27,6 +27,7 @@ M.config_values = {
     -- "LongTempFloatingWindow",
     -- "TempFloatingWindow",
     -- "Terminal",
+    -- "TerminalWithCode",
     -- "Api",
     -- "NvimNotify"
   },

ressources/display_terminal.md

@@ -29,3 +29,9 @@ EOF
 ![](visual_assets/terminal.png)
 
 
+If you also want the history of the execute code printed to the terminal, then use `"TerminalWithCode"` instead in the 'display' key.
+
+
+
+![](visual_assets/terminalWithCode.png)
+

src/display.rs

@@ -13,6 +13,7 @@ pub enum DisplayType {
     VirtualTextOk,
     VirtualTextErr,
     Terminal,
+    TerminalWithCode,
     LongTempFloatingWindow,
     TempFloatingWindow,
     Api,
@@ -27,6 +28,7 @@ impl FromStr for DisplayType {
             "VirtualTextOk" => Ok(VirtualTextOk),
             "VirtualTextErr" => Ok(VirtualTextErr),
             "Terminal" => Ok(Terminal),
+            "TerminalWithCode" => Ok(TerminalWithCode),
             "LongTempFloatingWindow" => Ok(LongTempFloatingWindow),
             "TempFloatingWindow" => Ok(TempFloatingWindow),
             "Api" => Ok(Api),
@@ -45,6 +47,7 @@ impl fmt::Display for DisplayType {
             DisplayType::VirtualTextOk => "VirtualTextOk",
             DisplayType::VirtualTextErr => "VirtualTextErr",
             DisplayType::Terminal => "Terminal",
+            DisplayType::TerminalWithCode => "TerminalWithCode",
             DisplayType::LongTempFloatingWindow => "LongTempFloatingWindow",
             DisplayType::TempFloatingWindow => "TempFloatingWindow",
             DisplayType::Api => "Api",
@@ -66,6 +69,7 @@ pub fn display(result: Result<String, SniprunError>, nvim: Arc<Mutex<Neovim>>, d
             VirtualTextOk => display_virtual_text(&result, &nvim, data, true),
             VirtualTextErr => display_virtual_text(&result, &nvim, data, false),
             Terminal => display_terminal(&result, &nvim, data),
+            TerminalWithCode => display_terminal_with_code(&result, &nvim, data),
             LongTempFloatingWindow => display_floating_window(&result, &nvim, data, true),
             TempFloatingWindow => display_floating_window(&result, &nvim, data, false),
             Api => send_api(&result, &nvim, data),
@@ -198,14 +202,41 @@ pub fn display_terminal(
     nvim: &Arc<Mutex<Neovim>>,
     data: &DataHolder,
 ) {
+    info!("data_bloc = {}", data.current_bloc);
+    let a = data.current_bloc.lines();
+    info!("length = {}", a.count());
     let res = match message {
         Ok(result) => nvim.lock().unwrap().command(&format!(
             "lua require\"sniprun.display\".write_to_term(\"{}\", true)",
-            no_output_wrap(result, data, &DisplayType::Terminal),
+            no_output_wrap(result, data, &DisplayType::Terminal).replace("\n", "\\\n"),
         )),
         Err(result) => nvim.lock().unwrap().command(&format!(
             "lua require\"sniprun.display\".write_to_term(\"{}\", false)",
-            no_output_wrap(&result.to_string(), data, &DisplayType::Terminal),
+            no_output_wrap(&result.to_string(), data, &DisplayType::Terminal).replace("\n", "\\\n"),
+        )),
+    };
+    info!("display terminal res = {:?}", res);
+}
+
+pub fn display_terminal_with_code(
+    message: &Result<String, SniprunError>,
+    nvim: &Arc<Mutex<Neovim>>,
+    data: &DataHolder,
+) {
+    let res = match message {
+        Ok(result) => nvim.lock().unwrap().command(&format!(
+            "lua require\"sniprun.display\".write_to_term(\"{}\\n{}\", true)",
+            cleanup_and_escape(&data.current_bloc.lines().fold("".to_string(), |cur_bloc, line_in_bloc| {
+                cur_bloc + "> " + line_in_bloc + "\n"
+            })).replace("\n", "\\\n"),
+            no_output_wrap(result, data, &DisplayType::TerminalWithCode).replace("\n", "\\\n"),
+        )),
+        Err(result) => nvim.lock().unwrap().command(&format!(
+            "lua require\"sniprun.display\".write_to_term(\"{}\\n{}\", false)",
+            cleanup_and_escape(&data.current_bloc.lines().fold("".to_string(), |cur_bloc, line_in_bloc| {
+                cur_bloc + "> " + line_in_bloc + "\n"
+            })).replace("\n", "\\\n"),
+            no_output_wrap(&result.to_string(), data, &DisplayType::TerminalWithCode).replace("\n", "\\\n"),
         )),
     };
     info!("display terminal res = {:?}", res);

src/lib.rs

@@ -580,6 +580,7 @@ mod test_main {
         let display_types: Vec<Value> = vec![
             Value::from("Classic"),
             Value::from("Terminal"),
+            Value::from("TerminalWithCode"),
             Value::from("VirtualTextOk"),
             Value::from("VirtualTextErr"),
             Value::from("TempFloatingWindow"),