Fix bounds and instances for UInt

Author: michaelpj

lsp-types/lsp-types.cabal

@@ -87,7 +87,6 @@ library
                      , mtl
                      , network-uri
                      , mod
-                     , semirings
                      , rope-utf16-splay >= 0.3.1.0
                      , scientific
                      , some

lsp-types/src/Language/LSP/Types/Common.hs

@@ -18,29 +18,32 @@ module Language.LSP.Types.Common (
 import Control.Applicative
 import Control.DeepSeq
 import Data.Aeson
-import Data.Coerce (coerce)
-import Data.Euclidean as E
 import Data.Int (Int32)
 import Data.Mod.Word
 import Text.Read (Read(readPrec))
 import GHC.Generics hiding (UInt)
+import GHC.TypeNats hiding (Mod)
+import Data.Bifunctor (bimap)
 
 -- | The "uinteger" type in the LSP spec.
 --
 -- Unusually, this is a **31**-bit unsigned integer, not a 32-bit one.
-newtype UInt = UInt (Mod 31)
-  deriving newtype (Num, Bounded, Enum, Eq, Ord, Show)
+newtype UInt = UInt (Mod (2^31))
+  deriving newtype (Num, Bounded, Enum, Eq, Ord)
   deriving stock (Generic)
   deriving anyclass (NFData)
 
+instance Show UInt where
+  show (UInt u) = show $ unMod u
+
 instance Read UInt where
   readPrec = fromInteger <$> readPrec
 
 instance Real UInt where
   toRational (UInt u) = toRational $ unMod u
 
 instance Integral UInt where
-  quotRem (UInt x) (UInt y) = coerce $ E.quotRem x y
+  quotRem (UInt x) (UInt y) = bimap fromIntegral fromIntegral $ quotRem (unMod x) (unMod y)
   toInteger (UInt u) = toInteger $ unMod u
 
 instance ToJSON UInt where