pax_global_header 0000666 0000000 0000000 00000000064 13770073662 0014525 g ustar 00root root 0000000 0000000 52 comment=cbac96d338c195c73fd78a244def1575e8e91874
stringdiff-0.2.0/ 0000775 0000000 0000000 00000000000 13770073662 0013663 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/.gitignore 0000664 0000000 0000000 00000000022 13770073662 0015645 0 ustar 00root root 0000000 0000000 target
.idea
.bsp
stringdiff-0.2.0/.scalafmt.conf 0000664 0000000 0000000 00000001121 13770073662 0016375 0 ustar 00root root 0000000 0000000 version=2.7.3
style = defaultWithAlign
align.openParenCallSite = true
align.openParenDefnSite = true
align.arrowEnumeratorGenerator = true
maxColumn = 180
continuationIndent.defnSite = 2
assumeStandardLibraryStripMargin = true
danglingParentheses.defnSite = true
danglingParentheses.callSite = true
rewrite.rules = [AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifiers]
docstrings = JavaDoc
newlines.afterCurlyLambda = preserve
docstrings.style = Asterisk
docstrings.oneline = unfold
trailingCommas = "never"
optIn.breaksInsideChains = true
includeCurlyBraceInSelectChains = true
stringdiff-0.2.0/CHANGELOG.md 0000664 0000000 0000000 00000000137 13770073662 0015475 0 ustar 00root root 0000000 0000000 # Changelog
### 0.2.0
Better diffing in complicated scenarios.
### 0.1.0
* initial release
stringdiff-0.2.0/LICENSE.md 0000664 0000000 0000000 00000002071 13770073662 0015267 0 ustar 00root root 0000000 0000000 # The MIT License (MIT)
Copyright 2020 Iurii Malchenko
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
stringdiff-0.2.0/README.md 0000664 0000000 0000000 00000015754 13770073662 0015156 0 ustar 00root root 0000000 0000000 
### app.tulz.diff
A library for diff-ing strings.
```scala
"app.tulz" %%% "stringdiff" % "0.2.0"
```
### Usage
#### Output with ANSI colors:
```scala
import app.tulz.diff._
StringDiff("prefix common1 common2 inside1 common3 common4", "common1 common2 inside2 common3 suffix")
// or
StringDiff.withFormat("prefix common1 common2 inside1 common3 common4", "common1 common2 inside2 common3 suffix")(AnsiColorDiffFormat)
```
#### Output without colors
```scala
import app.tulz.diff._
StringDiff.text("prefix common1 common2 inside1 common3 common4", "common1 common2 inside2 common3 suffix")
// or
StringDiff.withFormat("prefix common1 common2 inside1 common3 common4", "common1 common2 inside2 common3 suffix")(TextDiffFormat)
```
```
[prefix |∅]common1 common2 [inside1 |inside2 ]common3 [∅|suffix]
```
#### Raw AST
```scala
import app.tulz.diff._
StringDiff.raw("prefix common1 common2 inside1 common3 common4", "common1 common2 inside2 common3 suffix") // List[DiffBlock]
// OR
StringDiff.withFormat("prefix common1 common2 inside1 common3 common4", "common1 common2 inside2 common3 suffix")(RawDiffFormat) // List[DiffBlock]
```
```scala
List(
Extra(List("prefix", " ")),
Match(List("common1", " ", "common2", " ")),
Different(List("inside1", " "),List("inside2", " ")),
Match(List("common3", " ")),
Missing(List("suffix"))
)
```
#### Custom format
```scala
import app.tulz.diff.StringDiff
import scala.Console._
val customFormat: DiffFormat[String] = (diff: List[DiffBlock]) =>
diff.map {
case DiffBlock.Match(m) => m.mkString
case DiffBlock.Missing(expected) => s"[missing: ${YELLOW}${expected.mkString}${RESET}]"
case DiffBlock.Extra(actual) => s"[extra: ${RED}${actual.mkString}${RESET}]"
case DiffBlock.Different(actual, expected) => s"[expected: ${YELLOW}${expected.mkString}${RESET}, actual: ${RED}${actual.mkString}${RESET}]"
}.mkString
StringDiff.withFormat("prefix common1 common2 inside1 common3 common4", "common1 common2 inside2 inside3 common3 suffix")(customFormat)
StringDiff.withFormat("common1 common2 inside1 inside2 common3 common4 suffix", "prefix common1 common2 inside3 common3")(customFormat)
```
### Examples
```
token1 token2 token3
token1 token2 token3
```
token1 token2 token3
---
```
prefix1 match1 match2 match3
prefix2 match1 match2 match3
```
[prefix2|prefix1] match1 match2 match3
---
```
match1 match2 match3 suffix1
match1 match2 match3 suffix2
```
match1 match2 match3 [suffix2|suffix1]
---
```
match1 match2 inside1 match3
match1 match2 inside2 match3
```
match1 match2 [inside2|inside1] match3
---
```
prefix1 match1 match2 inside1 match3 suffix1
prefix2 match1 match2 inside2 match3 suffix2
```
[prefix2|prefix1] match1 match2 [inside2|inside1] match3 [suffix2|suffix1]
---
```
prefix1 match1 match2 match3
match1 match2 match3
```
[∅|prefix1 ]match1 match2 match3
---
```
match1 match2 match3
prefix1 match1 match2 match3
```
[prefix1 |∅]match1 match2 match3
---
```
match1 match2 match3 suffix1
match1 match2 match3
```
match1 match2 match3[∅| suffix1]
---
```
match1 match2 match3
match1 match2 match3 suffix1
```
match1 match2 match3[ suffix1|∅]
---
```
prefix1 match1 match2 match3 suffix1
match1 match2 match3
```
[∅|prefix1 ]match1 match2 match3[∅| suffix1]
---
```
prefix1 match1 match2 match3 suffix1
match1 match2 match3
```
[∅|prefix1 ]match1 match2 match3[∅| suffix1]
---
```
match1 match2 match3
prefix1 match1 match2 match3 suffix1
```
[prefix1 |∅]match1 match2 match3[ suffix1|∅]
---
```
prefix1 match1 match2 inside1 match3 match4 suffix1
match1 match2 match3 match4
```
[∅|prefix1 ]match1 match2 [∅|inside1 ]match3 match4[∅| suffix1]
---
```
match1 match2 match3 match4
prefix1 match1 match2 inside1 match3 match4 suffix1
```
[prefix1 |∅]match1 match2 [inside1 |∅]match3 match4[ suffix1|∅]
---
```
match1 match2 inside1 match3 match4
prefix1 match1 match2 match3 match4 suffix1
```
[prefix1 |∅]match1 match2 [∅|inside1 ]match3 match4[ suffix1|∅]
---
```
prefix1 match1 match2 match3 match4 suffix1
match1 match2 inside1 match3 match4
```
[∅|prefix1 ]match1 match2 [inside1 |∅]match3 match4[∅| suffix1]
---
## Author
Iurii Malchenko – [@yurique](https://twitter.com/yurique)
## License
`stringdiff` is provided under the [MIT license](https://github.com/tulz-app/stringdiff/blob/main/LICENSE.md).
stringdiff-0.2.0/build.sbt 0000664 0000000 0000000 00000003716 13770073662 0015503 0 ustar 00root root 0000000 0000000 ThisBuild / organization := "app.tulz"
ThisBuild / homepage := Some(url("https://github.com/tulz-app/stringdiff"))
ThisBuild / licenses += ("MIT", url("https://github.com/tulz-app/stringdiff/blob/main/LICENSE.md"))
ThisBuild / developers := List(
Developer(
id = "yurique",
name = "Iurii Malchenko",
email = "i@yurique.com",
url = url("https://github.com/yurique")
)
)
ThisBuild / releasePublishArtifactsAction := PgpKeys.publishSigned.value
ThisBuild / publishTo := sonatypePublishToBundle.value
ThisBuild / pomIncludeRepository := { _ => false }
ThisBuild / sonatypeProfileName := "yurique"
ThisBuild / publishArtifact in Test := false
ThisBuild / publishMavenStyle := true
ThisBuild / releaseCrossBuild := true
lazy val noPublish = Seq(
publishLocal / skip := true,
publish / skip := true,
publishTo := Some(Resolver.file("Unused transient repository", file("target/unusedrepo")))
)
lazy val stringdiff =
crossProject(JVMPlatform, JSPlatform)
.crossType(CrossType.Pure)
.in(file("stringdiff"))
.settings(
scalaVersion := "2.13.4",
crossScalaVersions := Seq("2.12.12", "2.13.4"),
scalacOptions := Seq(
"-unchecked",
"-deprecation",
"-feature",
"-Xlint:nullary-unit,inaccessible,infer-any,missing-interpolator,private-shadow,type-parameter-shadow,poly-implicit-overload,option-implicit,delayedinit-select,stars-align",
"-Xcheckinit",
"-Ywarn-value-discard",
"-language:implicitConversions",
"-encoding",
"utf8"
),
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % "3.2.0" % Test
),
description := "String diff for scala.",
scmInfo := Some(
ScmInfo(
url("https://github.com/tulz-app/stringdiff"),
"scm:git@github.com/tulz-app/stringdiff.git"
)
)
)
lazy val root = project
.in(file("."))
.settings(noPublish)
.aggregate(
stringdiff.js,
stringdiff.jvm
)
stringdiff-0.2.0/doc/ 0000775 0000000 0000000 00000000000 13770073662 0014430 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/doc/images/ 0000775 0000000 0000000 00000000000 13770073662 0015675 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/doc/images/screenshot1.png 0000664 0000000 0000000 00000010645 13770073662 0020647 0 ustar 00root root 0000000 0000000 PNG
IHDR G lIDATx^s'UTRQIrs.,niWq`.qa,n
ఱ
6yOfgz{w𫚝h'#JM|pi>5DOcb!gOdDMu ="9V :t #NجkOJʐz4ZMn˥l[ڽfc2g$\l̚=owBgJmm
?g )i6;LP0M_;zD{1SU-[wǮ*T`->47c7B>Go mQxT@^};:qklX1과dSx[ƲF&_?7g06]q֝g*~ A Gd̄!y|6\-٬ھQl̙ߛ?NڻJF~3EQ_֠o^C=XU6conQge㖷dd#/'ڋhAihG \sNkF63gi7J>5gӎ@˥Fm?鳁aFsM c%W hO{XA1M㴡d RRڜ8..]hlh,
|6\-ʔ?NLa{[~" })Z? ΠT(Ψ qHLgwe:wU S )شsVc9\}h}|37]kkj
i/d6E^g:y<< h+oq{8{\ Z[S[}yuy_P0f \Dä 661}t _kj[57>W]'<ϩ1Wua5^
e6QFMIeæk>r":4z7qC64\K{ٖMmJoH;gN2o3צ],oxNv[<Мaf_m7;vM21
ծOn?Tz]tCQ~Dm J%i\v6uZHn8R発6%9aZ
'YEp]JO4%Ӹ)/JT1.l9{ 8rY,I:Eٴt_.+W?"edĕ:x,ٯMU8\}AigBF>`q<~ӂRq̓ᵒ W/̘+ ;my@:KYu#θC}c6x@^|5'+VO>$-в+9kd^;70F<\]}` &l4Ťk,-.lv:g,b5]&RK$0 YnWKw(sa嘼a7תci6,a[ "8N*7ڳܙ
ma7 q)@ `_jR8ۚ1N1Jڰ8e:&ПWuɡ'R:0ٽDf!\m,'xaUf~_G=Sukv|Z3}X@fx& M剾Nv.@6
gY!pܥgﳍMm `nۚp2]k g~ٗ@}";ǽA 8l.?!52(kvaӵK.Gh|s]m y S| mŦ]dhQhizU[VӪ
Tn6K"EPQLotz,?\5 $gεe16xa
.L W>̬&l>d& b [{3`XA I#" c 0`
X"}V}IIJ1w0ftm@?(eæk>o >exi?ģLjZ5>4hc =N\h &6WxXiF &}|_f)]r1}oZ1
ϐ-)Ǐ>07\JAf9QHAEGj-o|<834*+2c֖t<m>!k
5jQ j[ZE\QlA2WP0 }õqWll
L>cۘ
S֏HS8i @#2j6 0 J"9}6 t1w0fXt EhvD[6\gPt 48uJxmy6XX,#QV-NCjsi,`iƀs_w-7VP4)8lM0XE:D(U9xmtY^1`46C,ٰg> _(:CA ^ii(FCîjsi/[ЪƖWu^~_N]m{ڐ啩F\QlAe6Y;R?Q_ O2 2lV rP\Y@`vN 66
-b(+P G>٭# `Fj- HvUsƦb5a,6Jrcڴ%~O6lvس ~*ЯTpԷw$Cw$q>ϕ-ڴFQ l
9a
Cd=%8hu}.Cjsi6VpB\pyuRxz8M0x7 5f._l x_(Ap96F
L{6Ͽ~l蠒(ΆMxZ (zmknñx_ݱ?\
Qg0s66Wd^Zcm!PE1.vM60nRFqT0l 2Ƅϼϋ7G-q^}⍯KWs13fmgH,
u(E( +ݳ~[lc3XA(*̱t၏vO1ù.6xG`
tѿ٘=̅M.}biqhV%k2ڲi~'W]L`1;cB'Z4oBȶ
Ʀ5P@_[O(=\}XF[OA
x (`6f f(sr"NSBlL{X R Li-@4 ?Ufn }
Tk|fI7Ax~.lcF , ^
MuAV]dӵKr./V.&t3kȎY9eQছb1c !7$vo Ec6VzF^9Dq9Blcbڽy BHqBA!lB!+4B
!BBA!lB!+4B
!BBA!lB!+4B
!BBA!lB!+4B
!BBA!lB!+4B
!BBA!lB!+4B
!BBA!lB!+4B
!BBA!^U IENDB` stringdiff-0.2.0/project/ 0000775 0000000 0000000 00000000000 13770073662 0015331 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/project/build.properties 0000664 0000000 0000000 00000000022 13770073662 0020540 0 ustar 00root root 0000000 0000000 sbt.version=1.4.5
stringdiff-0.2.0/project/plugins.sbt 0000664 0000000 0000000 00000000601 13770073662 0017521 0 ustar 00root root 0000000 0000000 logLevel := Level.Warn
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.1.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
stringdiff-0.2.0/stringdiff/ 0000775 0000000 0000000 00000000000 13770073662 0016022 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/ 0000775 0000000 0000000 00000000000 13770073662 0016611 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/main/ 0000775 0000000 0000000 00000000000 13770073662 0017535 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/main/scala/ 0000775 0000000 0000000 00000000000 13770073662 0020620 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/main/scala/app/ 0000775 0000000 0000000 00000000000 13770073662 0021400 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/ 0000775 0000000 0000000 00000000000 13770073662 0022376 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/ 0000775 0000000 0000000 00000000000 13770073662 0023306 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/AnsiColorDiffFormat.scala 0000664 0000000 0000000 00000001231 13770073662 0030143 0 ustar 00root root 0000000 0000000 package app.tulz.diff
import scala.Console._
object AnsiColorDiffFormat extends DiffFormat[String] {
def apply(diff: List[DiffBlock]): String = {
s"${RESET}${diff.map {
case DiffBlock.Match(m) => s"${UNDERLINED}${m.mkString}${RESET}"
case DiffBlock.Missing(expected) => s"[∅|${YELLOW}${UNDERLINED}${expected.mkString}${RESET}]"
case DiffBlock.Extra(actual) => s"[${RED}${UNDERLINED}${actual.mkString}${RESET}|∅]"
case DiffBlock.Different(actual, expected) => s"[${RED}${UNDERLINED}${actual.mkString}${RESET}|${YELLOW}${UNDERLINED}${expected.mkString}${RESET}]"
}.mkString}"
}
}
stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/DiffBlock.scala 0000664 0000000 0000000 00000000646 13770073662 0026144 0 ustar 00root root 0000000 0000000 package app.tulz.diff
sealed trait DiffBlock extends Product with Serializable
object DiffBlock {
final case class Match(s: List[String]) extends DiffBlock
final case class Different(
actual: List[String],
expected: List[String]
) extends DiffBlock
final case class Missing(
expected: List[String]
) extends DiffBlock
final case class Extra(
actual: List[String]
) extends DiffBlock
}
stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/DiffFormat.scala 0000664 0000000 0000000 00000000234 13770073662 0026333 0 ustar 00root root 0000000 0000000 package app.tulz.diff
trait DiffFormat[Out] extends (List[DiffBlock] => Out)
object DiffFormat {
val ansi: DiffFormat[String] = AnsiColorDiffFormat
}
stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/RawDiffFormat.scala 0000664 0000000 0000000 00000000221 13770073662 0027001 0 ustar 00root root 0000000 0000000 package app.tulz.diff
object RawDiffFormat extends DiffFormat[List[DiffBlock]] {
def apply(diff: List[DiffBlock]): List[DiffBlock] = diff
}
stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/StringDiff.scala 0000664 0000000 0000000 00000007345 13770073662 0026363 0 ustar 00root root 0000000 0000000 package app.tulz.diff
object StringDiff {
import Tokens._
def apply(
actual: String,
expected: String
): String = withFormat(actual, expected)(AnsiColorDiffFormat)
def text(
actual: String,
expected: String
): String = withFormat(actual, expected)(TextDiffFormat)
def raw(
actual: String,
expected: String
): List[DiffBlock] = withFormat(actual, expected)(RawDiffFormat)
def withFormat[T](
actual: String,
expected: String
)(diffFormat: DiffFormat[T]): T = {
val actualTokens = tokenize(actual)
val expectedTokens = tokenize(expected)
val options = diff(actualTokens, expectedTokens, List.empty)
if (options.isEmpty) {
diffFormat(DiffBlock.Match("no diff result - this is probably a bug in app.tulz.stringdiff" :: Nil) :: Nil)
} else {
val collapsed = options.map(collapse).distinct
val withMatchLength = collapsed.map { path =>
val matchLengths = path.collect { case DiffBlock.Match(s) => s.length }
path -> matchLengths.sum
}
val largestMatch = withMatchLength.map(_._2).max
val withLargestMatch = withMatchLength.filter(_._2 == largestMatch).map(_._1)
diffFormat {
withLargestMatch
.minBy(diff => TextDiffFormat(diff).replaceAll("\\s+", "").length).reverse
}
}
}
private def diff(
actual: List[String],
expected: List[String],
path: List[DiffBlock]
): List[List[DiffBlock]] = {
tryEnd(actual, expected, path) ++
tryMatchingPrefix(actual, expected, path) ++
tryExtraPrefix(actual, expected, path) ++
tryMissingPrefix(actual, expected, path)
}
private def tryEnd(
actual: List[String],
expected: List[String],
path: List[DiffBlock]
): List[List[DiffBlock]] = {
if (actual.isEmpty && expected.isEmpty) {
List(path)
} else {
List.empty
}
}
private def tryExtraPrefix(
actual: List[String],
expected: List[String],
path: List[DiffBlock]
): List[List[DiffBlock]] = {
extraPrefixes(actual, expected).flatMap { case (actualTail, actualPrefix) =>
val newPath = DiffBlock.Extra(actualPrefix) :: path
tryEnd(actualTail, expected, path) ++
tryMatchingPrefix(actualTail, expected, newPath) ++
tryMissingPrefix(actualTail, expected, newPath)
}
}
private def tryMissingPrefix(
actual: List[String],
expected: List[String],
path: List[DiffBlock]
): List[List[DiffBlock]] = {
extraPrefixes(expected, actual).flatMap { case (expectedTail, expectedPrefix) =>
val newPath = DiffBlock.Missing(expectedPrefix) :: path
tryEnd(actual, expectedTail, path) ++
tryMatchingPrefix(actual, expectedTail, newPath) ++
tryExtraPrefix(actual, expectedTail, newPath)
}
}
private def tryMatchingPrefix(
actual: List[String],
expected: List[String],
path: List[DiffBlock]
): List[List[DiffBlock]] = {
matchingPrefixes(actual, expected).toList.flatMap { case (actualTail, expectedTail, prefix) =>
val newPath = DiffBlock.Match(prefix) :: path
tryEnd(actualTail, expectedTail, newPath) ++
tryExtraPrefix(actualTail, expectedTail, newPath) ++
tryMissingPrefix(actualTail, expectedTail, newPath)
}
}
private def collapse(diff: List[DiffBlock]): List[DiffBlock] = diff match {
case Nil => Nil
case DiffBlock.Missing(expected) :: DiffBlock.Extra(actual) :: tail => DiffBlock.Different(actual, expected) :: collapse(tail)
case DiffBlock.Extra(actual) :: DiffBlock.Missing(expected) :: tail => DiffBlock.Different(actual, expected) :: collapse(tail)
case head :: tail => head :: collapse(tail)
}
}
stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/TextDiffFormat.scala 0000664 0000000 0000000 00000000741 13770073662 0027203 0 ustar 00root root 0000000 0000000 package app.tulz.diff
object TextDiffFormat extends DiffFormat[String] {
def apply(diff: List[DiffBlock]): String = {
diff.map {
case DiffBlock.Match(m) => m.mkString
case DiffBlock.Missing(expected) => s"[∅|${expected.mkString}]"
case DiffBlock.Extra(actual) => s"[${actual.mkString}|∅]"
case DiffBlock.Different(actual, expected) => s"[${actual.mkString}|${expected.mkString}]"
}.mkString
}
}
stringdiff-0.2.0/stringdiff/src/main/scala/app/tulz/diff/Tokens.scala 0000664 0000000 0000000 00000003624 13770073662 0025563 0 ustar 00root root 0000000 0000000 package app.tulz.diff
object Tokens {
private val whitespace = "\\s".r
private val nonWhitespace = "\\S".r
def isWhitespace(s: String): Boolean = {
whitespace.findFirstIn(s).isDefined
}
def tokenize(s: String): List[String] = {
var result = List.empty[String]
var work = s
while (work.nonEmpty) {
val whiteSpaceIndex = whitespace.findFirstMatchIn(work).fold(work.length)(_.start)
if (whiteSpaceIndex > 0) {
result = work.substring(0, whiteSpaceIndex) :: result
work = work.substring(whiteSpaceIndex)
}
val nonWhiteSpaceIndex = nonWhitespace.findFirstMatchIn(work).fold(work.length)(_.start)
if (nonWhiteSpaceIndex > 0) {
result = work.substring(0, nonWhiteSpaceIndex) :: result
work = work.substring(nonWhiteSpaceIndex)
}
}
result.reverse
}
def matchingPrefixes(
actual: List[String],
expected: List[String]
): Option[(List[String], List[String], List[String])] = { // actualRem rem, expectedRem rem, prefix
(1 to Math.min(actual.length, expected.length))
.takeWhile(len => actual.take(len) == expected.take(len))
.lastOption
.map { commonPrefixLength =>
(
actual.drop(commonPrefixLength),
expected.drop(commonPrefixLength),
actual.take(commonPrefixLength)
)
}
}
def extraPrefixes(
tokens: List[String],
reference: List[String]
): List[(List[String], List[String])] = { // tokens tail, tokens prefix
(1 to tokens.length)
.map { len =>
(
len,
tokens.take(len) != reference.take(len)
)
}
.toList
.takeWhile { case (_, keepGoing) =>
keepGoing
}
.map { case (prefixLength, _) =>
prefixLength
}
.map { prefixLength =>
(
tokens.drop(prefixLength),
tokens.take(prefixLength)
)
}
}
}
stringdiff-0.2.0/stringdiff/src/test/ 0000775 0000000 0000000 00000000000 13770073662 0017570 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/test/scala/ 0000775 0000000 0000000 00000000000 13770073662 0020653 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/test/scala/app/ 0000775 0000000 0000000 00000000000 13770073662 0021433 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/test/scala/app/tulz/ 0000775 0000000 0000000 00000000000 13770073662 0022431 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/test/scala/app/tulz/diff/ 0000775 0000000 0000000 00000000000 13770073662 0023341 5 ustar 00root root 0000000 0000000 stringdiff-0.2.0/stringdiff/src/test/scala/app/tulz/diff/DiffTests.scala 0000664 0000000 0000000 00000013310 13770073662 0026237 0 ustar 00root root 0000000 0000000 package app.tulz.diff
import org.scalatest.funsuite.AnyFunSuite
import org.scalatest.matchers.should.Matchers
class DiffTests extends AnyFunSuite with Matchers {
import DiffBlock._
implicit class StringWithClean(s: String) {
def clean: String = s.trim.replaceAll("\\s+", " ")
}
private def doTest(
name: String,
act: String,
exp: String,
expectedDiff: List[DiffBlock]
): Unit = {
test(name) {
val result = StringDiff.raw(act.clean, exp.clean)
if (result != expectedDiff) {
println()
println("---" * 30)
println("failed diff")
println("actual:")
println(act.clean)
println("expected:")
println(exp.clean)
println("diff:")
println(StringDiff(act.clean, exp.clean))
println("expected:")
println(AnsiColorDiffFormat(expectedDiff))
println("---" * 30)
}
result shouldBe expectedDiff
}
}
doTest(
"equal strings",
"token1 token2 token3",
"token1 token2 token3",
List(Match(List("token1", " ", "token2", " ", "token3")))
)
doTest(
"different prefixes",
"prefix1 match1 match2 match3",
"prefix2 match1 match2 match3",
List(Different(List("prefix1", " "), List("prefix2", " ")), Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"different suffixes",
"match1 match2 match3 suffix1",
"match1 match2 match3 suffix2",
List(Match(List("match1", " ", "match2", " ", "match3", " ")), Extra(List("suffix1")))
)
doTest(
"different token in the middle",
"match1 match2 inside1 match3",
"match1 match2 inside2 match3",
List(Match(List("match1", " ", "match2", " ")), Different(List("inside1", " "), List("inside2", " ")), Match(List("match3")))
)
doTest(
"different prefix and suffix and token in the middle",
"prefix1 match1 match2 inside1 match3 suffix1",
"prefix2 match1 match2 inside2 match3 suffix2",
List(
Different(List("prefix1", " "), List("prefix2", " ")),
Match(List("match1", " ", "match2", " ")),
Different(List("inside1", " "), List("inside2", " ")),
Match(List("match3", " ")),
Extra(List("suffix1"))
)
)
doTest(
"extra prefix in actual",
"prefix1 match1 match2 match3",
"match1 match2 match3 ",
List(Extra(List("prefix1", " ")), Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"missing prefix in actual",
"match1 match2 match3 ",
"prefix1 match1 match2 match3",
List(Missing(List("prefix1", " ")), Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"extra suffix in actual",
"match1 match2 match3 suffix1",
"match1 match2 match3 ",
List(Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"missing suffix in actual",
"match1 match2 match3 ",
"match1 match2 match3 suffix1",
List(Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"extra prefix and suffix in actual",
"prefix1 match1 match2 match3 suffix1",
" match1 match2 match3 ",
List(Extra(List("prefix1", " ")), Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"extra prefix in actual, extra suffix in expected",
"prefix1 match1 match2 match3 suffix1",
" match1 match2 match3 ",
List(Extra(List("prefix1", " ")), Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"missing prefix and suffix in actual",
" match1 match2 match3",
"prefix1 match1 match2 match3 suffix1",
List(Missing(List("prefix1", " ")), Match(List("match1", " ", "match2", " ", "match3")))
)
doTest(
"missing prefix and suffix, extra token in actual",
"prefix1 match1 match2 inside1 match3 match4 suffix1",
" match1 match2 match3 match4 ",
List(Extra(List("prefix1", " ")), Match(List("match1", " ", "match2", " ")), Extra(List("inside1", " ")), Match(List("match3", " ", "match4")))
)
doTest(
"missing prefix and suffix, extra token in expected",
" match1 match2 match3 match4 ",
"prefix1 match1 match2 inside1 match3 match4 suffix1",
List(Missing(List("prefix1", " ")), Match(List("match1", " ", "match2", " ")), Missing(List("inside1", " ")), Match(List("match3", " ", "match4")))
)
doTest(
"missing prefix and suffix in actual, extra token in expected",
" match1 match2 inside1 match3 match4 ",
"prefix1 match1 match2 match3 match4 suffix1",
List(Missing(List("prefix1", " ")), Match(List("match1", " ", "match2", " ")), Extra(List("inside1", " ")), Match(List("match3", " ", "match4")))
)
doTest(
"missing prefix and suffix in expected, extra token in actual",
"prefix1 match1 match2 match3 match4 suffix1",
" match1 match2 inside1 match3 match4 ",
List(Extra(List("prefix1", " ")), Match(List("match1", " ", "match2", " ")), Missing(List("inside1", " ")), Match(List("match3", " ", "match4")))
)
doTest(
"example 1",
"prefix common1 common2 inside1 common3 common4",
"common1 common2 inside2 inside3 common3 suffix",
List(
Extra(List("prefix", " ")),
Match(List("common1", " ", "common2", " ")),
Different(List("inside1", " "), List("inside2", " ", "inside3", " ")),
Match(List("common3", " ")),
Missing(List("suffix"))
)
)
doTest(
"example 2",
"common1 common2 inside1 inside2 common3 common4 suffix",
"prefix common1 common2 inside3 common3",
List(
Missing(List("prefix", " ")),
Match(List("common1", " ", "common2", " ")),
Different(List("inside1", " ", "inside2", " "), List("inside3", " ")),
Match(List("common3"))
)
)
}
stringdiff-0.2.0/version.sbt 0000664 0000000 0000000 00000000040 13770073662 0016054 0 ustar 00root root 0000000 0000000 version in ThisBuild := "0.2.0"