Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ object Tree {
def empty[T]: Node[T] = Tree.Node[T](Map.empty)

case class Leaf[T](v: T) extends Tree[T] {
override def merge(tree: Tree[T]): Tree[T] = this
override def merge(tree: Tree[T]): Tree[T] = tree
}
case class Node[T](tries: Map[ModifyPath, Tree[T]]) extends Tree[T] {
override def merge(tree: Tree[T]): Tree[T] = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,4 +320,31 @@ class DiffModifyIntegrationTest extends AnyFlatSpec with Matchers with AutoDeriv
)
)
}

it should "allow propagate modification from substituted diff instance" in {
case class Address(house: Int, street: String)
case class Person(name: String, address: Address)

val add = Diff.summon[Address].ignore(_.house)
val d = Diff
.summon[Person]
.modify(_.address)
.setTo(add)

val a1 = Address(123, "Robin St.")
val a2 = Address(456, "Robin St.")

val p1 = Person("Mason", a1)
val p2 = Person("Mason", a2)
d(p1, p2) shouldBe DiffResultObject(
"Person",
ListMap(
"name" -> IdenticalValue("Mason"),
"address" -> DiffResultObject(
"Address",
ListMap("house" -> IdenticalValue("<ignored>"), "street" -> IdenticalValue("Robin St."))
)
)
)
}
}