Commit ⋅ chwthewke/auto-diff

Showing 1 of 2 files from the diff.

...ain/scala/fr/thomasdufour/autodiff/DiffMatch.scala changed.

Other files ignored by Codecov

...cala/fr/thomasdufour/autodiff/InAnyOrderSpec.scala has changed.

@@ -3,6 +3,7 @@

Loading

import cats.data.Ior
import cats.data.NonEmptyList
import cats.syntax.option._
import scala.annotation.tailrec

case class DiffMatch[A]( difference: Option[Difference.Unordered], matches: List[( A, A )] )


@@ -32,31 +33,33 @@

Loading

  )( implicit D: Diff[A], H: Hint[A] ): ( List[A], List[A], List[( A, A )], List[Difference] ) = {
    right.foldRight( ( left.toList, List.empty[A], List.empty[( A, A )], List.empty[Difference] ) ) {
      case ( elem, ( remaining, unmatched, matches, mismatches ) ) =>
        def remainingAfter( matched: A ): List[A] = remaining.filterNot( matched == _ )
        def remainingAfter( matchedIx: Int ): List[A] = remaining.take( matchedIx ) ++ remaining.drop( matchedIx + 1 )

        def explainMismatch( a: A, d: Difference ): Difference = Difference.Tagged( s"at ${H.show( a )}", d )

        def search( prevMis: Option[( A, Difference )], excessMis: Boolean )(
            cands: List[A]
        ): Either[Option[( A, Difference )], A] = cands match {
          case Nil => Left( prevMis.map { case ( a, d ) => ( a, explainMismatch( a, d ) ) } )
          case cand :: more if H( cand, elem ) =>
        @tailrec
        def search( prevMis: Option[( A, Int, Difference )], excessMis: Boolean )(
            cands: List[( A, Int )]
        ): Either[Option[( Int, Difference )], ( A, Int )] = cands match {
          case Nil => Left( prevMis.map { case ( a, ix, d ) => ( ix, explainMismatch( a, d ) ) } )
          case ( cand, ix ) :: more if H( cand, elem ) =>
            D( cand, elem ) match {
              case None => Right( cand )
              case None => Right( ( cand, ix ) )
              case mis @ Some( _ ) =>
                val ( p, e ) =
                  if (excessMis || prevMis.nonEmpty || H.isDefault) ( none, true )
                  else ( mis.map( cand -> _ ), false )
                  else ( mis.map( ( cand, ix, _ ) ), false )
                search( p, e )( more )
            }
          case _ :: more => search( prevMis, excessMis )( more )
        }

        search( none, false )( remaining ) match {
          case Right( newMatch ) => ( remainingAfter( newMatch ), unmatched, ( newMatch, elem ) :: matches, mismatches )
          case Left( None )      => ( remaining, elem :: unmatched, matches, mismatches )
          case Left( Some( ( mismatched, mismatch ) ) ) =>
            ( remainingAfter( mismatched ), unmatched, matches, mismatch :: mismatches )
        search( none, excessMis = false )( remaining.zipWithIndex ) match {
          case Right( ( newMatch, ix ) ) =>
            ( remainingAfter( ix ), unmatched, ( newMatch, elem ) :: matches, mismatches )
          case Left( None ) => ( remaining, elem :: unmatched, matches, mismatches )
          case Left( Some( ( ix, mismatch ) ) ) =>
            ( remainingAfter( ix ), unmatched, matches, mismatch :: mismatches )
        }

    }

Files		•	•	Coverage
auto-diff-core/src/main/scala/fr/thomasdufour/autodiff	215	164	51	76.28%
auto-diff-generic/src/main/scala/fr/thomasdufour/autodiff/derived	32	27	5	84.38%
...f-enumeratum/src/main/scala/fr/thomasdufour/autodiff/extra/enumeratum.scala	1	1	0	100.00%
.../main/scala/fr/thomasdufour/autodiff/extra/scalatest/AutodiffMatchers.scala	5	5	0	100.00%
Project Totals (22 files)	253	197	56	77.87%

default=
TRAVIS_OS_NAME=linux

View CI Build Download

No yaml found.

Create your codecov.yml to customize your Codecov experience

Read the docs

Interact now

The inner-most circle is the entire project, moving away from the center are folders then, finally, a single file. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

The top section represents the entire project. Proceeding with folders and finally individual files. The size and color of each slice is representing the number of statements and the coverage, respectively.

SVG

Each block represents a single file in the project. The size and color of each block is represented by the number of statements and the coverage, respectively.

SVG

Learn more about the coverage sunburst graph

32	33		)( implicit D: Diff[A], H: Hint[A] ): ( List[A], List[A], List[( A, A )], List[Difference] ) = {
33	34		right.foldRight( ( left.toList, List.empty[A], List.empty[( A, A )], List.empty[Difference] ) ) {
34	35		case ( elem, ( remaining, unmatched, matches, mismatches ) ) =>
35		-	def remainingAfter( matched: A ): List[A] = remaining.filterNot( matched == _ )
	36	+	def remainingAfter( matchedIx: Int ): List[A] = remaining.take( matchedIx ) ++ remaining.drop( matchedIx + 1 )
36	37
37	38		def explainMismatch( a: A, d: Difference ): Difference = Difference.Tagged( s"at ${H.show( a )}", d )
38	39
39		-	def search( prevMis: Option[( A, Difference )], excessMis: Boolean )(
40		-	cands: List[A]
41		-	): Either[Option[( A, Difference )], A] = cands match {
42		-	case Nil => Left( prevMis.map { case ( a, d ) => ( a, explainMismatch( a, d ) ) } )
43		-	case cand :: more if H( cand, elem ) =>
	40	+	@tailrec
	41	+	def search( prevMis: Option[( A, Int, Difference )], excessMis: Boolean )(
	42	+	cands: List[( A, Int )]
	43	+	): Either[Option[( Int, Difference )], ( A, Int )] = cands match {
	44	+	case Nil => Left( prevMis.map { case ( a, ix, d ) => ( ix, explainMismatch( a, d ) ) } )
	45	+	case ( cand, ix ) :: more if H( cand, elem ) =>
44	46		D( cand, elem ) match {
45		-	case None => Right( cand )
	47	+	case None => Right( ( cand, ix ) )
46	48		case mis @ Some( _ ) =>
47	49		val ( p, e ) =
48	50		if (excessMis \|\| prevMis.nonEmpty \|\| H.isDefault) ( none, true )
49		-	else ( mis.map( cand -> _ ), false )
	51	+	else ( mis.map( ( cand, ix, _ ) ), false )
50	52		search( p, e )( more )
51	53		}
52	54		case _ :: more => search( prevMis, excessMis )( more )
53	55		}
54	56
55		-	search( none, false )( remaining ) match {
56		-	case Right( newMatch ) => ( remainingAfter( newMatch ), unmatched, ( newMatch, elem ) :: matches, mismatches )
57		-	case Left( None ) => ( remaining, elem :: unmatched, matches, mismatches )
58		-	case Left( Some( ( mismatched, mismatch ) ) ) =>
59		-	( remainingAfter( mismatched ), unmatched, matches, mismatch :: mismatches )
	57	+	search( none, excessMis = false )( remaining.zipWithIndex ) match {
	58	+	case Right( ( newMatch, ix ) ) =>
	59	+	( remainingAfter( ix ), unmatched, ( newMatch, elem ) :: matches, mismatches )
	60	+	case Left( None ) => ( remaining, elem :: unmatched, matches, mismatches )
	61	+	case Left( Some( ( ix, mismatch ) ) ) =>
	62	+	( remainingAfter( ix ), unmatched, matches, mismatch :: mismatches )
60	63		}
61	64
62	65		}

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

3	3		import cats.data.Ior
4	4		import cats.data.NonEmptyList
5	5		import cats.syntax.option._
	6	+	import scala.annotation.tailrec
6	7
7	8		case class DiffMatch[A]( difference: Option[Difference.Unordered], matches: List[( A, A )] )
8	9

Updating our web app

No yaml found.