Skip to content
Draft
Changes from all commits
Commits
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
70 changes: 49 additions & 21 deletions src/cmds/system/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,8 @@ pub fn run(
);
}

filtered = apply_line_window(&filtered, max_lines, tail_lines, &lang);

let (raw, rtk_output) = if line_numbers {
(
format_with_line_numbers(&content),
format_with_line_numbers(&filtered),
)
} else {
(content.clone(), filtered.clone())
};
let (raw, rtk_output) =
prepare_outputs(&content, &filtered, max_lines, tail_lines, line_numbers, &lang);
let shown = never_worse(&raw, &rtk_output);
print!("{}", shown);
timer.track(
Expand Down Expand Up @@ -116,7 +108,7 @@ pub fn run_stdin(

// Apply filter
let filter = filter::get_filter(level);
let mut filtered = filter.filter(&content, &lang);
let filtered = filter.filter(&content, &lang);

if verbose > 0 {
let original_lines = content.lines().count();
Expand All @@ -132,16 +124,8 @@ pub fn run_stdin(
);
}

filtered = apply_line_window(&filtered, max_lines, tail_lines, &lang);

let (raw, rtk_output) = if line_numbers {
(
format_with_line_numbers(&content),
format_with_line_numbers(&filtered),
)
} else {
(content.clone(), filtered.clone())
};
let (raw, rtk_output) =
prepare_outputs(&content, &filtered, max_lines, tail_lines, line_numbers, &lang);
let shown = never_worse(&raw, &rtk_output);
print!("{}", shown);

Expand All @@ -159,6 +143,27 @@ fn format_with_line_numbers(content: &str) -> String {
out
}

fn prepare_outputs(
content: &str,
filtered: &str,
max_lines: Option<usize>,
tail_lines: Option<usize>,
line_numbers: bool,
lang: &Language,
) -> (String, String) {
let raw_windowed = apply_line_window(content, max_lines, tail_lines, lang);
let filtered_windowed = apply_line_window(filtered, max_lines, tail_lines, lang);

if line_numbers {
(
format_with_line_numbers(&raw_windowed),
format_with_line_numbers(&filtered_windowed),
)
} else {
(raw_windowed, filtered_windowed)
}
}

fn apply_line_window(
content: &str,
max_lines: Option<usize>,
Expand Down Expand Up @@ -236,6 +241,29 @@ fn main() {{
assert!(output.contains("more lines"));
}

#[test]
fn test_prepare_outputs_max_lines_windows_tracking_baseline() {
let input = "alpha\nbravo\ncharlie\ndelta\n";
let (raw, rtk_output) =
prepare_outputs(input, input, Some(2), None, false, &Language::Unknown);

assert_eq!(raw, rtk_output);
assert!(raw.starts_with("alpha\n"));
assert!(raw.contains("more lines"));
assert!(!raw.contains("bravo"));
assert!(!raw.contains("charlie"));
}

#[test]
fn test_prepare_outputs_tail_lines_windows_tracking_baseline() {
let input = "alpha\nbravo\ncharlie\ndelta\n";
let (raw, rtk_output) =
prepare_outputs(input, input, None, Some(2), false, &Language::Unknown);

assert_eq!(raw, "charlie\ndelta\n");
assert_eq!(rtk_output, raw);
}

fn rtk_bin() -> std::path::PathBuf {
std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("target")
Expand Down