Merge branch 'master' into factor-annotations-out-of-core

Author: robrix

test/Data/Source/Spec.hs

@@ -9,7 +9,7 @@ import Test.Hspec
 
 import qualified Generators as Gen
 import qualified Hedgehog.Gen as Gen
-import           Hedgehog ((===))
+import           Hedgehog ((===), label)
 import qualified Hedgehog.Range
 import           Hedgehog hiding (Range)
 import qualified Test.Tasty as Tasty
@@ -25,11 +25,15 @@ prop desc f
 testTree :: Tasty.TestTree
 testTree = Tasty.testGroup "Data.Source"
   [ Tasty.testGroup "sourceLineRanges"
-    [ prop "produces 1 more range than there are newlines" $
-      \ source -> length (sourceLineRanges source) === succ (Text.count "\n" (toText source))
-
-    , prop "produces exhaustive ranges" $
-      \ source -> foldMap (`slice` source) (sourceLineRanges source) === source
+    [ testProperty "produces 1 more range than there are newlines" $ property $ do
+        source <- forAll (Gen.source (Hedgehog.Range.linear 0 100))
+        label (summarize source)
+        (length (sourceLineRanges source) === length (Text.splitOn "\r\n" (toText source) >>= Text.splitOn "\r" >>= Text.splitOn "\n"))
+
+    , testProperty "produces exhaustive ranges" $ property $ do
+        source <- forAll (Gen.source (Hedgehog.Range.linear 0 100))
+        label (summarize source)
+        foldMap (`slice` source) (sourceLineRanges source) === source
     ]
 
   , Tasty.testGroup "spanToRange"
@@ -68,6 +72,10 @@ testTree = Tasty.testGroup "Data.Source"
     ]
 
   ]
+  where summarize src = case sourceLines src of
+          []  -> "empty"
+          [x] -> if nullSource x then "empty" else "single-line"
+          _   -> "multiple lines"
 
 spec :: Spec
 spec = do

test/Generators.hs

@@ -9,4 +9,4 @@ import qualified Data.Source
 import Data.Functor.Identity
 
 source :: (GenBase m ~ Identity, MonadGen m) => Hedgehog.Range Int -> m Data.Source.Source
-source r = Data.Source.fromUTF8 <$> Gen.utf8 r Gen.unicode
+source r = Data.Source.fromUTF8 <$> Gen.utf8 r (Gen.frequency [ (1, pure '\r'), (1, pure '\n'), (20, Gen.unicode) ])