difftastic/src/side_by_side.rs

555 lines
18 KiB
Rust

//! Side-by-side (two column) display of diffs.
use colored::{Color, Colorize};
use std::{
cmp::max,
collections::{HashMap, HashSet},
};
use crate::{
context::all_matched_lines_filled,
hunks::{matched_lines_for_hunk, Hunk},
lines::{codepoint_len, format_line_num, LineNumber},
positions::SingleLineSpan,
style::{self, apply_colors, color_positions, split_and_apply, BackgroundColor, Style},
syntax::{zip_pad_shorter, MatchedPos},
};
const SPACER: &str = " ";
/// Split `s` by newlines. Always returns a non-empty vec.
///
/// This differs from `str::lines`, which considers `""` to be zero
/// lines and `"foo\n"` to be one line.
fn split_on_newlines(s: &str) -> Vec<&str> {
s.split('\n').collect()
}
fn format_line_num_padded(line_num: LineNumber, column_width: usize) -> String {
format!(
"{:width$} ",
line_num.one_indexed(),
width = column_width - 1
)
}
fn format_missing_line_num(prev_num: LineNumber, column_width: usize) -> String {
let num_digits = format!("{}", prev_num.one_indexed()).len();
format!(
"{:>width$} ",
".".repeat(num_digits),
width = column_width - 1
)
.dimmed()
.to_string()
}
/// Display `src` in a single column (e.g. a file removal or addition).
fn display_single_column(
display_path: &str,
lang_name: &str,
src: &str,
is_lhs: bool,
background: BackgroundColor,
) -> String {
let column_width = format_line_num(src.lines().count().into()).len();
let mut result = String::with_capacity(src.len());
result.push_str(&style::header(display_path, 1, 1, lang_name, background));
result.push('\n');
let color = match (is_lhs, background) {
(true, BackgroundColor::Dark) => Color::BrightRed,
(true, BackgroundColor::Light) => Color::Red,
(false, BackgroundColor::Dark) => Color::BrightGreen,
(false, BackgroundColor::Light) => Color::Green,
};
for (i, line) in src.lines().enumerate() {
result.push_str(
&format_line_num_padded(i.into(), column_width)
.color(color)
.to_string(),
);
result.push_str(line);
result.push('\n');
}
result
}
fn display_line_nums(
lhs_line_num: Option<LineNumber>,
rhs_line_num: Option<LineNumber>,
widths: &Widths,
background: BackgroundColor,
lhs_has_novel: bool,
rhs_has_novel: bool,
prev_lhs_line_num: Option<LineNumber>,
prev_rhs_line_num: Option<LineNumber>,
) -> (String, String) {
let display_lhs_line_num: String = match lhs_line_num {
Some(line_num) => {
let s = format_line_num_padded(line_num, widths.lhs_line_nums);
if lhs_has_novel {
// TODO: factor out applying colours to line numbers.
match background {
BackgroundColor::Dark => s.bright_red(),
BackgroundColor::Light => s.red(),
}
.to_string()
} else {
s
}
}
None => format_missing_line_num(
prev_lhs_line_num.unwrap_or_else(|| 1.into()),
widths.lhs_line_nums,
),
};
let display_rhs_line_num: String = match rhs_line_num {
Some(line_num) => {
let s = format_line_num_padded(line_num, widths.rhs_line_nums);
if rhs_has_novel {
match background {
BackgroundColor::Dark => s.bright_green(),
BackgroundColor::Light => s.green(),
}
.to_string()
} else {
s
}
}
None => format_missing_line_num(
prev_rhs_line_num.unwrap_or_else(|| 1.into()),
widths.rhs_line_nums,
),
};
(display_lhs_line_num, display_rhs_line_num)
}
// Sizes used when displaying a hunk.
struct Widths {
lhs_content: usize,
rhs_content: usize,
lhs_line_nums: usize,
rhs_line_nums: usize,
}
impl Widths {
fn new(
terminal_width: usize,
line_nums: &[(Option<LineNumber>, Option<LineNumber>)],
lhs_lines: &[&str],
rhs_lines: &[&str],
) -> Self {
let mut lhs_max_line: LineNumber = 1.into();
let mut rhs_max_line: LineNumber = 1.into();
let mut lhs_max_content = 1;
let mut rhs_max_content = 1;
for (lhs_line_num, rhs_line_num) in line_nums {
if let Some(lhs_line_num) = lhs_line_num {
lhs_max_line = max(lhs_max_line, *lhs_line_num);
lhs_max_content = max(lhs_max_content, codepoint_len(lhs_lines[lhs_line_num.0]));
}
if let Some(rhs_line_num) = rhs_line_num {
rhs_max_line = max(rhs_max_line, *rhs_line_num);
rhs_max_content = max(rhs_max_content, codepoint_len(rhs_lines[rhs_line_num.0]));
}
}
let lhs_line_nums_width = format_line_num(lhs_max_line).len();
let rhs_line_nums_width = format_line_num(rhs_max_line).len();
let lhs_total_width = (terminal_width - SPACER.len()) / 2;
let lhs_content_width = lhs_total_width - lhs_line_nums_width;
let rhs_content_width =
terminal_width - lhs_total_width - SPACER.len() - rhs_line_nums_width;
Self {
lhs_content: lhs_content_width,
rhs_content: rhs_content_width,
lhs_line_nums: lhs_line_nums_width,
rhs_line_nums: rhs_line_nums_width,
}
}
}
pub fn lines_with_novel(
lhs_mps: &[MatchedPos],
rhs_mps: &[MatchedPos],
) -> (HashSet<LineNumber>, HashSet<LineNumber>) {
let lhs_lines_with_novel: HashSet<LineNumber> = lhs_mps
.iter()
.filter(|mp| mp.kind.is_change())
.map(|mp| mp.pos.line)
.collect();
let rhs_lines_with_novel: HashSet<LineNumber> = rhs_mps
.iter()
.filter(|mp| mp.kind.is_change())
.map(|mp| mp.pos.line)
.collect();
(lhs_lines_with_novel, rhs_lines_with_novel)
}
/// Calculate positions of highlights on both sides. This includes
/// both syntax highlighting and added/removed content highlighting.
fn highlight_positions(
background: BackgroundColor,
lhs_mps: &[MatchedPos],
rhs_mps: &[MatchedPos],
) -> (
HashMap<LineNumber, Vec<(SingleLineSpan, Style)>>,
HashMap<LineNumber, Vec<(SingleLineSpan, Style)>>,
) {
let lhs_positions = color_positions(true, background, lhs_mps);
// Preallocate the hashmap assuming the average line will have 2 items on it.
let mut lhs_styles: HashMap<LineNumber, Vec<(SingleLineSpan, Style)>> =
HashMap::with_capacity(lhs_positions.len() / 2);
for (span, style) in lhs_positions {
let styles = lhs_styles.entry(span.line).or_insert_with(Vec::new);
styles.push((span, style));
}
let rhs_positions = color_positions(false, background, rhs_mps);
let mut rhs_styles: HashMap<LineNumber, Vec<(SingleLineSpan, Style)>> =
HashMap::with_capacity(rhs_positions.len() / 2);
for (span, style) in rhs_positions {
let styles = rhs_styles.entry(span.line).or_insert_with(Vec::new);
styles.push((span, style));
}
(lhs_styles, rhs_styles)
}
fn highlight_as_novel(
line_num: Option<LineNumber>,
lines: &[&str],
opposite_line_num: Option<LineNumber>,
lines_with_novel: &HashSet<LineNumber>,
) -> bool {
if let Some(line_num) = line_num {
// If this line contains any novel tokens, highlight it.
if lines_with_novel.contains(&line_num) {
return true;
}
let line_content = lines.get(line_num.0).map(|s| str::trim(s));
// If this is a blank line without a corresponding line on the
// other side, highlight it too. This helps highlight novel
// blank lines.
if line_content == Some("") && opposite_line_num.is_none() {
return true;
}
}
false
}
pub fn print(
hunks: &[Hunk],
display_width: usize,
background: BackgroundColor,
display_path: &str,
lang_name: &str,
lhs_src: &str,
rhs_src: &str,
lhs_mps: &[MatchedPos],
rhs_mps: &[MatchedPos],
) {
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() {
println!(
"{}",
display_single_column(display_path, lang_name, &rhs_colored_src, false, background)
);
}
if rhs_src.is_empty() {
println!(
"{}",
display_single_column(display_path, lang_name, &lhs_colored_src, true, background)
);
}
// TODO: this is largely duplicating the `apply_colors` logic.
let (lhs_highlights, rhs_highlights) = highlight_positions(background, lhs_mps, rhs_mps);
let lhs_lines = split_on_newlines(lhs_src);
let rhs_lines = split_on_newlines(rhs_src);
let lhs_colored_lines = split_on_newlines(&lhs_colored_src);
let rhs_colored_lines = split_on_newlines(&rhs_colored_src);
let (lhs_lines_with_novel, rhs_lines_with_novel) = lines_with_novel(lhs_mps, rhs_mps);
let mut prev_lhs_line_num = None;
let mut prev_rhs_line_num = None;
let matched_lines = all_matched_lines_filled(lhs_mps, rhs_mps);
for (i, hunk) in hunks.iter().enumerate() {
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();
let no_rhs_changes = hunk.novel_rhs.is_empty();
let same_lines = aligned_lines.iter().all(|(l, r)| l == r);
let widths = Widths::new(display_width, &aligned_lines, &lhs_lines, &rhs_lines);
for (lhs_line_num, rhs_line_num) in aligned_lines {
let lhs_line_novel = highlight_as_novel(
lhs_line_num,
&lhs_lines,
rhs_line_num,
&lhs_lines_with_novel,
);
let rhs_line_novel = highlight_as_novel(
rhs_line_num,
&rhs_lines,
lhs_line_num,
&rhs_lines_with_novel,
);
let (display_lhs_line_num, display_rhs_line_num) = display_line_nums(
lhs_line_num,
rhs_line_num,
&widths,
background,
lhs_line_novel,
rhs_line_novel,
prev_lhs_line_num,
prev_rhs_line_num,
);
if no_lhs_changes {
match rhs_line_num {
Some(rhs_line_num) => {
let rhs_line = &rhs_colored_lines[rhs_line_num.0];
if same_lines {
println!("{}{}", display_rhs_line_num, rhs_line);
} else {
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).
println!("{}{}", display_rhs_line_num, display_rhs_line_num);
}
}
} else if no_rhs_changes {
match lhs_line_num {
Some(lhs_line_num) => {
let lhs_line = &lhs_colored_lines[lhs_line_num.0];
if same_lines {
println!("{}{}", display_lhs_line_num, lhs_line);
} else {
println!(
"{}{}{}",
display_lhs_line_num, display_rhs_line_num, lhs_line
);
}
}
None => {
println!("{}{}", display_lhs_line_num, display_rhs_line_num);
}
}
} else {
let lhs_line = match lhs_line_num {
Some(lhs_line_num) => split_and_apply(
lhs_lines[lhs_line_num.0],
widths.lhs_content,
lhs_highlights.get(&lhs_line_num).unwrap_or(&vec![]),
),
None => vec![" ".repeat(widths.lhs_content)],
};
let rhs_line = match rhs_line_num {
Some(rhs_line_num) => split_and_apply(
rhs_lines[rhs_line_num.0],
widths.rhs_content,
rhs_highlights.get(&rhs_line_num).unwrap_or(&vec![]),
),
None => vec!["".into()],
};
for (i, (lhs_line, rhs_line)) in zip_pad_shorter(&lhs_line, &rhs_line)
.into_iter()
.enumerate()
{
let lhs_line = lhs_line.unwrap_or_else(|| " ".repeat(widths.lhs_content));
let rhs_line = rhs_line.unwrap_or_else(|| "".into());
let lhs_num: String = if i == 0 {
display_lhs_line_num.clone()
} else {
let mut s = format_missing_line_num(
lhs_line_num
.unwrap_or_else(|| prev_lhs_line_num.unwrap_or_else(|| 10.into())),
widths.lhs_line_nums,
);
if let Some(line_num) = lhs_line_num {
if lhs_lines_with_novel.contains(&line_num) {
s = match background {
BackgroundColor::Dark => s.bright_red(),
BackgroundColor::Light => s.red(),
}
.to_string();
}
}
s
};
let rhs_num: String = if i == 0 {
display_rhs_line_num.clone()
} else {
let mut s = format_missing_line_num(
rhs_line_num
.unwrap_or_else(|| prev_rhs_line_num.unwrap_or_else(|| 10.into())),
widths.rhs_line_nums,
);
if let Some(line_num) = rhs_line_num {
if rhs_lines_with_novel.contains(&line_num) {
s = match background {
BackgroundColor::Dark => s.bright_green(),
BackgroundColor::Light => s.green(),
}
.to_string();
}
}
s
};
println!("{}{}{}{}{}", lhs_num, lhs_line, SPACER, rhs_num, rhs_line);
}
}
if lhs_line_num.is_some() {
prev_lhs_line_num = lhs_line_num;
}
if rhs_line_num.is_some() {
prev_rhs_line_num = rhs_line_num;
}
}
println!();
}
}
#[cfg(test)]
mod tests {
use crate::syntax::{AtomKind, MatchKind, TokenKind};
use super::*;
use pretty_assertions::assert_eq;
#[test]
fn test_width_calculations() {
let line_nums = [(Some(1.into()), Some(10.into()))];
let widths = Widths::new(
80,
&line_nums,
&split_on_newlines("foo\nbar\n"),
&split_on_newlines("x\nx\nx\nx\nx\nx\nx\nx\nx\nx\nx\n"),
);
assert_eq!(widths.lhs_line_nums, 2);
assert_eq!(widths.rhs_line_nums, 3);
}
#[test]
fn test_display_single_column() {
// Basic smoke test.
let res = display_single_column(
"foo.py",
"Python",
"print(123)\n",
false,
BackgroundColor::Dark,
);
assert!(res.len() > 10);
}
#[test]
fn test_split_line_empty() {
assert_eq!(split_on_newlines(""), vec![""]);
}
#[test]
fn test_split_line_single() {
assert_eq!(split_on_newlines("foo"), vec!["foo"]);
}
#[test]
fn test_split_line_with_newline() {
assert_eq!(split_on_newlines("foo\nbar"), vec!["foo", "bar"]);
}
#[test]
fn test_split_line_with_trailing_newline() {
assert_eq!(split_on_newlines("foo\nbar\n"), vec!["foo", "bar", ""]);
}
#[test]
fn test_display_hunks() {
// Simulate diffing:
//
// Old:
// foo
//
// New:
// bar
let lhs_mps = [MatchedPos {
kind: MatchKind::Novel {
highlight: TokenKind::Atom(AtomKind::Normal),
},
pos: SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 3,
},
}];
let rhs_mps = [MatchedPos {
kind: MatchKind::Novel {
highlight: TokenKind::Atom(AtomKind::Normal),
},
pos: SingleLineSpan {
line: 0.into(),
start_col: 0,
end_col: 3,
},
}];
let mut novel_lhs = HashSet::new();
novel_lhs.insert(0.into());
let mut novel_rhs = HashSet::new();
novel_rhs.insert(0.into());
let hunks = [Hunk {
novel_lhs,
novel_rhs,
lines: vec![(Some(0.into()), Some(0.into()))],
}];
// Simple smoke test.
print(
&hunks,
80,
BackgroundColor::Dark,
"foo.el",
"Emacs Lisp",
"foo",
"bar",
&lhs_mps,
&rhs_mps,
);
}
}