diff --git a/CHANGELOG.md b/CHANGELOG.md index 176be55..f986106 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Unreleased +* Support Diff-1.0 + ## v0.1.0 Initial release diff --git a/skeletest.cabal b/skeletest.cabal index 0b0d91c..ba1611c 100644 --- a/skeletest.cabal +++ b/skeletest.cabal @@ -75,7 +75,7 @@ library , aeson-pretty , ansi-terminal >= 0.4.0 , containers - , Diff >= 0.5 + , Diff >= 1.0 , directory , filepath , ghc ^>= 9.6 || ^>= 9.8 || ^>= 9.10 diff --git a/src/Skeletest/Internal/Utils/Diff.hs b/src/Skeletest/Internal/Utils/Diff.hs index 7768968..9bd8454 100644 --- a/src/Skeletest/Internal/Utils/Diff.hs +++ b/src/Skeletest/Internal/Utils/Diff.hs @@ -2,7 +2,8 @@ module Skeletest.Internal.Utils.Diff ( showLineDiff, ) where -import Data.Algorithm.DiffContext (getContextDiffNew, prettyContextDiff) +import Data.Algorithm.DiffContext (getContextDiff, prettyContextDiff) +import Data.Algorithm.DiffContext qualified as Diff import Data.Text (Text) import Data.Text qualified as Text import Text.PrettyPrint qualified as PP @@ -10,7 +11,7 @@ import Text.PrettyPrint qualified as PP showLineDiff :: (Text, Text) -> (Text, Text) -> Text showLineDiff (fromName, fromContent) (toName, toContent) = Text.pack . PP.render $ - prettyContextDiff (ppText fromName) (ppText toName) ppText $ - getContextDiffNew (Just 5) (Text.lines fromContent) (Text.lines toContent) + prettyContextDiff (ppText fromName) (ppText toName) (ppText . Diff.unnumber) $ + getContextDiff (Just 5) (Text.lines fromContent) (Text.lines toContent) where ppText = PP.text . Text.unpack diff --git a/test/Skeletest/Internal/__snapshots__/SnapshotSpec.snap.md b/test/Skeletest/Internal/__snapshots__/SnapshotSpec.snap.md index 21619cb..3c1f60e 100644 --- a/test/Skeletest/Internal/__snapshots__/SnapshotSpec.snap.md +++ b/test/Skeletest/Internal/__snapshots__/SnapshotSpec.snap.md @@ -33,7 +33,7 @@ Example Result differed from snapshot. Update snapshot with --update. --- expected +++ actual -@@ +@@ -1,4 +1,4 @@ +new1 same1 -old1