Import testthat in test files

Author: lionel-

crates/ark/src/lsp/diagnostics.rs

@@ -182,6 +182,22 @@ pub(crate) fn generate_diagnostics(doc: Document, state: WorldState) -> Vec<Diag
         }
     }
 
+    // Simple workaround to include testthat exports in test files. I think the
+    // general principle would be that (a) files in `tests/testthat/` include
+    // `testthat.R` as a preamble (note that people modify that file e.g. to add
+    // more `library()` calls), and (b) all helper files are included in a
+    // test-specific workspace (which is effectively the case currently as we
+    // don't special-case how workspace inclusion works for packages). We might
+    // want to provide a mechanism for test packages to declare this sort of
+    // test files setup.
+    if doc.testthat {
+        if let Some(pkg) = state.library.get("testthat") {
+            for export in &pkg.namespace.exports {
+                context.workspace_symbols.insert(export.clone());
+            }
+        }
+    }
+
     // Add per-environment session symbols
     for scope in state.console_scopes.iter() {
         for name in scope.iter() {

crates/ark/src/lsp/documents.rs

@@ -48,6 +48,10 @@ pub struct Document {
 
     // Configuration of the document, such as indentation settings.
     pub config: DocumentConfig,
+
+    /// Whether the document is a testthat file. This property should not be
+    /// here, it's just a short term stopgap.
+    pub testthat: bool,
 }
 
 impl std::fmt::Debug for Document {
@@ -80,6 +84,7 @@ impl Document {
             version,
             ast,
             config: Default::default(),
+            testthat: false,
         }
     }
 

crates/ark/src/lsp/main_loop.rs

@@ -7,6 +7,7 @@
 
 use std::collections::HashMap;
 use std::future;
+use std::path::Path;
 use std::path::PathBuf;
 use std::pin::Pin;
 use std::sync::atomic::AtomicBool;
@@ -806,7 +807,19 @@ async fn process_diagnostics_batch(batch: Vec<RefreshDiagnosticsTask>) {
             let _span = tracing::info_span!("diagnostics_refresh", uri = %uri).entered();
 
             if let Some(document) = state.documents.get(&uri) {
-                let diagnostics = generate_diagnostics(document.clone(), state.clone());
+                // Special case testthat-specific behaviour. This is a simple
+                // stopgap approach that has some false positives (e.g. when we
+                // work on testthat itself the flag will always be true), but
+                // that shouldn't have much practical impact.
+                let mut doc = document.clone();
+                if Path::new(uri.path())
+                    .components()
+                    .any(|c| c.as_os_str() == "testthat")
+                {
+                    doc.testthat = true;
+                };
+
+                let diagnostics = generate_diagnostics(doc, state.clone());
                 Some(RefreshDiagnosticsResult {
                     uri,
                     diagnostics,