Merge pull request #108 from michaelb/dev

fix API

API.md

@@ -60,6 +60,8 @@ end
 sa.register_listener(api_listener)
 ```
 
+(You must also enable the 'Api' display option, and in this particular case where things are printed to the command line area, disabling 'Classic' is recommended)
+
 ​
 
 If your function requires to be manually closed (on `SnipClose`), you can register a closer the same way:

CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.2
+- fix issue with API functions & callbacks
+- fix double checkhealt crash issue
+
 ## v1.0.1
 - fix issue when using sniprun with an empty config
 

Cargo.toml

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

lua/sniprun.lua

@@ -27,7 +27,7 @@ M.config_values = {
     -- "LongTempFloatingWindow",
     -- "TempFloatingWindow",
     -- "Terminal",
-    -- "Api,
+    -- "Api",
     -- "NvimNotify"
   },
 
@@ -322,7 +322,7 @@ function M.health()
   local terminate_after = M.job_id == nil
   local path_log_file = os.getenv('HOME').."/.cache/sniprun/sniprun.log"
   local path_log_file_mac = os.getenv('HOME').."/Library/Caches/sniprun/sniprun.log"
-  os.remove(path_log_file)
+  -- os.remove(path_log_file)
 
   -- check if the log is recreated
   M.ping()

lua/sniprun/api.lua

@@ -10,7 +10,7 @@ function M.run_range(range_start, range_end, filetype, config)
   override.filetype = filetype
   local lconfig = config or sniprun.config_values
   lconfig["sniprun_root_dir"] = sniprun_path
-  sniprun.notify('run', range_start, range_end, lconfig, override)
+  sniprun.notify('run', range_start, range_end, lconfig, "", override)
 end
 
 
@@ -20,7 +20,7 @@ function M.run_string(codestring, filetype, config)
   override.filetype = filetype or ""
   local lconfig = config or sniprun.config_values
   lconfig["sniprun_root_dir"] = sniprun_path
-  sniprun.notify('run', 0, 0, lconfig, override)
+  sniprun.notify('run', 0, 0, lconfig, "", override)
 end
 
 

lua/sniprun/display.lua

@@ -138,7 +138,6 @@ function M.send_api(message, ok)
     else
 	d.status = "error"
     end
-
     local listeners = require('sniprun.api').listeners
 
     if type(next(listeners)) == "nil" then

src/display.rs

@@ -1,7 +1,7 @@
 use crate::error::SniprunError;
 use crate::{DataHolder, ReturnMessageType};
 use log::info;
-use neovim_lib::{Neovim, NeovimApi, NeovimApiAsync};
+use neovim_lib::{Neovim, NeovimApi};
 use std::fmt;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
@@ -97,23 +97,27 @@ pub fn send_api(
     nvim: &Arc<Mutex<Neovim>>,
     data: &DataHolder,
 ) {
-    match message {
+    let res = match message {
         Ok(result) => {
             let mut nvim_instance = nvim.lock().unwrap();
-            nvim_instance.command_async(&format!(
+            nvim_instance.command(&format!(
                 "lua require\"sniprun.display\".send_api(\"{}\", true)",
                 no_output_wrap(result, data, &DisplayType::Terminal),
             ))
         }
         Err(result) => {
             let mut nvim_instance = nvim.lock().unwrap();
-            nvim_instance.command_async(&format!(
+            nvim_instance.command(&format!(
                 "lua require\"sniprun.display\".send_api(\"{}\", false)",
                 no_output_wrap(&result.to_string(), data, &DisplayType::Terminal),
             ))
         }
     };
-    info!("!done displyaing notify");
+    if res.is_ok() {
+        info!("done displaying api");
+    } else {
+        info!("failed to display via api");
+    }
 }
 
 pub fn display_virtual_text(

src/lib.rs

@@ -210,7 +210,7 @@ impl EventHandler {
         }
 
         info!("values length: {}", values.len());
-        let cli_args = values[3].as_str().unwrap();
+        let cli_args = values[3].as_str().unwrap_or({info!("cli arguments are not a string");""});
         {
             if !cli_args.is_empty() {
                 self.data.cli_args = cli_args.split(' ').map(|s| s.to_string()).collect();
@@ -366,11 +366,11 @@ impl EventHandler {
     }
 
     pub fn override_data(&mut self, values: Vec<Value>) {
-        if values.len() < 4 {
+        if values.len() < 5 {
             info!("[OVERRIDE] No data to override");
             return;
         }
-        if let Some(override_map) = values[3].as_map() {
+        if let Some(override_map) = values[4].as_map() {
             {
                 if let Some(i) = self.index_from_name("filetype", override_map) {
                     if let Some(filetype_str) = override_map[i].1.as_str() {