Give precedence to namespace of debugged function

Author: lionel-

crates/ark/src/interface.rs

@@ -453,7 +453,7 @@ impl RMain {
             // Namespaces of future loaded packages will be populated on load.
             // (after r_task initialization)
             if do_resource_namespaces() {
-                if let Err(err) = resource_loaded_namespaces() {
+                if let Err(err) = resource_loaded_namespaces(None) {
                     log::error!("Can't populate srcrefs for loaded packages: {err:?}");
                 }
             }

crates/ark/src/modules/positron/srcref.R

@@ -46,33 +46,40 @@ zap_srcref <- function(x) {
 }
 
 new_ark_debug <- function(fn) {
-  # Signature of `debug()`:
-  # function(fun, text = "", condition = NULL, signature = NULL)
-
-  body(fn) <- bquote({
-    local({
-        # Don't do anything if user has explicitly disabled namespace resourcing
-        if (!.ps.internal(do_resource_namespaces(default = TRUE))) {
-            return() # from local()
-        }
-
-        # Enable namespace resourcing for all future loaded namespaces and
-        # resource already loaded namespaces so we get virtual documents for
-        # step-debugging.
-        options(ark.resource_namespaces = TRUE)
-        .ps.internal(resource_loaded_namespaces())
+    # Signature of `debug()`:
+    # function(fun, text = "", condition = NULL, signature = NULL)
+
+    body(fn) <- bquote({
+        local({
+            if (!.ps.internal(do_resource_namespaces(default = TRUE))) {
+                return() # from local()
+            }
+
+            pkgs <- loadedNamespaces()
+
+            # Give priority to the namespace of the debugged function
+            env <- topenv(environment(fun))
+            if (isNamespace(env)) {
+                pkgs <- unique(c(getNamespaceName(env), pkgs))
+            }
+
+            # Enable namespace resourcing for all future loaded namespaces and
+            # resource already loaded namespaces so we get virtual documents for
+            # step-debugging.
+            options(ark.resource_namespaces = TRUE)
+            .ps.internal(resource_loaded_namespaces(pkgs))
+        })
+
+        .(body(fn))
     })
 
-    .(body(fn))
-  })
-
-  fn
+    fn
 }
 
 do_resource_namespaces <- function(default) {
     getOption("ark.resource_namespaces", default = default)
 }
 
-resource_loaded_namespaces <- function() {
-    .ps.Call("ps_resource_loaded_namespaces")
+resource_loaded_namespaces <- function(pkgs) {
+    .ps.Call("ps_resource_loaded_namespaces", pkgs)
 }

crates/ark/src/srcref.rs

@@ -16,24 +16,32 @@ use crate::variables::variable::is_binding_fancy;
 use crate::variables::variable::plain_binding_force_with_rollback;
 
 #[tracing::instrument(level = "trace")]
-pub(crate) fn resource_loaded_namespaces() -> anyhow::Result<()> {
-    let loaded = RFunction::new("base", "loadedNamespaces").call()?;
-    let loaded: Vec<String> = loaded.try_into()?;
-
-    for pkg in loaded.into_iter() {
-        r_task::spawn_idle(|| async move {
+pub(crate) fn resource_loaded_namespaces(pkgs: Option<Vec<String>>) -> anyhow::Result<()> {
+    let pkgs = match pkgs {
+        Some(inner) => inner,
+        None => {
+            let loaded = RFunction::new("base", "loadedNamespaces").call()?;
+            let loaded: Vec<String> = loaded.try_into()?;
+            loaded
+        },
+    };
+
+    // Generate only one task and loop inside it to preserve the order of `pkgs`
+    r_task::spawn_idle(|| async move {
+        for pkg in pkgs.into_iter() {
             if let Err(err) = ns_populate_srcref(pkg.clone()).await {
                 log::error!("Can't populate srcrefs for `{pkg}`: {err:?}");
             }
-        });
-    }
+        }
+    });
 
     Ok(())
 }
 
 #[harp::register]
-unsafe extern "C" fn ps_resource_loaded_namespaces() -> anyhow::Result<SEXP> {
-    resource_loaded_namespaces()?;
+unsafe extern "C" fn ps_resource_loaded_namespaces(pkgs: SEXP) -> anyhow::Result<SEXP> {
+    let pkgs: Vec<String> = RObject::view(pkgs).try_into()?;
+    resource_loaded_namespaces(Some(pkgs))?;
     Ok(harp::r_null())
 }