git.iko.soy/patch
on develop help sign in
Simplify
055f256John Ericson
src/Data/Patch/DMapWithPatchingMove.hs+3−3
compare with develop
unifiedsplit
@@ -259,13 +259,13 @@ instance forall k p
259 Just Refl ->
259 Just Refl ->
260 [ toAfter :=> Const Fixup_Delete ]
260 [ toAfter :=> Const Fixup_Delete ]
261 Nothing ->
261 Nothing ->
262− [ toAfter :=> Const (Fixup_Update $ This $ between :=> From_Move (fromBefore :=> Flip p))
262+ [ toAfter :=> Const (Fixup_Update $ This $ between :=> editBefore)
263− , fromBefore :=> Const (Fixup_Update $ That $ To_Move $ Some toAfter)
263+ , fromBefore :=> Const (Fixup_Update $ That editAfter)
264 ]
264 ]
265 (To_NonMove, From_Move (fromBefore :=> _)) ->
265 (To_NonMove, From_Move (fromBefore :=> _)) ->
266 -- The item is destroyed in the second patch, so indicate that it is
266 -- The item is destroyed in the second patch, so indicate that it is
267 -- destroyed in the source map
267 -- destroyed in the source map
268− [fromBefore :=> Const ( Fixup_Update $ That To_NonMove)]
268+ [fromBefore :=> Const (Fixup_Update $ That To_NonMove)]
269 (To_Move (Some toAfter), _) ->
269 (To_Move (Some toAfter), _) ->
270 [toAfter :=> Const (Fixup_Update $ This $ between :=> editBefore)]
270 [toAfter :=> Const (Fixup_Update $ This $ between :=> editBefore)]
271 (To_NonMove, _) ->
271 (To_NonMove, _) ->