Run R tasks on the R thread

Cargo.toml

@@ -1,5 +1,10 @@
 [workspace]
 
+# Was necessary after switching to dev tree-sitter to fix this warning:
+# > some crates are on edition 2021 which defaults to `resolver = "2"`, but
+# > virtual workspaces default to `resolver = "1"`
+resolver = "2"
+
 members = [
     "crates/amalthea",
     "crates/ark",

crates/ark/Cargo.toml

@@ -33,7 +33,7 @@ nix = { version = "0.26.2", features = ["signal"] }
 notify = "6.0.0"
 once_cell = "1.17.1"
 parking_lot = "0.12.1"
-regex = "1.7.1"
+regex = "1.10.0"
 reqwest = { version = "0.11.20", features = ["json"] }
 ropey = "1.6.0"
 rust-embed = "8.0.0"
@@ -43,8 +43,8 @@ serde_json = "1.0.94"
 stdext = { path = "../stdext" }
 tokio = { version = "1.26.0", features = ["full"] }
 tower-lsp = "0.19.0"
-tree-sitter = "0.20.9"
-tree-sitter-r = { git = "https://github.com/r-lib/tree-sitter-r", branch = "next" }
+tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter" }
+tree-sitter-r = { git = "https://github.com/r-lib/tree-sitter-r", branch = "bugfix/update" }
 uuid = "1.3.0"
 url = "2.4.1"
 walkdir = "2"

crates/ark/src/data_viewer/r_data_viewer.rs

@@ -14,7 +14,6 @@ use crossbeam::channel::Sender;
 use harp::exec::RFunction;
 use harp::exec::RFunctionExt;
 use harp::object::RObject;
-use harp::r_lock;
 use harp::utils::r_assert_length;
 use harp::utils::r_is_data_frame;
 use harp::utils::r_is_matrix;
@@ -44,6 +43,7 @@ use crate::data_viewer::message::DataViewerMessageRequest;
 use crate::data_viewer::message::DataViewerMessageResponse;
 use crate::data_viewer::message::DataViewerRowRequest;
 use crate::data_viewer::message::DataViewerRowResponse;
+use crate::r_task;
 
 pub struct RDataViewer {
     title: String,
@@ -195,7 +195,7 @@ impl DataSet {
     }
 
     pub fn from_object(id: String, title: String, object: RObject) -> Result<Self, anyhow::Error> {
-        r_lock! {
+        r_task(|| unsafe {
             let row_count = {
                 if r_is_data_frame(*object) {
                     let row_names = Rf_getAttrib(*object, R_RowNamesSymbol);
@@ -214,10 +214,10 @@ impl DataSet {
             Ok(Self {
                 id: id.clone(),
                 title: title.clone(),
-                columns: columns,
-                row_count: row_count
+                columns,
+                row_count,
             })
-        }
+        })
     }
 
     fn slice_data(&self, start: usize, size: usize) -> Result<Vec<DataColumn>, anyhow::Error> {

crates/ark/src/environment/r_environment.rs

@@ -16,7 +16,6 @@ use harp::environment::Environment;
 use harp::exec::RFunction;
 use harp::exec::RFunctionExt;
 use harp::object::RObject;
-use harp::r_lock;
 use harp::utils::r_assert_type;
 use harp::vector::CharacterVector;
 use harp::vector::Vector;
@@ -40,6 +39,7 @@ use crate::environment::message::EnvironmentMessageUpdate;
 use crate::environment::message::EnvironmentMessageView;
 use crate::environment::variable::EnvironmentVariable;
 use crate::lsp::events::EVENTS;
+use crate::r_task;
 
 /**
  * The R Environment handler provides the server side of Positron's Environment
@@ -218,14 +218,13 @@ impl REnvironment {
     fn refresh(&mut self, request_id: Option<String>) {
         let mut variables: Vec<EnvironmentVariable> = vec![];
 
-        r_lock! {
+        r_task(|| {
             self.update_bindings(self.bindings());
 
             for binding in &self.current_bindings {
                 variables.push(EnvironmentVariable::new(binding));
             }
-
-        }
+        });
 
         // TODO: Avoid serializing the full list of variables if it exceeds a
         // certain threshold
@@ -244,8 +243,7 @@ impl REnvironment {
      */
     fn clear(&mut self, include_hidden_objects: bool, request_id: Option<String>) {
         // try to rm(<env>, list = ls(envir = <env>, all.names = TRUE)))
-        let result: Result<(), harp::error::Error> = r_lock! {
-
+        let result: Result<(), harp::error::Error> = r_task(|| unsafe {
             let mut list = RFunction::new("base", "ls")
                 .param("envir", *self.env)
                 .param("all.names", Rf_ScalarLogical(include_hidden_objects as i32))
@@ -264,7 +262,7 @@ impl REnvironment {
                 .call()?;
 
             Ok(())
-        };
+        });
 
         if let Err(_err) = result {
             error!("Failed to clear the environment");
@@ -281,8 +279,8 @@ impl REnvironment {
      * Clear the environment. Uses rm(envir = <env>, list = ls(<env>, all.names = TRUE))
      */
     fn delete(&mut self, variables: Vec<String>, request_id: Option<String>) {
-        r_lock! {
-            let variables : Vec<&str> = variables.iter().map(|s| s as &str).collect();
+        r_task(|| unsafe {
+            let variables: Vec<&str> = variables.iter().map(|s| s as &str).collect();
 
             let result = RFunction::new("base", "rm")
                 .param("list", CharacterVector::create(variables).cast())
@@ -292,16 +290,15 @@ impl REnvironment {
             if let Err(_) = result {
                 error!("Failed to delete variables from the environment");
             }
-        }
+        });
 
         // and then update
         self.update(request_id);
     }
 
     fn clipboard_format(&mut self, path: &Vec<String>, format: String, request_id: Option<String>) {
-        let clipped = r_lock! {
-            EnvironmentVariable::clip(RObject::view(*self.env), &path, &format)
-        };
+        let clipped =
+            r_task(|| EnvironmentVariable::clip(RObject::view(*self.env), &path, &format));
 
         let msg = match clipped {
             Ok(content) => {
@@ -319,9 +316,7 @@ impl REnvironment {
     }
 
     fn inspect(&mut self, path: &Vec<String>, request_id: Option<String>) {
-        let inspect = r_lock! {
-            EnvironmentVariable::inspect(RObject::view(*self.env), &path)
-        };
+        let inspect = r_task(|| EnvironmentVariable::inspect(RObject::view(*self.env), &path));
         let msg = match inspect {
             Ok(children) => {
                 let length = children.len();
@@ -340,9 +335,8 @@ impl REnvironment {
     }
 
     fn view(&mut self, path: &Vec<String>, request_id: Option<String>) {
-        let data = r_lock! {
-            EnvironmentVariable::resolve_data_object(RObject::view(*self.env), &path)
-        };
+        let data =
+            r_task(|| EnvironmentVariable::resolve_data_object(RObject::view(*self.env), &path));
 
         let msg = match data {
             Ok(data) => {
@@ -386,7 +380,7 @@ impl REnvironment {
         let old_bindings = &self.current_bindings;
         let mut new_bindings = vec![];
 
-        r_lock! {
+        r_task(|| {
             new_bindings = self.bindings();
 
             let mut old_iter = old_bindings.iter();
@@ -396,25 +390,20 @@ impl REnvironment {
             let mut new_next = new_iter.next();
 
             loop {
-
                 match (old_next, new_next) {
                     // nothing more to do
-                    (None, None) => {
-                        break
-                    },
+                    (None, None) => break,
 
                     // No more old, collect last new into added
                     (None, Some(mut new)) => {
                         loop {
-                            assigned.push(
-                                EnvironmentVariable::new(&new)
-                            );
+                            assigned.push(EnvironmentVariable::new(&new));
 
                             match new_iter.next() {
                                 Some(x) => {
                                     new = x;
                                 },
-                                None => break
+                                None => break,
                             };
                         }
                         break;
@@ -429,7 +418,7 @@ impl REnvironment {
                                 Some(x) => {
                                     old = x;
                                 },
-                                None => break
+                                None => break,
                             };
                         }
 
@@ -439,25 +428,21 @@ impl REnvironment {
                     (Some(old), Some(new)) => {
                         if old.name == new.name {
                             if old.value != new.value {
-                                assigned.push(
-                                    EnvironmentVariable::new(&new)
-                                );
+                                assigned.push(EnvironmentVariable::new(&new));
                             }
                             old_next = old_iter.next();
                             new_next = new_iter.next();
                         } else if old.name < new.name {
                             removed.push(old.name.to_string());
                             old_next = old_iter.next();
                         } else {
-                            assigned.push(
-                                EnvironmentVariable::new(&new)
-                            );
+                            assigned.push(EnvironmentVariable::new(&new));
                             new_next = new_iter.next();
                         }
-                    }
+                    },
                 }
             }
-        }
+        });
 
         if assigned.len() > 0 || removed.len() > 0 || request_id.is_some() {
             // only update the bindings (and the version)