Use different namespacing. .ps -> .ark and ark_variables -> `po…

…sitron_variables`.
posit-dev · Oct 9, 2024 · a21dc37 · lionel- · Oct 10, 2024 · a21dc37
1 parent 27b7f02
commit a21dc37
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/crates/ark/src/modules/positron/methods.R b/crates/ark/src/modules/positron/methods.R
@@ -6,10 +6,10 @@
 #
 
 ark_methods_table <- new.env(parent = emptyenv())
-ark_methods_table$ark_variable_display_value <- new.env(parent = emptyenv())
-ark_methods_table$ark_variable_display_type <- new.env(parent = emptyenv())
-ark_methods_table$ark_variable_has_children <- new.env(parent = emptyenv())
-ark_methods_table$ark_variable_kind <- new.env(parent = emptyenv())
+ark_methods_table$positron_variable_display_value <- new.env(parent = emptyenv())
+ark_methods_table$positron_variable_display_type <- new.env(parent = emptyenv())
+ark_methods_table$positron_variable_has_children <- new.env(parent = emptyenv())
+ark_methods_table$positron_variable_kind <- new.env(parent = emptyenv())
 lockEnvironment(ark_methods_table, TRUE)
 
 #' Register the methods with the Positron runtime
@@ -18,14 +18,14 @@ lockEnvironment(ark_methods_table, TRUE)
 #' @param class Class name as a character
 #' @param method A method to be registered. Should be a call object.
 #' @export
-.ps.register_ark_method <- function(generic, class, method) {
+.ark.register_ark_method <- function(generic, class, method) {
     stopifnot(
         is_string(generic),
         generic %in% c(
-            "ark_variable_display_value",
-            "ark_variable_display_type",
-            "ark_variable_has_children",
-            "ark_variable_kind"
+            "positron_variable_display_value",
+            "positron_variable_display_type",
+            "positron_variable_has_children",
+            "positron_variable_kind"
         ),
         typeof(class) == "character"
     )

diff --git a/crates/ark/src/variables/methods.rs b/crates/ark/src/variables/methods.rs
@@ -28,16 +28,16 @@ use crate::modules::ARK_ENVS;
 
 #[derive(Debug, PartialEq, EnumString, EnumIter, IntoStaticStr, Display, Eq, Hash, Clone)]
 pub enum ArkGenerics {
-    #[strum(serialize = "ark_variable_display_value")]
+    #[strum(serialize = "positron_variable_display_value")]
     VariableDisplayValue,
 
-    #[strum(serialize = "ark_variable_display_type")]
+    #[strum(serialize = "positron_variable_display_type")]
     VariableDisplayType,
 
-    #[strum(serialize = "ark_variable_has_children")]
+    #[strum(serialize = "positron_variable_has_children")]
     VariableHasChildren,
 
-    #[strum(serialize = "ark_variable_kind")]
+    #[strum(serialize = "positron_variable_kind")]
     VariableKind,
 }
 
@@ -85,7 +85,7 @@ impl ArkGenerics {
 
     pub fn register_method(&self, class: &str, method: RObject) -> anyhow::Result<()> {
         let generic_name: &str = self.into();
-        RFunction::new("", ".ps.register_ark_method")
+        RFunction::new("", ".ark.register_ark_method")
             .add(RObject::try_from(generic_name)?)
             .add(RObject::try_from(class)?)
             .add(method)

diff --git a/crates/ark/src/variables/variable.rs b/crates/ark/src/variables/variable.rs
@@ -1368,20 +1368,20 @@ mod tests {
             // Register the display value method
             harp::parse_eval_global(
                 r#"
-                .ps.register_ark_method("ark_variable_display_value", "foo", function(x, width) {
+                .ark.register_ark_method("positron_variable_display_value", "foo", function(x, width) {
                     # We return a large string and make sure it gets truncated.
                     paste0(rep("a", length.out = 2*width), collapse="")
                 })
 
-                .ps.register_ark_method("ark_variable_display_type", "foo", function(x, include_length) {
+                .ark.register_ark_method("positron_variable_display_type", "foo", function(x, include_length) {
                     paste0("foo (", length(x), ")")
                 })
 
-                .ps.register_ark_method("ark_variable_has_children", "foo", function(x) {
+                .ark.register_ark_method("positron_variable_has_children", "foo", function(x) {
                     FALSE
                 })
 
-                .ps.register_ark_method("ark_variable_kind", "foo", function(x) {
+                .ark.register_ark_method("positron_variable_kind", "foo", function(x) {
                     "other"
                 })