Skip to content

Commit 0a630fe

Browse files
authored
Merge pull request #2289 from rtk-ai/refacto/strip-output-decorators
refacto(cmds): strip decorator noise from filter output
2 parents 98108bf + 16d6599 commit 0a630fe

17 files changed

Lines changed: 21 additions & 72 deletions

src/cmds/cloud/wget_cmd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub fn run_stdout(url: &str, args: &[String], verbose: u8) -> Result<i32> {
7878
total,
7979
format_size(result.stdout.len() as u64)
8080
));
81-
rtk_output.push_str("--- first 10 lines ---\n");
81+
rtk_output.push_str("first 10 lines:\n");
8282
for line in lines.iter().take(10) {
8383
rtk_output.push_str(&format!("{}\n", truncate_line(line, 100)));
8484
}

src/cmds/dotnet/dotnet_cmd.rs

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,6 @@ fn format_dotnet_format_output(
368368
}
369369

370370
let mut output = format!("Format: {} files need formatting", changed_count);
371-
output.push_str("\n---------------------------------------");
372371

373372
const MAX_FORMAT_FILES: usize = CAP_LIST;
374373
for (index, file) in summary
@@ -1056,12 +1055,6 @@ fn format_build_output(summary: &binlog::BuildSummary, _binlog_path: &Path) -> S
10561055
}
10571056
}
10581057

1059-
let sep = if !warnings.is_empty() || !errors.is_empty() {
1060-
"---------------------------------------"
1061-
} else {
1062-
""
1063-
};
1064-
10651058
let verdict = format!(
10661059
"{} dotnet build: {} projects, {} errors, {} warnings ({})",
10671060
status_icon,
@@ -1076,7 +1069,7 @@ fn format_build_output(summary: &binlog::BuildSummary, _binlog_path: &Path) -> S
10761069
// definitive verdict. Mirrors native `dotnet build`, which ends with
10771070
// `Build succeeded.` / `Build FAILED.`. See issue #1574.
10781071
// Warnings before errors: errors survive `| tail -N` immediately above the verdict.
1079-
[warnings, errors, sep.into(), verdict]
1072+
[warnings, errors, verdict]
10801073
.into_iter()
10811074
.filter(|s| !s.is_empty())
10821075
.collect::<Vec<_>>()
@@ -1218,24 +1211,9 @@ fn format_test_output(
12181211
}
12191212
}
12201213

1221-
let sep = if !failed_tests_section.is_empty()
1222-
|| !warnings_section.is_empty()
1223-
|| !errors_section.is_empty()
1224-
{
1225-
"---------------------------------------"
1226-
} else {
1227-
""
1228-
};
1229-
12301214
// Status line emitted last; see format_build_output (issue #1574).
12311215
// Warnings before errors: errors survive `| tail -N` immediately above the verdict.
1232-
[
1233-
failed_tests_section,
1234-
warnings_section,
1235-
errors_section,
1236-
sep.into(),
1237-
header,
1238-
]
1216+
[failed_tests_section, warnings_section, errors_section, header]
12391217
.into_iter()
12401218
.filter(|s| !s.is_empty())
12411219
.collect::<Vec<_>>()
@@ -1311,20 +1289,14 @@ fn format_restore_output(
13111289
}
13121290
}
13131291

1314-
let sep = if !warnings_section.is_empty() || !errors_section.is_empty() {
1315-
"---------------------------------------"
1316-
} else {
1317-
""
1318-
};
1319-
13201292
let verdict = format!(
13211293
"{} dotnet restore: {} projects, {} errors, {} warnings ({})",
13221294
status_icon, summary.restored_projects, summary.errors, summary.warnings, duration
13231295
);
13241296

13251297
// Status line emitted last; see format_build_output (issue #1574).
13261298
// Warnings before errors: errors survive `| tail -N` immediately above the verdict.
1327-
[warnings_section, errors_section, sep.into(), verdict]
1299+
[warnings_section, errors_section, verdict]
13281300
.into_iter()
13291301
.filter(|s| !s.is_empty())
13301302
.collect::<Vec<_>>()

src/cmds/git/git.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,10 @@ fn run_diff(
193193

194194
let mut final_output = result.stdout.clone();
195195
if !diff_result.stdout.is_empty() {
196-
println!("\n--- Changes ---");
196+
println!("\nChanges:");
197197
let compacted = compact_diff(&diff_result.stdout, max_lines.unwrap_or(500));
198198
println!("{}", compacted);
199-
final_output.push_str("\n--- Changes ---\n");
199+
final_output.push_str("\nChanges:\n");
200200
final_output.push_str(&compacted);
201201
}
202202

@@ -305,7 +305,7 @@ fn run_show(
305305
let mut final_output = summary_result.stdout.clone();
306306
if !diff_text.is_empty() {
307307
if verbose > 0 {
308-
println!("\n--- Changes ---");
308+
println!("\nChanges:");
309309
}
310310
let compacted = compact_diff(diff_text, max_lines.unwrap_or(500));
311311
println!("{}", compacted);

src/cmds/go/go_cmd.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@ pub(crate) fn filter_go_test_json(output: &str) -> String {
431431
result.push_str(&format!(", {} skipped", total_skip));
432432
}
433433
result.push_str(&format!(" in {} packages\n", total_packages));
434-
result.push_str("═══════════════════════════════════════\n");
435434

436435
// Show package-level failures first (timeouts, signals, panics).
437436
// Skip packages that already have individual test-level failures — those are displayed
@@ -594,7 +593,6 @@ fn filter_go_build_with_exit(output: &str, exit_code: i32) -> String {
594593

595594
let mut result = String::new();
596595
result.push_str(&format!("Go build: {} errors\n", errors.len()));
597-
result.push_str("═══════════════════════════════════════\n");
598596

599597
const MAX_GO_BUILD_ERRORS: usize = CAP_ERRORS;
600598
for (i, error) in errors.iter().take(MAX_GO_BUILD_ERRORS).enumerate() {
@@ -718,7 +716,6 @@ fn filter_go_vet(output: &str) -> String {
718716

719717
let mut result = String::new();
720718
result.push_str(&format!("Go vet: {} issues\n", issues.len()));
721-
result.push_str("═══════════════════════════════════════\n");
722719

723720
const MAX_GO_VET_ISSUES: usize = CAP_ERRORS;
724721
for (i, issue) in issues.iter().take(MAX_GO_VET_ISSUES).enumerate() {

src/cmds/go/golangci_cmd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,6 @@ pub(crate) fn filter_golangci_json(output: &str, version: u32) -> String {
310310
"golangci-lint: {} issues in {} files\n",
311311
total_issues, total_files
312312
));
313-
result.push_str("═══════════════════════════════════════\n");
314313

315314
// Show top linters
316315
let mut linter_counts: Vec<_> = by_linter.iter().collect();

src/cmds/js/lint_cmd.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ fn filter_eslint_json(output: &str) -> String {
268268
"ESLint: {} errors, {} warnings in {} files\n",
269269
total_errors, total_warnings, total_files
270270
));
271-
result.push_str("═══════════════════════════════════════\n");
272271

273272
// Show top rules
274273
let mut rule_counts: Vec<_> = by_rule.iter().collect();
@@ -394,7 +393,6 @@ fn filter_pylint_json(output: &str) -> String {
394393
result.push('\n');
395394
}
396395

397-
result.push_str("═══════════════════════════════════════\n");
398396

399397
// Show top symbols (rules)
400398
let mut symbol_counts: Vec<_> = by_symbol.iter().collect();
@@ -471,7 +469,6 @@ fn filter_generic_lint(output: &str) -> String {
471469

472470
let mut result = String::new();
473471
result.push_str(&format!("Lint: {} errors, {} warnings\n", errors, warnings));
474-
result.push_str("═══════════════════════════════════════\n");
475472

476473
const MAX_ISSUES: usize = CAP_ERRORS;
477474
for issue in issues.iter().take(MAX_ISSUES) {

src/cmds/js/next_cmd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ fn filter_next_build(output: &str) -> String {
115115
// Build filtered output
116116
let mut result = String::new();
117117
result.push_str("Next.js Build\n");
118-
result.push_str("═══════════════════════════════════════\n");
119118

120119
if already_built && routes_total == 0 {
121120
result.push_str("Already built (using cache)\n\n");

src/cmds/js/prettier_cmd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ pub fn filter_prettier_output(output: &str) -> String {
9494
"Prettier: {} files need formatting\n",
9595
files_to_format.len()
9696
));
97-
result.push_str("═══════════════════════════════════════\n");
9897

9998
const MAX_PRETTIER_FILES: usize = CAP_WARNINGS;
10099
for (i, file) in files_to_format.iter().take(MAX_PRETTIER_FILES).enumerate() {

src/cmds/js/prisma_cmd.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ fn filter_migrate_dev(output: &str) -> String {
277277

278278
if !migration_name.is_empty() {
279279
result.push_str(&format!("Migration: {}\n", migration_name));
280-
result.push_str("═══════════════════════════════════════\n");
281280
}
282281

283282
result.push_str("Changes:\n");

src/cmds/js/tsc_cmd.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl BlockHandler for TscHandler {
8484
}
8585

8686
let mut result = format!(
87-
"═══════════════════════════════════════\nTypeScript: {} errors in {} files\n",
87+
"TypeScript: {} errors in {} files\n",
8888
self.error_count,
8989
self.files.len()
9090
);
@@ -174,7 +174,6 @@ pub(crate) fn filter_tsc_output(output: &str) -> String {
174174
errors.len(),
175175
by_file.len()
176176
));
177-
result.push_str("═══════════════════════════════════════\n");
178177

179178
// Top error codes summary (compact, one line)
180179
let mut code_counts: Vec<_> = by_code.iter().collect();

0 commit comments

Comments
 (0)