sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print each hunk immediately 

This gives the user output sooner and is very marginally faster
overall too. It's also slightly less code.

Closes #128
html_output
Wilfred Hughes 2022-02-07 21:24:22 +07:00
parent ecb9e90d0a
commit 85f2d7aa4b
3 changed files with 63 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/inline.rs
Unescape Escape View File

@ -9,7 +9,7 @@ use crate::{
};
use colored::*;
pub fn display(
pub fn print(
lhs_src: &str,
rhs_src: &str,
lhs_positions: &[MatchedPos],
@ -18,27 +18,21 @@ pub fn display(
display_path: &str,
lang_name: &str,
background: BackgroundColor,
) -> String {
) {
let lhs_colored = apply_colors(lhs_src, true, background, lhs_positions);
let rhs_colored = apply_colors(rhs_src, false, background, rhs_positions);
let lhs_lines: Vec<_> = lhs_colored.lines().collect();
let rhs_lines: Vec<_> = rhs_colored.lines().collect();
let mut res = String::new();
let opposite_to_lhs = opposite_positions(lhs_positions);
let opposite_to_rhs = opposite_positions(rhs_positions);
for (i, hunk) in hunks.iter().enumerate() {
res.push_str(&style::header(
display_path,
i + 1,
hunks.len(),
lang_name,
background,
));
res.push('\n');
println!(
"{}",
style::header(display_path, i + 1, hunks.len(), lang_name, background)
);
let hunk_lines = hunk.lines.clone();
@ -55,48 +49,42 @@ pub fn display(
for (lhs_line, _) in before_lines {
if let Some(lhs_line) = lhs_line {
res.push_str(&format_line_num(lhs_line));
res.push_str(" ");
res.push_str(lhs_lines[lhs_line.0]);
println!("{} {}", format_line_num(lhs_line), lhs_lines[lhs_line.0]);
} else {
continue;
}
res.push('\n');
}
for (lhs_line, _) in &hunk_lines {
if let Some(lhs_line) = lhs_line {
res.push_str(&format_line_num(*lhs_line).red().bold().to_string());
res.push_str(" ");
res.push_str(lhs_lines[lhs_line.0]);
println!(
"{} {}",
format_line_num(*lhs_line).red().bold().to_string(),
lhs_lines[lhs_line.0]
);
} else {
continue;
}
res.push('\n');
}
for (_, rhs_line) in &hunk_lines {
if let Some(rhs_line) = rhs_line {
res.push_str(" ");
res.push_str(&format_line_num(*rhs_line).green().bold().to_string());
res.push_str(rhs_lines[rhs_line.0]);
println!(
" {}{}",
format_line_num(*rhs_line).green().bold().to_string(),
rhs_lines[rhs_line.0]
);
} else {
continue;
}
res.push('\n');
}
for (_, rhs_line) in &after_lines {
if let Some(rhs_line) = rhs_line {
res.push_str(" ");
res.push_str(&format_line_num(*rhs_line));
res.push_str(rhs_lines[rhs_line.0]);
println!(" {}{}", format_line_num(*rhs_line), rhs_lines[rhs_line.0]);
} else {
continue;
}
res.push('\n');
}
res.push('\n');
println!();
}
res
}

12
src/main.rs
Unescape Escape View File

@ -356,9 +356,7 @@ fn print_diff_result(
}
if env::var("INLINE").is_ok() {
println!(
"{}",
inline::display(
inline::print(
lhs_src,
rhs_src,
&summary.lhs_positions,
@ -366,13 +364,10 @@ fn print_diff_result(
&hunks,
&summary.path,
&lang_name,
background
)
background,
);
} else {
println!(
"{}",
side_by_side::display_hunks(
side_by_side::print(
&hunks,
display_width,
background,
@ -382,7 +377,6 @@ fn print_diff_result(
rhs_src,
&summary.lhs_positions,
&summary.rhs_positions,
)
);
}
}

54
src/side_by_side.rs
Unescape Escape View File

@ -249,7 +249,7 @@ fn highlight_as_novel(
false
}
pub fn display_hunks(
pub fn print(
hunks: &[Hunk],
display_width: usize,
background: BackgroundColor,
@ -259,15 +259,21 @@ pub fn display_hunks(
rhs_src: &str,
lhs_mps: &[MatchedPos],
rhs_mps: &[MatchedPos],
) -> String {
) {
let lhs_colored_src = apply_colors(lhs_src, true, background, lhs_mps);
let rhs_colored_src = apply_colors(rhs_src, false, background, rhs_mps);
if lhs_src.is_empty() {
return display_single_column(display_path, lang_name, &rhs_colored_src, false, background);
println!(
"{}",
display_single_column(display_path, lang_name, &rhs_colored_src, false, background)
);
}
if rhs_src.is_empty() {
return display_single_column(display_path, lang_name, &lhs_colored_src, true, background);
println!(
"{}",
display_single_column(display_path, lang_name, &lhs_colored_src, true, background)
);
}
// TODO: this is largely duplicating the `apply_colors` logic.
@ -284,16 +290,11 @@ pub fn display_hunks(
let matched_lines = all_matched_lines_filled(lhs_mps, rhs_mps);
let mut out_lines: Vec<String> = vec![];
for (i, hunk) in hunks.iter().enumerate() {
out_lines.push(style::header(
display_path,
i + 1,
hunks.len(),
lang_name,
background,
));
println!(
"{}",
style::header(display_path, i + 1, hunks.len(), lang_name, background)
);
let aligned_lines = matched_lines_for_hunk(&matched_lines, hunk);
let no_lhs_changes = hunk.novel_lhs.is_empty();
@ -331,19 +332,19 @@ pub fn display_hunks(
Some(rhs_line_num) => {
let rhs_line = &rhs_colored_lines[rhs_line_num.0];
if same_lines {
out_lines.push(format!("{}{}", display_rhs_line_num, rhs_line));
println!("{}{}", display_rhs_line_num, rhs_line);
} else {
out_lines.push(format!(
println!(
"{}{}{}",
display_lhs_line_num, display_rhs_line_num, rhs_line
));
);
}
}
None => {
// We didn't have any changed RHS lines in the
// hunk, but we had some contextual lines that
// only occurred on the LHS (e.g. extra newlines).
out_lines.push(format!("{}{}", display_rhs_line_num, display_rhs_line_num));
println!("{}{}", display_rhs_line_num, display_rhs_line_num);
}
}
} else if no_rhs_changes {
@ -351,16 +352,16 @@ pub fn display_hunks(
Some(lhs_line_num) => {
let lhs_line = &lhs_colored_lines[lhs_line_num.0];
if same_lines {
out_lines.push(format!("{}{}", display_lhs_line_num, lhs_line));
println!("{}{}", display_lhs_line_num, lhs_line);
} else {
out_lines.push(format!(
println!(
"{}{}{}",
display_lhs_line_num, display_rhs_line_num, lhs_line
));
);
}
}
None => {
out_lines.push(format!("{}{}", display_lhs_line_num, display_rhs_line_num));
println!("{}{}", display_lhs_line_num, display_rhs_line_num);
}
}
} else {
@ -426,10 +427,7 @@ pub fn display_hunks(
s
};
out_lines.push(format!(
"{}{}{}{}{}",
lhs_num, lhs_line, SPACER, rhs_num, rhs_line
));
println!("{}{}{}{}{}", lhs_num, lhs_line, SPACER, rhs_num, rhs_line);
}
}
@ -440,10 +438,8 @@ pub fn display_hunks(
prev_rhs_line_num = rhs_line_num;
}
}
out_lines.push("".into());
println!();
}
out_lines.join("\n")
}
#[cfg(test)]
@ -543,7 +539,7 @@ mod tests {
}];
// Simple smoke test.
display_hunks(
print(
&hunks,
80,
BackgroundColor::Dark,