fix tests

Author: gcanat

text/diff_util/file_diff.rs

@@ -31,6 +31,10 @@ impl<'a> FileDiff<'a> {
         self.are_different
     }
 
+    pub fn set_different(&mut self, are_different: bool) {
+        self.are_different = are_different;
+    }
+
     fn new(
         file1: &'a mut FileData<'a>,
         file2: &'a mut FileData<'a>,
@@ -59,15 +63,23 @@ impl<'a> FileDiff<'a> {
             let ends_with_newline1 = linereader1.ends_with_newline();
             let mut lines1 = Vec::new();
             for line in linereader1 {
-                lines1.push(line);
+                if !format_options.ignore_trailing_white_spaces {
+                    lines1.push(line);
+                } else {
+                    lines1.push(line.trim_end());
+                }
             }
 
             let content2 = read_to_string(&path2)?.into_bytes();
             let linereader2 = LineReader::new(&content2);
             let ends_with_newline2 = linereader2.ends_with_newline();
             let mut lines2 = Vec::new();
             for line in linereader2 {
-                lines2.push(line);
+                if !format_options.ignore_trailing_white_spaces {
+                    lines2.push(line);
+                } else {
+                    lines2.push(line.trim_end());
+                }
             }
             let mut file1 = FileData::get_file(path1, lines1, ends_with_newline1)?;
             let mut file2 = FileData::get_file(path2, lines2, ends_with_newline2)?;
@@ -91,6 +103,10 @@ impl<'a> FileDiff<'a> {
             diff.hunks
                 .create_hunks_from_lcs(&lcs_indices, num_lines1, num_lines2);
 
+            if diff.hunks.hunk_count() > 0 {
+                diff.set_different(true);
+            }
+
             if diff.are_different() {
                 if let Some(show_if_different) = show_if_different {
                     println!("{}", show_if_different);
@@ -186,7 +202,7 @@ impl<'a> FileDiff<'a> {
                         eprintln!("OutputFormat::Context should be handled in other place");
                         return Ok(DiffExitStatus::Trouble);
                     }
-                    OutputFormat::ForwardEditScript => hunk.print_forward_edit_script(
+                    OutputFormat::ForwardEditScript => hunk.print_edit_script(
                         self.file1,
                         self.file2,
                         hunk_index == hunks_count - 1,
@@ -269,7 +285,7 @@ impl<'a> FileDiff<'a> {
             .map(|(k, _v)| *k);
 
         match key {
-            None => {},
+            None => {}
             Some(k) => {
                 let rec = hist.get(k).unwrap();
                 let x1_new = rec[1] as usize;

text/diff_util/hunks.rs

@@ -39,7 +39,7 @@ impl Hunk {
         } else if is_ed && (self.ln1_start == self.ln1_end - 1) {
             format!("{}", self.ln1_end)
         } else {
-            format!("{},{}", self.ln1_start, self.ln1_end)
+            format!("{},{}", self.ln1_start+1, self.ln1_end)
         }
     }
 
@@ -49,7 +49,7 @@ impl Hunk {
         } else if is_ed && (self.ln2_start == self.ln2_end - 1) {
             format!("{}", self.ln2_end)
         } else {
-            format!("{},{}", self.ln2_start, self.ln2_end)
+            format!("{},{}", self.ln2_start+1, self.ln2_end)
         }
     }
 
@@ -74,14 +74,14 @@ impl Hunk {
             Change::None => {}
             Change::Unchanged(_) => {}
             Change::Insert(_) => {
-                println!("{}a{}", self.ln1_start, self.f2_range(false));
+                println!("{}a{}", self.ln1_start, self.f2_range(true));
 
                 for i in self.ln2_start..self.ln2_end {
                     println!("> {}", file2.line(i));
                 }
             }
             Change::Delete(_) => {
-                println!("{}d{}", self.f1_range(false), self.ln2_end);
+                println!("{}d{}", self.f1_range(true), self.ln2_end);
 
                 for i in self.ln1_start..self.ln1_end {
                     println!("< {}", file1.line(i));
@@ -92,7 +92,7 @@ impl Hunk {
                 }
             }
             Change::Substitute(_) => {
-                println!("{}c{}", self.f1_range(false), self.f2_range(false));
+                println!("{}c{}", self.f1_range(true), self.f2_range(true));
 
                 for i in self.ln1_start..self.ln1_end {
                     println!("< {}", file1.line(i));
@@ -204,52 +204,6 @@ impl Hunk {
             );
         }
     }
-
-    pub fn print_forward_edit_script(&mut self, file1: &FileData, file2: &FileData, is_last: bool) {
-        match &self.kind {
-            Change::None => {}
-            Change::Unchanged(_) => {}
-            Change::Insert(_) => {
-                self.changes.sort_by_key(|change| change.get_ln2());
-
-                println!("a{}", self.ln1_end);
-                for change in &self.changes {
-                    println!("{}", file2.line(change.get_ln2() - 1));
-                }
-
-                println!(".")
-            }
-            Change::Delete(_) => {
-                println!("d{}", self.f1_range(true).replace(",", " "));
-            }
-            Change::Substitute(_) => {
-                self.changes.sort_by_key(|change| change.get_ln2());
-                println!("c{}", self.f1_range(true).replace(",", " "));
-
-                for change in &self.changes {
-                    println!("{}", file2.line(change.get_ln2() - 1));
-                }
-
-                println!(".")
-            }
-        }
-
-        if is_last && !file1.ends_with_newline() {
-            println!(
-                "diff: {}:{}\n",
-                file1.name(),
-                &NO_NEW_LINE_AT_END_OF_FILE[1..]
-            );
-        }
-
-        if is_last && !file2.ends_with_newline() {
-            println!(
-                "diff: {}:{}\n",
-                file2.name(),
-                &NO_NEW_LINE_AT_END_OF_FILE[1..]
-            );
-        }
-    }
 }
 
 pub struct Hunks {
@@ -275,6 +229,10 @@ impl Hunks {
         &mut self.hunks[index]
     }
 
+    pub fn hunk_count(&self) -> usize {
+        self.hunks.len()
+    }
+
     pub fn create_hunks_from_lcs(
         &mut self,
         lcs_indices: &[i32],

text/tests/diff/f1.txt

@@ -5,7 +5,6 @@ line 4
 line 5
 line 6 will change
 line 7
-
 This line will be removed
 
 line 8

text/tests/diff/f1/f1.txt

@@ -5,7 +5,6 @@ line 4
 line 5
 line 6 will change
 line 7
-
 This line will be removed
 
 line 8

text/tests/diff/f1_with_eol_spaces.txt

@@ -5,7 +5,6 @@ line 4
 line 5   
 line 6 will change   
 line 7   
-
 This line will be removed  
 
 line 8