Merge pull request michaelb#153 from michaelb/dev

Dev

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.2.2
+- Run multiple code blocs at one in markup languages
+- Fix multiline display for nvim-notify
+
 ## v1.2.1
 - F# support
 - Fix multiline display in floating windows

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Yeah cool but what _code_ goes inside?
 ---
 I just finished some changes, how do I test my code quickly?
 
--> compile `cargo build --release` and run `nvim --cmd "set rtp+=. -u NONE <testfile>` from the sniprun project root.
+-> compile `cargo build --release` and run `nvim --cmd "set rtp+=. -u NONE <testfile>` from the sniprun project root. You may want to remove the 'release' sniprun with your plugin manager in case your runtimepath (rtp) still loads up the release version instead of your development version.
 
 ---
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sniprun"
-version = "1.2.1"
+version = "1.2.2"
 authors = ["michaelb <[email protected]>"]
 edition = "2018"
 

ressources/api.md

@@ -10,3 +10,6 @@ require'sniprun'.setup({
 })
 ```
 ![](visual_assets/api.png)
+
+
+Changing the contents of the buffer will generally not interfere with sniprun with the exception of running multiple code blocs in a markup language (such as markdown or orgmode), because sniprun gets the list of the positions of the code blocs once, before running & displaying once per code bloc

src/display.rs

@@ -92,11 +92,12 @@ pub fn display_nvim_notify(
     let res = match message {
         Ok(result) => nvim.lock().unwrap().command(&format!(
             "lua require\"sniprun.display\".display_nvim_notify(\"{}\", true)",
-            no_output_wrap(result, data, &DisplayType::Terminal),
+            no_output_wrap(result, data, &DisplayType::NvimNotify).replace("\n", "\\\n"),
         )),
         Err(result) => nvim.lock().unwrap().command(&format!(
             "lua require\"sniprun.display\".display_nvim_notify(\"{}\", false)",
-            no_output_wrap(&result.to_string(), data, &DisplayType::Terminal),
+            no_output_wrap(&result.to_string(), data, &DisplayType::NvimNotify)
+                .replace("\n", "\\\n"),
         )),
     };
     info!("display notify res = {:?}", res);
@@ -112,14 +113,14 @@ pub fn send_api(
             let mut nvim_instance = nvim.lock().unwrap();
             nvim_instance.command(&format!(
                 "lua require\"sniprun.display\".send_api(\"{}\", true)",
-                no_output_wrap(result, data, &DisplayType::Terminal),
+                no_output_wrap(result, data, &DisplayType::Api).replace("\n", "\\\n"),
             ))
         }
         Err(result) => {
             let mut nvim_instance = nvim.lock().unwrap();
             nvim_instance.command(&format!(
                 "lua require\"sniprun.display\".send_api(\"{}\", false)",
-                no_output_wrap(&result.to_string(), data, &DisplayType::Terminal),
+                no_output_wrap(&result.to_string(), data, &DisplayType::Api).replace("\n", "\\\n"),
             ))
         }
     };
@@ -136,6 +137,7 @@ pub fn display_virtual_text(
     data: &DataHolder,
     is_ok: bool,
 ) {
+    info!("range is : {:?}", data.range);
     let namespace_id = nvim.lock().unwrap().create_namespace("sniprun").unwrap();
     if is_ok != result.is_ok() {
         if let Err(SniprunError::InterpreterLimitationError(_)) = result {

src/error.rs

@@ -42,4 +42,9 @@ pub enum SniprunError {
     ///custom error for advanced interpreters, the error will be displayed as-is
     #[error("{0}")]
     CustomError(String),
+
+    /// Divide one sniprun into many. Useful for markup language, when several
+    /// code blocs are to be run from 1 'sniprun' command
+    #[error("")]
+    ReRunRanges(Vec<(usize, usize)>),
 }