mirror of
https://github.com/pchuan98/codex.git
synced 2026-07-01 00:31:56 +08:00
b77fe8fefe
## Why Once the repo-local lint exists, `codex-rs` needs to follow the checked-in convention and CI needs to keep it from drifting. This commit applies the fallback `/*param*/` style consistently across existing positional literal call sites without changing those APIs. The longer-term preference is still to avoid APIs that require comments by choosing clearer parameter types and call shapes. This PR is intentionally the mechanical follow-through for the places where the existing signatures stay in place. After rebasing onto newer `main`, the rollout also had to cover newly introduced `tui_app_server` call sites. That made it clear the first cut of the CI job was too expensive for the common path: it was spending almost as much time installing `cargo-dylint` and re-testing the lint crate as a representative test job spends running product tests. The CI update keeps the full workspace enforcement but trims that extra overhead from ordinary `codex-rs` PRs. ## What changed - keep a dedicated `argument_comment_lint` job in `rust-ci` - mechanically annotate remaining opaque positional literals across `codex-rs` with exact `/*param*/` comments, including the rebased `tui_app_server` call sites that now fall under the lint - keep the checked-in style aligned with the lint policy by using `/*param*/` and leaving string and char literals uncommented - cache `cargo-dylint`, `dylint-link`, and the relevant Cargo registry/git metadata in the lint job - split changed-path detection so the lint crate's own `cargo test` step runs only when `tools/argument-comment-lint/*` or `rust-ci.yml` changes - continue to run the repo wrapper over the `codex-rs` workspace, so product-code enforcement is unchanged Most of the code changes in this commit are intentionally mechanical comment rewrites or insertions driven by the lint itself. ## Verification - `./tools/argument-comment-lint/run.sh --workspace` - `cargo test -p codex-tui-app-server -p codex-tui` - parsed `.github/workflows/rust-ci.yml` locally with PyYAML --- * -> #14652 * #14651
83 lines
2.8 KiB
Rust
83 lines
2.8 KiB
Rust
use crate::protocol::ReviewFinding;
|
|
use crate::protocol::ReviewOutputEvent;
|
|
|
|
// Note: We keep this module UI-agnostic. It returns plain strings that
|
|
// higher layers (e.g., TUI) may style as needed.
|
|
|
|
fn format_location(item: &ReviewFinding) -> String {
|
|
let path = item.code_location.absolute_file_path.display();
|
|
let start = item.code_location.line_range.start;
|
|
let end = item.code_location.line_range.end;
|
|
format!("{path}:{start}-{end}")
|
|
}
|
|
|
|
const REVIEW_FALLBACK_MESSAGE: &str = "Reviewer failed to output a response.";
|
|
|
|
/// Format a full review findings block as plain text lines.
|
|
///
|
|
/// - When `selection` is `Some`, each item line includes a checkbox marker:
|
|
/// "[x]" for selected items and "[ ]" for unselected. Missing indices
|
|
/// default to selected.
|
|
/// - When `selection` is `None`, the marker is omitted and a simple bullet is
|
|
/// rendered ("- Title — path:start-end").
|
|
pub fn format_review_findings_block(
|
|
findings: &[ReviewFinding],
|
|
selection: Option<&[bool]>,
|
|
) -> String {
|
|
let mut lines: Vec<String> = Vec::new();
|
|
lines.push(String::new());
|
|
|
|
// Header
|
|
if findings.len() > 1 {
|
|
lines.push("Full review comments:".to_string());
|
|
} else {
|
|
lines.push("Review comment:".to_string());
|
|
}
|
|
|
|
for (idx, item) in findings.iter().enumerate() {
|
|
lines.push(String::new());
|
|
|
|
let title = &item.title;
|
|
let location = format_location(item);
|
|
|
|
if let Some(flags) = selection {
|
|
// Default to selected if index is out of bounds.
|
|
let checked = flags.get(idx).copied().unwrap_or(true);
|
|
let marker = if checked { "[x]" } else { "[ ]" };
|
|
lines.push(format!("- {marker} {title} — {location}"));
|
|
} else {
|
|
lines.push(format!("- {title} — {location}"));
|
|
}
|
|
|
|
for body_line in item.body.lines() {
|
|
lines.push(format!(" {body_line}"));
|
|
}
|
|
}
|
|
|
|
lines.join("\n")
|
|
}
|
|
|
|
/// Render a human-readable review summary suitable for a user-facing message.
|
|
///
|
|
/// Returns either the explanation, the formatted findings block, or both
|
|
/// separated by a blank line. If neither is present, emits a fallback message.
|
|
pub fn render_review_output_text(output: &ReviewOutputEvent) -> String {
|
|
let mut sections = Vec::new();
|
|
let explanation = output.overall_explanation.trim();
|
|
if !explanation.is_empty() {
|
|
sections.push(explanation.to_string());
|
|
}
|
|
if !output.findings.is_empty() {
|
|
let findings = format_review_findings_block(&output.findings, /*selection*/ None);
|
|
let trimmed = findings.trim();
|
|
if !trimmed.is_empty() {
|
|
sections.push(trimmed.to_string());
|
|
}
|
|
}
|
|
if sections.is_empty() {
|
|
REVIEW_FALLBACK_MESSAGE.to_string()
|
|
} else {
|
|
sections.join("\n\n")
|
|
}
|
|
}
|