Skip to content

fix(rg): avoid root arg string cloning across candidates #1801

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 2 commits into from
May 28, 2026
Merged

fix(rg): avoid root arg string cloning across candidates #1801

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0998c12
fix(rg): avoid root arg string cloning across candidates
chaliy May 28, 2026
c0e0463
fix(rg): preserve absolute path display in RgDisplayHint
chaliy May 28, 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
62 changes: 41 additions & 21 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 @@ -2914,7 +2914,7 @@ async fn collect_rg_inputs(
let root = RgSearchRoot {
logical: ctx.cwd.to_path_buf(),
actual: ctx.cwd.to_path_buf(),
root_arg: None,
display_hint: RgDisplayHint::None,
};
let files = collect_rg_files_recursive(&*ctx.fs, &[root], opts, ctx.cwd).await;
return Ok(read_rg_files(&*ctx.fs, files, ctx.cwd, opts).await);
Expand All @@ -2936,7 +2936,7 @@ async fn collect_rg_inputs(
roots.push(RgSearchRoot {
logical: path.clone(),
actual: actual_path,
root_arg: Some(p.clone()),
display_hint: RgDisplayHint::from_root_arg(Some(p)),
});
continue;
}
Expand Down Expand Up @@ -3349,21 +3349,16 @@ async fn has_directory_path(
struct RgSearchRoot {
logical: PathBuf,
actual: PathBuf,
/// The original user-supplied path arg (e.g. "." or "src") that produced
/// this root, so `display_path_for` can format relative paths the same
/// way regardless of whether files are processed per-root or globally.
root_arg: Option<String>,
/// Compact display hint derived from user arg; avoids per-file String clones.
display_hint: RgDisplayHint,
}

#[derive(Clone)]
struct RgFileCandidate {
logical: PathBuf,
actual: PathBuf,
metadata: crate::fs::Metadata,
/// Carries the originating root's `root_arg` so a single global pass over
/// candidates from multiple roots can still format `./foo` vs `foo`
/// correctly per-file.
root_arg: Option<String>,
display_hint: RgDisplayHint,
}

struct RgWalkItem {
Expand All @@ -3373,7 +3368,32 @@ struct RgWalkItem {
depth: usize,
rules: Arc<Vec<RgIgnoreRule>>,
ancestors: Vec<PathBuf>,
root_arg: Option<String>,
display_hint: RgDisplayHint,
}

#[derive(Clone, Copy)]
enum RgDisplayHint {
None,
DotSlash,
Absolute,
}

impl RgDisplayHint {
fn from_root_arg(root_arg: Option<&str>) -> Self {
match root_arg {
Some(arg) if arg.starts_with('/') => Self::Absolute,
Some(arg) if arg == "." || arg.starts_with("./") => Self::DotSlash,
_ => Self::None,
}
}

fn root_arg(self) -> Option<&'static str> {
match self {
Self::None => None,
Self::DotSlash => Some("./"),
Self::Absolute => Some("/"),
}
}
}

async fn resolve_rg_symlink_target(
Expand Down Expand Up @@ -3423,7 +3443,7 @@ async fn collect_rg_files_recursive(
depth: 0,
rules: Arc::new(rules),
ancestors: vec![root.actual.clone()],
root_arg: root.root_arg.clone(),
display_hint: root.display_hint,
});
}

Expand Down Expand Up @@ -3469,7 +3489,7 @@ async fn collect_rg_files_recursive(
depth: entry_depth,
rules: Arc::new(rules.clone()),
ancestors: child_ancestors,
root_arg: item.root_arg.clone(),
display_hint: item.display_hint,
});
}
} else if entry_metadata.file_type.is_file()
Expand All @@ -3485,7 +3505,7 @@ async fn collect_rg_files_recursive(
logical: path,
actual: entry_actual_path,
metadata: entry_metadata,
root_arg: item.root_arg.clone(),
display_hint: item.display_hint,
});
}
}
Expand All @@ -3499,7 +3519,7 @@ async fn collect_rg_files_recursive(
logical: item.logical,
actual: item.actual,
metadata: meta,
root_arg: item.root_arg.clone(),
display_hint: item.display_hint,
});
}
}
Expand Down Expand Up @@ -3549,12 +3569,12 @@ async fn collect_rg_file_list(
let root = RgSearchRoot {
logical: cwd.to_path_buf(),
actual: cwd.to_path_buf(),
root_arg: None,
display_hint: RgDisplayHint::None,
};
let files = collect_rg_files_recursive(fs, &[root], opts, cwd).await;
return files
.iter()
.map(|file| display_path_for(&file.logical, cwd, file.root_arg.as_deref(), opts))
.map(|file| display_path_for(&file.logical, cwd, file.display_hint.root_arg(), opts))
.collect();
}

Expand All @@ -3569,7 +3589,7 @@ async fn collect_rg_file_list(
let root = RgSearchRoot {
logical: path.clone(),
actual: actual_path,
root_arg: Some(p.clone()),
display_hint: RgDisplayHint::from_root_arg(Some(p)),
};
let files = collect_rg_files_recursive(fs, &[root], opts, cwd).await;
candidates.extend(files);
Expand All @@ -3581,15 +3601,15 @@ async fn collect_rg_file_list(
logical: path,
actual: actual_path,
metadata: meta,
root_arg: Some(p.clone()),
display_hint: RgDisplayHint::from_root_arg(Some(p)),
});
}
}
sort_rg_candidates(&mut candidates, opts);
result.extend(
candidates
.iter()
.map(|file| display_path_for(&file.logical, cwd, file.root_arg.as_deref(), opts)),
.map(|file| display_path_for(&file.logical, cwd, file.display_hint.root_arg(), opts)),
);
result
}
Expand All @@ -3613,7 +3633,7 @@ async fn read_rg_files(
) -> RgCollectedInputs {
let mut collected = RgCollectedInputs::default();
for file in files {
let display = display_path_for(&file.logical, cwd, file.root_arg.as_deref(), opts);
let display = display_path_for(&file.logical, cwd, file.display_hint.root_arg(), opts);
match read_rg_text_file(fs, &file.actual, cwd, &display, opts).await {
Ok(text) => collected.inputs.push(RgInput::discovered(display, text)),
Err(e) => {
Expand Down
Loading