Add workspace tests

Author: lionel-

crates/oak_db/src/tests/file_resolve_at.rs

@@ -1,6 +1,7 @@
 use biome_rowan::TextSize;
 use oak_package_metadata::namespace::Namespace;
 use salsa::Setter;
+use stdext::SortedVec;
 
 use crate::tests::test_db::file_path;
 use crate::tests::test_db::workspace_root;
@@ -10,6 +11,7 @@ use crate::Definition;
 use crate::File;
 use crate::Package;
 use crate::Root;
+use crate::RootKind;
 
 fn make_file(db: &mut TestDb, path: &str, contents: &str) -> File {
     File::new(db, file_path(path), contents.to_string(), None)
@@ -338,21 +340,36 @@ fn install_library_package(
     exports: &[&str],
     files: &[(&str, &str)],
 ) -> (Root, Package) {
-    use oak_package_metadata::namespace::Namespace;
-    use stdext::SortedVec;
-
-    use crate::tests::test_db::library_root;
+    install_package(db, RootKind::Library, name, exports, files)
+}
 
-    let root = library_root(db, &format!("library/{name}"));
+fn install_package(
+    db: &mut TestDb,
+    kind: RootKind,
+    name: &str,
+    exports: &[&str],
+    files: &[(&str, &str)],
+) -> (Root, Package) {
+    let (prefix, version) = match kind {
+        RootKind::Library => ("library", Some("1.0.0".to_string())),
+        RootKind::Workspace => ("workspace", None),
+    };
+    let root = Root::new(
+        db,
+        file_url(&format!("{prefix}/{name}")),
+        kind,
+        vec![],
+        vec![],
+    );
     let namespace = Namespace {
         exports: SortedVec::from_vec(exports.iter().map(|s| s.to_string()).collect()),
         ..Default::default()
     };
     let pkg = Package::new(
         db,
-        file_url(&format!("library/{name}/DESCRIPTION")),
+        file_url(&format!("{prefix}/{name}/DESCRIPTION")),
         name.to_string(),
-        Some("1.0.0".to_string()),
+        version,
         namespace,
         Vec::new(),
         Vec::new(),
@@ -364,7 +381,10 @@ fn install_library_package(
         .collect();
     pkg.set_files(db).to(pkg_files);
     root.set_packages(db).to(vec![pkg]);
-    db.library_roots().set_roots(db).to(vec![root]);
+    match kind {
+        RootKind::Library => db.library_roots().set_roots(db).to(vec![root]),
+        RootKind::Workspace => db.workspace_roots().set_roots(db).to(vec![root]),
+    };
     (root, pkg)
 }
 
@@ -393,6 +413,31 @@ fn test_library_call_makes_pkg_export_resolve() {
     assert_eq!(def.name(&db).text(&db).as_str(), "foo");
 }
 
+#[test]
+fn test_library_call_makes_workspace_pkg_export_resolve() {
+    // Same as `test_library_call_makes_pkg_export_resolve` but `mypkg` lives
+    // in the workspace rather than an installed library. `package_by_name`
+    // walks both workspace and library roots, so the resolution path is the
+    // same for both.
+    let mut db = TestDb::new();
+    let (_root, pkg) = install_package(&mut db, RootKind::Workspace, "mypkg", &["foo"], &[(
+        "workspace/mypkg/R/a.R",
+        "foo <- function() 42\n",
+    )]);
+    let pkg_file = pkg.files(&db)[0];
+
+    // Script is a floating file (no root registration needed for `imports()`
+    // to find workspace packages via `package_by_name`).
+    let source = "library(mypkg)\nfoo\n";
+    let script = make_file(&mut db, "ws/script.R", source);
+
+    let offset = TextSize::from(source.rfind("foo").unwrap() as u32);
+    let def = resolve_one(&db, script, offset);
+
+    assert_eq!(def.file(&db), pkg_file);
+    assert_eq!(def.name(&db).text(&db).as_str(), "foo");
+}
+
 #[test]
 fn test_namespace_import_pkg_makes_export_resolve_in_package_file() {
     // A package file whose NAMESPACE has `import(extpkg)` can resolve

crates/oak_ide/tests/integration/rename.rs

@@ -14,6 +14,7 @@ use salsa::Setter;
 use url::Url;
 
 use crate::support::install_library_package;
+use crate::support::install_workspace_package;
 use crate::support::offset;
 use crate::support::pairs;
 use crate::support::range;
@@ -257,6 +258,24 @@ fn test_rename_refuses_package_export_used_via_library() {
     assert!(err.to_string().contains("installed package"));
 }
 
+#[test]
+fn test_rename_succeeds_for_workspace_package_export_via_library() {
+    // `library(mypkg)` where `mypkg` is a *workspace* package. Unlike an
+    // installed package, workspace files are editable, so rename must succeed
+    // and rewrite both the script use and the definition in the package file.
+    let mut db = OakDatabase::new();
+    let pkg_file =
+        install_workspace_package(&mut db, "mypkg", &["foo"], "a.R", "foo <- function() 42\n");
+    let script = upsert(&mut db, "script.R", "library(mypkg)\nfoo\n");
+
+    let use_start = "library(mypkg)\n".len() as u32;
+    let result = rename(&db, script, offset(use_start), "bar").unwrap();
+    assert_eq!(pairs(&result.ranges), vec![
+        (script, range(use_start, use_start + 3)),
+        (pkg_file, range(0, 3)),
+    ]);
+}
+
 // --- helpers for root / package wiring ---
 
 fn place_in_workspace_scripts(db: &mut OakDatabase, files: Vec<File>) {