Intraline colored diffs are now word-based instead of character-based

fredemmott · fredemmott · commit ede4d1c3a236 · 2018-09-21T14:03:03.000-07:00
fixes #4
diff --git a/src/ColoredUnifiedDiff.php b/src/ColoredUnifiedDiff.php
@@ -110,7 +110,9 @@ final public static function create(
           $next = Str\slice($next, 1);
           $lines = Vec\drop($lines, 1);
 
-          $intraline = StringDiff::characters($line, $next)->getDiff();
+          $words_line = vec(\preg_split('/([^a-zA-Z0-9_]+)/', $line, -1, \PREG_SPLIT_DELIM_CAPTURE));
+          $words_next = vec(\preg_split('/([^a-zA-Z0-9_]+)/', $next, -1, \PREG_SPLIT_DELIM_CAPTURE));
+          $intraline = (new StringDiff($words_line, $words_next))->getDiff();
           $out[] = $intraline
             |> Vec\filter($$, $op ==> !$op is DiffInsertOp<_>)
             |> static::colorDeleteLineWithIntralineEdits($$);
diff --git a/tests/StringDiffTest.php b/tests/StringDiffTest.php
@@ -87,10 +87,9 @@ public function testCLIColoredDiff(string $name): void {
 
     expect($diff)->toBeSame(
       \file_get_contents($base.'.clidiff.expect'),
-      'Did not match expected contents (- %s.clidiff.expect, +%s.clidiff.out)',
-      $name,
-      $name,
-      $name,
+      'Did not match expected contents (- %s.clidiff.expect, + %s.clidiff.out)',
+      $base,
+      $base,
     );
   }
 }
diff --git a/tests/examples/lots_of_context_replace.clidiff.expect b/tests/examples/lots_of_context_replace.clidiff.expect
@@ -2,8 +2,8 @@
 [0m 8[0m
 [0m 9[0m
 [0m 0[0m
-[31m-foo ba[7mt[0m[31m baz[0m
-[32m+foo ba[7mr[0m[32m baz[0m
+[31m-foo [7mbat[0m[31m baz[0m
+[32m+foo [7mbar[0m[32m baz[0m
 [0m 1[0m
 [0m 2[0m
 [0m 3[0m
diff --git a/tests/examples/replace_intraline_word.a b/tests/examples/replace_intraline_word.a
@@ -0,0 +1 @@
+Foo Bat Baz
diff --git a/tests/examples/replace_intraline_word.b b/tests/examples/replace_intraline_word.b
@@ -0,0 +1 @@
+Foo Bar Baz
diff --git a/tests/examples/replace_intraline_word.clidiff.expect b/tests/examples/replace_intraline_word.clidiff.expect
@@ -0,0 +1,3 @@
+[36m@@ -1 +1 @@[0m
+[31m-Foo [7mBat[0m[31m Baz[0m
+[32m+Foo [7mBar[0m[32m Baz[0m
diff --git a/tests/examples/replace_intraline_word.udiff.expect b/tests/examples/replace_intraline_word.udiff.expect
@@ -0,0 +1,3 @@
+@@ -1 +1 @@
+-Foo Bat Baz
++Foo Bar Baz
diff --git a/tests/examples/replace_word.clidiff.expect b/tests/examples/replace_word.clidiff.expect
@@ -1,3 +1,3 @@
 [36m@@ -1 +1 @@[0m
-[31m-F[7mr[0m[31ma[7mm[0m[31me[7mw[0m[31mo[7mr[0m[31mk[0m
-[32m+Fa[7mc[0m[32me[7mb[0m[32mo[7mo[0m[32mk[0m
+[31m-[7mFramework[0m[31m[0m
+[32m+[7mFacebook[0m[32m[0m
diff --git a/tests/examples/two_lines_to_one.clidiff.expect b/tests/examples/two_lines_to_one.clidiff.expect
@@ -1,4 +1,4 @@
 [36m@@ -1,2 +1 @@[0m
 [31m-Foo[0m
-[31m-Ba[7mr[0m[31m[0m
-[32m+Ba[7mz[0m[32m[0m
+[31m-[7mBar[0m[31m[0m
+[32m+[7mBaz[0m[32m[0m

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,9 @@ public function testCLIColoredDiff(string $name): void {`
`87`	`87`
`88`	`88`	`expect($diff)->toBeSame(`
`89`	`89`	`\file_get_contents($base.'.clidiff.expect'),`
`90`		`- 'Did not match expected contents (- %s.clidiff.expect, +%s.clidiff.out)',`
`91`		`- $name,`
`92`		`- $name,`
`93`		`- $name,`
	`90`	`+ 'Did not match expected contents (- %s.clidiff.expect, + %s.clidiff.out)',`
	`91`	`+ $base,`
	`92`	`+ $base,`
`94`	`93`	`);`
`95`	`94`	`}`
`96`	`95`	`}`
-Original file line number
+Diff line change
 [0m 8[0m
 [0m 9[0m
 [0m 0[0m
 -[31m-foo ba[7mt[0m[31m baz[0m
 -[32m+foo ba[7mr[0m[32m baz[0m
 +[31m-foo [7mbat[0m[31m baz[0m
 +[32m+foo [7mbar[0m[32m baz[0m
 [0m 1[0m
 [0m 2[0m
 [0m 3[0m
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[36m@@ -1 +1 @@[0m`
	`2`	`+[31m-Foo [7mBat[0m[31m Baz[0m`
	`3`	`+[32m+Foo [7mBar[0m[32m Baz[0m`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+@@ -1 +1 @@`
	`2`	`+-Foo Bat Baz`
	`3`	`++Foo Bar Baz`
-Original file line number
+Diff line change
@@ @@ -1,3 +1,3 @@ @@
 [36m@@ -1 +1 @@[0m
 -[31m-F[7mr[0m[31ma[7mm[0m[31me[7mw[0m[31mo[7mr[0m[31mk[0m
 -[32m+Fa[7mc[0m[32me[7mb[0m[32mo[7mo[0m[32mk[0m
 +[31m-[7mFramework[0m[31m[0m
 +[32m+[7mFacebook[0m[32m[0m
-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 [36m@@ -1,2 +1 @@[0m
 [31m-Foo[0m
 -[31m-Ba[7mr[0m[31m[0m
 -[32m+Ba[7mz[0m[32m[0m
 +[31m-[7mBar[0m[31m[0m
 +[32m+[7mBaz[0m[32m[0m