include prefix-trailing whitespace in matches not in diffs

yurique · yurique · commit 6482c47b4cf6 · 2020-12-21T12:20:32.000+02:00
diff --git a/stringdiff/src/main/scala/app/tulz/diff/Tokens.scala b/stringdiff/src/main/scala/app/tulz/diff/Tokens.scala
@@ -51,17 +51,15 @@ object Tokens {
       .map { len =>
         (
           len,
-          tokens.take(len) != reference.take(len),
-//          reference.isEmpty || tokens(len - 1) != reference.head,
-          len == tokens.length || !isWhitespace(tokens(len))
+          tokens.take(len) != reference.take(len)
         )
       }
       .toList
-      .takeWhile { case (_, keepGoing, _) =>
+      .takeWhile { case (_, keepGoing) =>
         keepGoing
       }
-      .collect {
-        case (prefixLength, _, keep) if keep => prefixLength
+      .map { case (prefixLength, _) =>
+        prefixLength
       }
       .map { prefixLength =>
         (

Original file line number	Diff line number	Diff line change
`@@ -51,17 +51,15 @@ object Tokens {`
`51`	`51`	`.map { len =>`
`52`	`52`	`(`
`53`	`53`	`len,`
`54`		`- tokens.take(len) != reference.take(len),`
`55`		`-// reference.isEmpty \|\| tokens(len - 1) != reference.head,`
`56`		`- len == tokens.length \|\| !isWhitespace(tokens(len))`
	`54`	`+ tokens.take(len) != reference.take(len)`
`57`	`55`	`)`
`58`	`56`	`}`
`59`	`57`	`.toList`
`60`		`- .takeWhile { case (_, keepGoing, _) =>`
	`58`	`+ .takeWhile { case (_, keepGoing) =>`
`61`	`59`	`keepGoing`
`62`	`60`	`}`
`63`		`- .collect {`
`64`		`- case (prefixLength, _, keep) if keep => prefixLength`
	`61`	`+ .map { case (prefixLength, _) =>`
	`62`	`+ prefixLength`
`65`	`63`	`}`
`66`	`64`	`.map { prefixLength =>`
`67`	`65`	`(`