Move the remaining Listable instances into the tests.

semantic-diff.cabal

@@ -98,7 +98,6 @@ library
                      , gitrev
                      , hashable
                      , kdt
-                     , leancheck
                      , mersenne-random-pure64
                      , MonadRandom
                      , mtl

src/Data/Range.hs

@@ -9,7 +9,6 @@ module Data.Range
 import Data.Semigroup
 import Data.Text.Prettyprint.Doc
 import GHC.Generics
-import Test.LeanCheck
 
 -- | A half-open interval of integers, defined by start & end indices.
 data Range = Range { start :: {-# UNPACK #-} !Int, end :: {-# UNPACK #-} !Int }
@@ -36,8 +35,5 @@ instance Semigroup Range where
 instance Ord Range where
   a <= b = start a <= start b
 
-instance Listable Range where
-  tiers = cons2 Range
-
 instance Pretty Range where
   pretty (Range from to) = pretty from <> pretty '-' <> pretty to

src/Data/Source.hs

@@ -23,14 +23,12 @@ module Data.Source
 , spanToRangeInLineRanges
 , sourceLineRangesByLineNumber
 , rangeToSpan
--- Listable
-, ListableByteString(..)
 ) where
 
 import Control.Arrow ((&&&))
 import Data.Array
 import qualified Data.ByteString as B
-import Data.Char (chr, ord)
+import Data.Char (ord)
 import Data.List (span)
 import Data.Monoid (First(..), Last(..))
 import Data.Range
@@ -39,7 +37,6 @@ import Data.Span
 import Data.String (IsString(..))
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
-import Test.LeanCheck
 
 -- | The contents of a source file, represented as a 'ByteString'.
 newtype Source = Source { sourceBytes :: B.ByteString }
@@ -144,16 +141,3 @@ instance Semigroup Source where
 instance Monoid Source where
   mempty = Source B.empty
   mappend = (<>)
-
-instance Listable Source where
-  tiers = (Source . unListableByteString) `mapT` tiers
-
-newtype ListableByteString = ListableByteString { unListableByteString :: B.ByteString }
-
-instance Listable ListableByteString where
-  tiers = (ListableByteString . T.encodeUtf8 . T.pack) `mapT` strings
-    where strings = foldr ((\\//) . listsOf . toTiers) []
-            [ ['a'..'z'] <> ['A'..'Z'] <> ['0'..'9']
-            , [' '..'/'] <> [':'..'@'] <> ['['..'`'] <> ['{'..'~']
-            , [chr 0x00..chr 0x1f] <> [chr 127] -- Control characters.
-            , [chr 0xa0..chr 0x24f] ] -- Non-ASCII.

src/Data/Span.hs

@@ -15,7 +15,6 @@ import Data.Hashable (Hashable)
 import Data.Semigroup
 import Data.Text.Prettyprint.Doc
 import GHC.Generics
-import Test.LeanCheck
 
 -- | Source position information
 data Pos = Pos
@@ -57,12 +56,6 @@ instance A.FromJSON Span where
       o .: "start" <*>
       o .: "end"
 
-instance Listable Pos where
-  tiers = cons2 Pos
-
-instance Listable Span where
-  tiers = cons2 Span
-
 instance Pretty Pos where
   pretty Pos{..} = pretty posLine <> colon <> pretty posColumn
 

test/Data/Functor/Listable.hs

@@ -29,9 +29,16 @@ module Data.Functor.Listable
 import qualified Category
 import Control.Monad.Free as Free
 import Control.Monad.Trans.Free as FreeF
+import Data.ByteString (ByteString)
+import Data.Char (chr, ord)
 import Data.Functor.Both
+import Data.Range
 import Data.Record
-import Data.Text
+import Data.Semigroup
+import Data.Source
+import Data.Span
+import Data.Text as T (Text, pack)
+import qualified Data.Text.Encoding as T
 import Data.These
 import Diff
 import Patch
@@ -285,3 +292,26 @@ instance Listable Declaration where
     =  cons1 (MethodDeclaration)
     \/ cons1 (FunctionDeclaration)
     \/ cons1 (flip ErrorDeclaration Nothing)
+
+
+instance Listable Range where
+  tiers = cons2 Range
+
+
+instance Listable Pos where
+  tiers = cons2 Pos
+
+instance Listable Span where
+  tiers = cons2 Span
+
+
+instance Listable Source where
+  tiers = fromBytes `mapT` tiers
+
+instance Listable ByteString where
+  tiers = (T.encodeUtf8 . T.pack) `mapT` strings
+    where strings = foldr ((\\//) . listsOf . toTiers) []
+            [ ['a'..'z'] <> ['A'..'Z'] <> ['0'..'9']
+            , [' '..'/'] <> [':'..'@'] <> ['['..'`'] <> ['{'..'~']
+            , [chr 0x00..chr 0x1f] <> [chr 127] -- Control characters.
+            , [chr 0xa0..chr 0x24f] ] -- Non-ASCII.

test/SourceSpec.hs

@@ -1,6 +1,7 @@
 module SourceSpec where
 
 import Data.Char (chr)
+import Data.Functor.Listable
 import Data.Range
 import Data.Semigroup
 import Data.Source
@@ -20,7 +21,7 @@ spec = parallel $ do
       \ source -> foldMap (`slice` source) (sourceLineRanges source) `shouldBe` source
 
   describe "spanToRange" $ do
-    prop "computes single-line ranges" . forAll (unListableByteString `mapT` tiers) $
+    prop "computes single-line ranges" $
       \ s -> let source = fromBytes s
                  spans = zipWith (\ i Range {..} -> Span (Pos i 1) (Pos i (succ (end - start)))) [1..] ranges
                  ranges = sourceLineRanges source in