WIP: Rewrite everything - and it compiles

Author: killercup

Cargo.toml

@@ -15,9 +15,10 @@ default = []
 dev = ["clippy"]
 
 [dependencies]
-ansi_term = "0.6.3"
-difference = "0.4.0"
-clippy = {version = "0.0.23", optional = true}
+colored = "1.4"
+difference = "1.0"
+error-chain = "0.10.0"
+clippy = {version = "*", optional = true}
 
 [build-dependencies]
 skeptic = "0.5"

src/cli_error.rs

@@ -1,27 +1,46 @@
-use std::fmt;
+extern crate colored;
+use self::colored::Colorize;
 
-use difference::Difference;
-use ansi_term::Colour::{Green, Red};
+use difference::{Difference, Changeset};
+use std::fmt::Write;
 
-pub fn render(changeset: &[Difference]) -> Result<String, fmt::Error> {
-    use std::fmt::Write;
+use errors::*;
 
+pub fn render(Changeset { diffs, .. }: Changeset) -> Result<String> {
     let mut t = String::new();
 
-    for change in changeset {
-        match *change {
+    for i in 0..diffs.len() {
+        match diffs[i] {
             Difference::Same(ref x) => {
-                for line in x.lines() {
-                    try!(writeln!(t, " {}", line));
-                }
+                writeln!(t, " {}", x)?;
             }
             Difference::Add(ref x) => {
-                try!(write!(t, "{}", Green.paint("+")));
-                try!(writeln!(t, "{}", Green.paint(x)));
+                match diffs[i - 1] {
+                    Difference::Rem(ref y) => {
+                        write!(t, "{}", "+".green())?;
+                        let Changeset { diffs, .. } = Changeset::new(y, x, " ");
+                        for c in diffs {
+                            match c {
+                                Difference::Same(ref z) => {
+                                    write!(t, "{}", z.green())?;
+                                    write!(t, " ")?;
+                                }
+                                Difference::Add(ref z) => {
+                                    write!(t, "{}", z.white().on_green())?;
+                                    write!(t, " ")?;
+                                }
+                                _ => (),
+                            }
+                        }
+                        writeln!(t, "")?;
+                    }
+                    _ => {
+                        writeln!(t, "{}", format!("+{}", x).green().dimmed())?;
+                    }
+                };
             }
             Difference::Rem(ref x) => {
-                try!(write!(t, "{}", Red.paint("-")));
-                try!(writeln!(t, "{}", Red.paint(x)));
+                writeln!(t, "{}", format!("-{}", x).red())?;
             }
         }
     }

src/diff.rs

@@ -0,0 +1,6 @@
+error_chain! {
+    foreign_links {
+        Io(::std::io::Error);
+        Fmt(::std::fmt::Error);
+    }
+}