Skip to content

fix: handle rg flag values in parse_command #8891

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
tibo-openai wants to merge 3 commits into
base: main
Choose a base branch
from
+42 −3
Open

fix: handle rg flag values in parse_command #8891

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ffa335
fix: handle rg flag values in parse_command
tibo-openai Jan 8, 2026
7796976
Update parse_command.rs
tibo-openai Jan 8, 2026
79555fa
Merge branch 'main' into tibo/parse-command-rg-flags
tibo-openai Jan 8, 2026
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
45 changes: 42 additions & 3 deletions codex-rs/core/src/parse_command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ mod tests {
ParsedCommand::Search {
cmd: shlex_join(&shlex_split_safe("rg --files -g '!target'")),
query: None,
path: Some("!target".to_string()),
path: None,
},
ParsedCommand::Search {
cmd: shlex_join(&shlex_split_safe("rg -n '^\\[workspace\\]' -n Cargo.toml")),
Expand Down Expand Up @@ -793,6 +793,20 @@ mod tests {
);
}

#[test]
fn rg_skips_glob_flag_values() {
let args = vec_str(&["rg", "-g", "*.rs", "foo", "src"]);
let cmd = shlex_join(&args);
assert_parsed(
&args,
vec![ParsedCommand::Search {
cmd,
query: Some("foo".to_string()),
path: Some("src".to_string()),
}],
);
}

#[test]
fn cat_with_double_dash_and_sed_ranges() {
// cat -- <file> should be treated as a read of that file
Expand Down Expand Up @@ -1498,8 +1512,33 @@ fn summarize_main_tokens(main_cmd: &[String]) -> ParsedCommand {
Some((head, tail)) if head == "rg" => {
let args_no_connector = trim_at_connector(tail);
let has_files_flag = args_no_connector.iter().any(|a| a == "--files");
let non_flags: Vec<&String> = args_no_connector
.iter()
let candidates = skip_flag_values(
&args_no_connector,
&[
"-g",
"--glob",
"--iglob",
"-t",
"--type",
"-T",
"--type-not",
"--type-add",
"--type-clear",
"-m",
"--max-count",
"-A",
"--after-context",
"-B",
"--before-context",
"-C",
"--context",
"--max-columns",
"--max-depth",
"--max-filesize",
],
);
let non_flags: Vec<&String> = candidates
.into_iter()
.filter(|p| !p.starts_with('-'))
.collect();
let (query, path) = if has_files_flag {
Expand Down
Loading