Resolve cache-dir relative to project root

astral-sh · Oct 14, 2023 · 5b48559 · 5b48559
1 parent ddffadb
commit 5b48559
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/crates/ruff_workspace/src/configuration.rs b/crates/ruff_workspace/src/configuration.rs
@@ -377,7 +377,7 @@ impl Configuration {
                 .cache_dir
                 .map(|dir| {
                     let dir = shellexpand::full(&dir);
-                    dir.map(|dir| PathBuf::from(dir.as_ref()))
+                    dir.map(|dir| fs::normalize_path_to(dir.as_ref(), project_root))
                 })
                 .transpose()
                 .map_err(|e| anyhow!("Invalid `cache-dir` value: {e}"))?,

diff --git a/crates/ruff_workspace/src/resolver.rs b/crates/ruff_workspace/src/resolver.rs
@@ -228,6 +228,8 @@ fn resolve_configuration(
         let project_root = relativity.resolve(&path);
         let configuration = Configuration::from_options(options, &project_root)?;
 
+        println!("project_root: {:?}", project_root);
+
         // If extending, continue to collect.
         next = configuration.extend.as_ref().map(|extend| {
             fs::normalize_path_to(