Skip to content
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

Jump to bottom

fix: --watch short arg detection #7189

Merged
merged 1 commit into from
Feb 20, 2024
Merged

fix: --watch short arg detection #7189

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
9 changes: 6 additions & 3 deletions crates/forge/bin/cmd/watch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ fn watch_command(mut args: Vec<String>) -> Command {
fn cmd_args(num: usize) -> Vec<String> {
clean_cmd_args(num, std::env::args().collect())
}

#[instrument(level = "debug", ret)]
fn clean_cmd_args(num: usize, mut cmd_args: Vec<String>) -> Vec<String> {
if let Some(pos) = cmd_args.iter().position(|arg| arg == "--watch" || arg == "-w") {
cmd_args.drain(pos..=(pos + num));
Expand All @@ -274,11 +276,12 @@ fn clean_cmd_args(num: usize, mut cmd_args: Vec<String>) -> Vec<String> {
// this removes any `w` from concatenated short flags
if let Some(pos) = cmd_args.iter().position(|arg| {
fn contains_w_in_short(arg: &str) -> Option<bool> {
let mut iter = arg.chars();
if iter.next()? != '-' {
let mut iter = arg.chars().peekable();
if *iter.peek()? != '-' {
return None
}
if iter.next()? == '-' {
iter.next();
if *iter.peek()? == '-' {
return None
}
Some(iter.any(|c| c == 'w'))
Expand Down
Loading