2017-07-13 18:42:14 +09:00
|
|
|
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2017-11-10 07:23:12 +11:00
|
|
|
use config::Color;
|
2015-09-10 18:27:22 -04:00
|
|
|
use diff;
|
2017-07-13 18:42:14 +09:00
|
|
|
use std::collections::VecDeque;
|
2016-05-18 09:25:57 +12:00
|
|
|
use std::io;
|
2017-07-13 18:42:14 +09:00
|
|
|
use term;
|
2017-11-10 07:23:12 +11:00
|
|
|
use utils::iscolored;
|
2015-09-10 18:27:22 -04:00
|
|
|
|
2015-12-28 17:23:34 +05:30
|
|
|
#[derive(Debug, PartialEq)]
|
2015-09-10 18:27:22 -04:00
|
|
|
pub enum DiffLine {
|
|
|
|
Context(String),
|
|
|
|
Expected(String),
|
|
|
|
Resulting(String),
|
|
|
|
}
|
|
|
|
|
2015-12-28 17:23:34 +05:30
|
|
|
#[derive(Debug, PartialEq)]
|
2015-09-10 18:27:22 -04:00
|
|
|
pub struct Mismatch {
|
|
|
|
pub line_number: u32,
|
|
|
|
pub lines: Vec<DiffLine>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Mismatch {
|
|
|
|
fn new(line_number: u32) -> Mismatch {
|
2015-09-26 18:29:48 +12:00
|
|
|
Mismatch {
|
|
|
|
line_number: line_number,
|
|
|
|
lines: Vec::new(),
|
|
|
|
}
|
2015-09-10 18:27:22 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Produces a diff between the expected output and actual output of rustfmt.
|
|
|
|
pub fn make_diff(expected: &str, actual: &str, context_size: usize) -> Vec<Mismatch> {
|
|
|
|
let mut line_number = 1;
|
|
|
|
let mut context_queue: VecDeque<&str> = VecDeque::with_capacity(context_size);
|
|
|
|
let mut lines_since_mismatch = context_size + 1;
|
|
|
|
let mut results = Vec::new();
|
|
|
|
let mut mismatch = Mismatch::new(0);
|
|
|
|
|
|
|
|
for result in diff::lines(expected, actual) {
|
|
|
|
match result {
|
|
|
|
diff::Result::Left(str) => {
|
2017-10-19 23:14:20 +01:00
|
|
|
if lines_since_mismatch >= context_size && lines_since_mismatch > 0 {
|
2015-09-10 18:27:22 -04:00
|
|
|
results.push(mismatch);
|
|
|
|
mismatch = Mismatch::new(line_number - context_queue.len() as u32);
|
|
|
|
}
|
|
|
|
|
|
|
|
while let Some(line) = context_queue.pop_front() {
|
2017-03-28 11:25:59 +13:00
|
|
|
mismatch.lines.push(DiffLine::Context(line.to_owned()));
|
2015-09-10 18:27:22 -04:00
|
|
|
}
|
|
|
|
|
2017-03-28 11:25:59 +13:00
|
|
|
mismatch.lines.push(DiffLine::Resulting(str.to_owned()));
|
2015-09-10 18:27:22 -04:00
|
|
|
lines_since_mismatch = 0;
|
|
|
|
}
|
|
|
|
diff::Result::Right(str) => {
|
2017-10-19 23:14:20 +01:00
|
|
|
if lines_since_mismatch >= context_size && lines_since_mismatch > 0 {
|
2015-09-10 18:27:22 -04:00
|
|
|
results.push(mismatch);
|
|
|
|
mismatch = Mismatch::new(line_number - context_queue.len() as u32);
|
|
|
|
}
|
|
|
|
|
|
|
|
while let Some(line) = context_queue.pop_front() {
|
2017-03-28 11:25:59 +13:00
|
|
|
mismatch.lines.push(DiffLine::Context(line.to_owned()));
|
2015-09-10 18:27:22 -04:00
|
|
|
}
|
|
|
|
|
2017-03-28 11:25:59 +13:00
|
|
|
mismatch.lines.push(DiffLine::Expected(str.to_owned()));
|
2015-09-10 18:27:22 -04:00
|
|
|
line_number += 1;
|
|
|
|
lines_since_mismatch = 0;
|
|
|
|
}
|
|
|
|
diff::Result::Both(str, _) => {
|
|
|
|
if context_queue.len() >= context_size {
|
|
|
|
let _ = context_queue.pop_front();
|
|
|
|
}
|
|
|
|
|
|
|
|
if lines_since_mismatch < context_size {
|
2017-03-28 11:25:59 +13:00
|
|
|
mismatch.lines.push(DiffLine::Context(str.to_owned()));
|
2017-10-19 23:14:20 +01:00
|
|
|
} else if context_size > 0 {
|
2015-09-10 18:27:22 -04:00
|
|
|
context_queue.push_back(str);
|
|
|
|
}
|
|
|
|
|
|
|
|
line_number += 1;
|
|
|
|
lines_since_mismatch += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
results.push(mismatch);
|
|
|
|
results.remove(0);
|
|
|
|
|
|
|
|
results
|
|
|
|
}
|
|
|
|
|
2017-11-10 07:23:12 +11:00
|
|
|
pub fn print_diff<F>(diff: Vec<Mismatch>, get_section_title: F, color: Color)
|
2017-06-12 15:58:58 +12:00
|
|
|
where
|
|
|
|
F: Fn(u32) -> String,
|
2015-09-10 18:27:22 -04:00
|
|
|
{
|
2016-05-31 15:15:33 +02:00
|
|
|
match term::stdout() {
|
2017-11-10 07:23:12 +11:00
|
|
|
Some(ref t) if iscolored(color) && t.supports_color() => {
|
2016-08-26 17:08:47 -04:00
|
|
|
print_diff_fancy(diff, get_section_title, term::stdout().unwrap())
|
|
|
|
}
|
2016-05-31 15:15:33 +02:00
|
|
|
_ => print_diff_basic(diff, get_section_title),
|
|
|
|
}
|
2016-05-18 09:25:57 +12:00
|
|
|
}
|
2015-12-31 15:02:44 -08:00
|
|
|
|
2017-06-12 15:58:58 +12:00
|
|
|
fn print_diff_fancy<F>(
|
|
|
|
diff: Vec<Mismatch>,
|
|
|
|
get_section_title: F,
|
|
|
|
mut t: Box<term::Terminal<Output = io::Stdout>>,
|
|
|
|
) where
|
|
|
|
F: Fn(u32) -> String,
|
2016-05-18 09:25:57 +12:00
|
|
|
{
|
2015-09-10 18:27:22 -04:00
|
|
|
for mismatch in diff {
|
|
|
|
let title = get_section_title(mismatch.line_number);
|
|
|
|
writeln!(t, "{}", title).unwrap();
|
|
|
|
|
|
|
|
for line in mismatch.lines {
|
|
|
|
match line {
|
|
|
|
DiffLine::Context(ref str) => {
|
2015-12-31 15:02:44 -08:00
|
|
|
t.reset().unwrap();
|
2015-09-10 18:27:22 -04:00
|
|
|
writeln!(t, " {}⏎", str).unwrap();
|
|
|
|
}
|
|
|
|
DiffLine::Expected(ref str) => {
|
|
|
|
t.fg(term::color::GREEN).unwrap();
|
|
|
|
writeln!(t, "+{}⏎", str).unwrap();
|
|
|
|
}
|
|
|
|
DiffLine::Resulting(ref str) => {
|
|
|
|
t.fg(term::color::RED).unwrap();
|
|
|
|
writeln!(t, "-{}⏎", str).unwrap();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-12-31 15:02:44 -08:00
|
|
|
t.reset().unwrap();
|
2015-09-10 18:27:22 -04:00
|
|
|
}
|
|
|
|
}
|
2016-05-18 09:25:57 +12:00
|
|
|
|
|
|
|
pub fn print_diff_basic<F>(diff: Vec<Mismatch>, get_section_title: F)
|
2017-06-12 15:58:58 +12:00
|
|
|
where
|
|
|
|
F: Fn(u32) -> String,
|
2016-05-18 09:25:57 +12:00
|
|
|
{
|
|
|
|
for mismatch in diff {
|
|
|
|
let title = get_section_title(mismatch.line_number);
|
|
|
|
println!("{}", title);
|
|
|
|
|
|
|
|
for line in mismatch.lines {
|
|
|
|
match line {
|
|
|
|
DiffLine::Context(ref str) => {
|
|
|
|
println!(" {}⏎", str);
|
|
|
|
}
|
|
|
|
DiffLine::Expected(ref str) => {
|
|
|
|
println!("+{}⏎", str);
|
|
|
|
}
|
|
|
|
DiffLine::Resulting(ref str) => {
|
|
|
|
println!("-{}⏎", str);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-10-19 20:49:33 +01:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
2017-10-19 23:32:27 +01:00
|
|
|
use super::{make_diff, Mismatch};
|
2017-10-19 20:49:33 +01:00
|
|
|
use super::DiffLine::*;
|
|
|
|
|
|
|
|
#[test]
|
2017-10-19 20:55:20 +01:00
|
|
|
fn diff_simple() {
|
2017-10-19 20:49:33 +01:00
|
|
|
let src = "one\ntwo\nthree\nfour\nfive\n";
|
2017-10-19 23:32:27 +01:00
|
|
|
let dest = "one\ntwo\ntrois\nfour\nfive\n";
|
2017-10-19 20:49:33 +01:00
|
|
|
let diff = make_diff(src, dest, 1);
|
2017-10-19 23:32:27 +01:00
|
|
|
assert_eq!(
|
|
|
|
diff,
|
|
|
|
vec![
|
|
|
|
Mismatch {
|
|
|
|
line_number: 2,
|
|
|
|
lines: vec![
|
|
|
|
Context("two".into()),
|
|
|
|
Resulting("three".into()),
|
|
|
|
Expected("trois".into()),
|
|
|
|
Context("four".into()),
|
|
|
|
],
|
|
|
|
},
|
|
|
|
]
|
|
|
|
);
|
2017-10-19 20:49:33 +01:00
|
|
|
}
|
2017-10-19 20:55:20 +01:00
|
|
|
|
2017-10-19 23:03:27 +01:00
|
|
|
#[test]
|
|
|
|
fn diff_simple2() {
|
|
|
|
let src = "one\ntwo\nthree\nfour\nfive\nsix\nseven\n";
|
2017-10-19 23:32:27 +01:00
|
|
|
let dest = "one\ntwo\ntrois\nfour\ncinq\nsix\nseven\n";
|
2017-10-19 23:03:27 +01:00
|
|
|
let diff = make_diff(src, dest, 1);
|
2017-10-19 23:32:27 +01:00
|
|
|
assert_eq!(
|
|
|
|
diff,
|
|
|
|
vec![
|
|
|
|
Mismatch {
|
|
|
|
line_number: 2,
|
|
|
|
lines: vec![
|
|
|
|
Context("two".into()),
|
|
|
|
Resulting("three".into()),
|
|
|
|
Expected("trois".into()),
|
|
|
|
Context("four".into()),
|
|
|
|
],
|
|
|
|
},
|
|
|
|
Mismatch {
|
|
|
|
line_number: 5,
|
|
|
|
lines: vec![
|
|
|
|
Resulting("five".into()),
|
|
|
|
Expected("cinq".into()),
|
|
|
|
Context("six".into()),
|
|
|
|
],
|
|
|
|
},
|
|
|
|
]
|
|
|
|
);
|
2017-10-19 23:03:27 +01:00
|
|
|
}
|
|
|
|
|
2017-10-19 20:55:20 +01:00
|
|
|
#[test]
|
|
|
|
fn diff_zerocontext() {
|
|
|
|
let src = "one\ntwo\nthree\nfour\nfive\n";
|
2017-10-19 23:32:27 +01:00
|
|
|
let dest = "one\ntwo\ntrois\nfour\nfive\n";
|
2017-10-19 20:55:20 +01:00
|
|
|
let diff = make_diff(src, dest, 0);
|
2017-10-19 23:32:27 +01:00
|
|
|
assert_eq!(
|
|
|
|
diff,
|
|
|
|
vec![
|
|
|
|
Mismatch {
|
|
|
|
line_number: 3,
|
|
|
|
lines: vec![Resulting("three".into()), Expected("trois".into())],
|
|
|
|
},
|
|
|
|
]
|
|
|
|
);
|
2017-10-19 20:55:20 +01:00
|
|
|
}
|
2017-10-19 23:32:27 +01:00
|
|
|
}
|