Skip to content

feat(rg): accept diagnostic controls #1678

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
chaliy merged 1 commit into from
May 22, 2026
Merged

feat(rg): accept diagnostic controls #1678

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
59 changes: 59 additions & 0 deletions crates/bashkit/src/builtins/rg/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,12 @@ impl RgOptions {
opts.messages = false;
} else if p.flag("--messages") {
opts.messages = true;
} else if p.flag_any(&["--debug", "--trace", "--no-ignore-messages"]) {
// no-op: these flags only affect real rg's diagnostic stderr.
} else if long_value(&mut p, "--hostname-bin")?.is_some() {
// no-op: hyperlink hostname discovery is not modeled.
} else if long_value(&mut p, "--hyperlink-format")?.is_some() {
// no-op: bashkit rg does not emit terminal hyperlinks.
} else if p.flag_any(&[
"--no-config",
"--line-buffered",
Expand Down Expand Up @@ -2643,6 +2649,14 @@ impl Builtin for Rg {
" --max-depth NUM\tlimit recursive directory depth\n",
" -d, --max-depth NUM\tlimit recursive directory depth\n --maxdepth NUM\talias for --max-depth\n",
);
let help_text = help_text.replace(
" --no-messages\tsuppress file read diagnostics\n",
" --no-messages\tsuppress file read diagnostics\n --no-ignore-messages\tsuppress ignore parse diagnostics (no-op)\n --debug\tshow debug diagnostics (no-op)\n --trace\tshow trace diagnostics (no-op)\n",
);
let help_text = help_text.replace(
" --colors SPEC\tconfigure colors (no-op)\n",
" --colors SPEC\tconfigure colors (no-op)\n --hostname-bin COMMAND\tcommand for hyperlink hostname discovery (no-op)\n --hyperlink-format FORMAT\tconfigure hyperlink output (no-op)\n",
);
let help_text = help_text.replace(
" --context-separator SEP\tset context group separator\n",
" --context-separator SEP\tset context group separator\n --no-context-separator\tdisable context group separators\n",
Expand Down Expand Up @@ -5454,6 +5468,46 @@ mod tests {
cwd: "/",
output: RgDiffOutput::Exact,
},
RgDiffCase {
name: "debug keeps stdout",
args: &["--debug", "needle", "proj/a.txt"],
stdin: None,
files: DIFF_BASIC_FILES,
cwd: "/",
output: RgDiffOutput::Exact,
},
RgDiffCase {
name: "trace keeps stdout",
args: &["--trace", "needle", "proj/a.txt"],
stdin: None,
files: DIFF_BASIC_FILES,
cwd: "/",
output: RgDiffOutput::Exact,
},
RgDiffCase {
name: "no ignore messages accepted",
args: &["--no-ignore-messages", "needle", "proj/a.txt"],
stdin: None,
files: DIFF_BASIC_FILES,
cwd: "/",
output: RgDiffOutput::Exact,
},
RgDiffCase {
name: "hyperlink format none accepted",
args: &["--hyperlink-format=none", "needle", "proj/a.txt"],
stdin: None,
files: DIFF_BASIC_FILES,
cwd: "/",
output: RgDiffOutput::Exact,
},
RgDiffCase {
name: "hostname bin accepted",
args: &["--hostname-bin", "hostname", "needle", "proj/a.txt"],
stdin: None,
files: DIFF_BASIC_FILES,
cwd: "/",
output: RgDiffOutput::Exact,
},
RgDiffCase {
name: "missing file keeps stdout and exits 2",
args: &["needle", "proj/a.txt", "proj/missing.txt"],
Expand Down Expand Up @@ -5856,6 +5910,11 @@ mod tests {
assert!(long_help.stdout.contains("--pre COMMAND"));
assert!(long_help.stdout.contains("--pre-glob"));
assert!(long_help.stdout.contains("--no-pre"));
assert!(long_help.stdout.contains("--no-ignore-messages"));
assert!(long_help.stdout.contains("--debug"));
assert!(long_help.stdout.contains("--trace"));
assert!(long_help.stdout.contains("--hostname-bin"));
assert!(long_help.stdout.contains("--hyperlink-format"));
assert!(long_help.stdout.contains("--no-ignore-files"));
assert!(long_help.stdout.contains("--ignore-file-case-insensitive"));
assert!(long_help.stdout.contains("--ignore-dot"));
Expand Down
Loading