Skip to content

fix: Prevent panic when passing relative paths to --program-dir #2324

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

Merged
TomAFrench merged 2 commits into from
Aug 15, 2023
Merged

fix: Prevent panic when passing relative paths to --program-dir #2324

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65b36ba
fix: Prevent panic when passing relative paths to `--program-dir`
TomAFrench Aug 15, 2023
2c0c1ec
chore: clippy
TomAFrench Aug 15, 2023
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
7 changes: 6 additions & 1 deletion crates/nargo_cli/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct NargoCli {
#[derive(Args, Clone, Debug)]
pub(crate) struct NargoConfig {
// REMINDER: Also change this flag in the LSP test lens if renamed
#[arg(long, hide=true, global=true, default_value_os_t = std::env::current_dir().unwrap())]
#[arg(long, hide = true, global = true, default_value = "./")]
program_dir: PathBuf,
}

Expand All @@ -64,6 +64,11 @@ enum NargoCommand {
pub(crate) fn start_cli() -> eyre::Result<()> {
let NargoCli { command, mut config } = NargoCli::parse();

// If the provided `program_dir` is relative, make it absolute by joining it to the current directory.
if !config.program_dir.is_absolute() {
config.program_dir = std::env::current_dir().unwrap().join(config.program_dir);
}

// Search through parent directories to find package root if necessary.
if !matches!(command, NargoCommand::New(_) | NargoCommand::Init(_) | NargoCommand::Lsp(_)) {
config.program_dir = find_package_root(&config.program_dir)?;
Expand Down