Skip to content

Fix #278: find project config in parent directories from relative root #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blopker wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −1
Open

Fix #278: find project config in parent directories from relative root #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion crates/codebook-config/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,16 @@ impl CodebookConfigFile {
fn find_project_config(start_dir: &Path) -> Result<Option<PathBuf>, io::Error> {
let config_files = USER_CONFIG_FILES;

// Resolve to an absolute path before walking up. A relative start dir
// (e.g. the CLI's default ".") would otherwise dead-end immediately,
// since `Path::new(".").parent()` is `""` and `"".parent()` is `None`,
// so we would never ascend into real parent directories (#278). Use
// `absolute` rather than `canonicalize` to avoid resolving symlinks,
// keeping absolute inputs (e.g. an editor's workspace root) unchanged.
let start_dir = std::path::absolute(start_dir).unwrap_or_else(|_| start_dir.to_path_buf());

// Start from the given directory and walk up to root
let mut current_dir = Some(start_dir.to_path_buf());
let mut current_dir = Some(start_dir);

while let Some(dir) = current_dir {
// Try each possible config filename in the current directory
Expand Down
Loading