haskell-lsp-types 0.11.0.0 → 0.12.0.0

raw patch · 6 files changed

+36/−9 lines, 6 filesdep +deepseqPVP ok

version bump matches the API change (PVP)

Dependencies added: deepseq

API changes (from Hackage documentation)

Files

• ChangeLog.md +1/−0
• haskell-lsp-types.cabal +2/−1
• src/Language/Haskell/LSP/Types/Diagnostic.hs +12/−3
• src/Language/Haskell/LSP/Types/List.hs +6/−1
• src/Language/Haskell/LSP/Types/Location.hs +9/−3
• src/Language/Haskell/LSP/Types/Uri.hs +6/−1

@@ -4,6 +4,7 @@  * Fix `window/progress/cancel` notification being a from server   notification when it should be a from client notification+* Fix typo in FoldingRange request name  ## 0.10.0.0 -- 2019-04-22 

@@ -1,5 +1,5 @@ name:                haskell-lsp-types-version:             0.11.0.0+version:             0.12.0.0 synopsis:            Haskell library for the Microsoft Language Server Protocol, data types  description:         An implementation of the types to allow language implementors to@@ -49,6 +49,7 @@                      , aeson >=1.0.0.0                      , bytestring                      , data-default+                     , deepseq                      , filepath                      , hashable                      , lens >= 4.15.2

@@ -1,11 +1,14 @@ {-# LANGUAGE DuplicateRecordFields      #-} {-# LANGUAGE TemplateHaskell            #-}+{-# LANGUAGE DeriveGeneric              #-}  module Language.Haskell.LSP.Types.Diagnostic where +import           Control.DeepSeq import qualified Data.Aeson                                 as A import           Data.Aeson.TH import           Data.Text+import           GHC.Generics import           Language.Haskell.LSP.Types.Constants import           Language.Haskell.LSP.Types.List import           Language.Haskell.LSP.Types.Location@@ -38,8 +41,10 @@   | DsWarning -- ^ Warning = 2,   | DsInfo    -- ^ Info = 3,   | DsHint    -- ^ Hint = 4-  deriving (Eq,Ord,Show,Read)+  deriving (Eq,Ord,Show,Read, Generic) +instance NFData DiagnosticSeverity+ instance A.ToJSON DiagnosticSeverity where   toJSON DsError   = A.Number 1   toJSON DsWarning = A.Number 2@@ -76,8 +81,10 @@   DiagnosticRelatedInformation     { _location :: Location     , _message  :: Text-    } deriving (Show, Read, Eq, Ord)+    } deriving (Show, Read, Eq, Ord, Generic) +instance NFData DiagnosticRelatedInformation+ deriveJSON lspOptions ''DiagnosticRelatedInformation  -- ---------------------------------------------------------------------@@ -134,6 +141,8 @@     , _source             :: Maybe DiagnosticSource     , _message            :: Text     , _relatedInformation :: Maybe (List DiagnosticRelatedInformation)-    } deriving (Show, Read, Eq, Ord)+    } deriving (Show, Read, Eq, Ord, Generic)++instance NFData Diagnostic  deriveJSON lspOptions ''Diagnostic

@@ -3,15 +3,20 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE DeriveTraversable          #-}+{-# LANGUAGE DeriveGeneric              #-} module Language.Haskell.LSP.Types.List where +import           Control.DeepSeq import qualified Data.Aeson                                 as A import           Data.Aeson.Types+import           GHC.Generics  -- | This data type is used to host a FromJSON instance for the encoding used by -- elisp, where an empty list shows up as "null" newtype List a = List [a]-                deriving (Show,Read,Eq,Ord,Monoid,Functor,Foldable,Traversable)+                deriving (Show,Read,Eq,Ord,Monoid,Functor,Foldable,Traversable,Generic)++instance NFData a => NFData (List a)  instance (A.ToJSON a) => A.ToJSON (List a) where   toJSON (List ls) = toJSON ls

@@ -1,7 +1,10 @@ {-# LANGUAGE TemplateHaskell            #-}+{-# LANGUAGE DeriveGeneric              #-} module Language.Haskell.LSP.Types.Location where +import           Control.DeepSeq import           Data.Aeson.TH+import           GHC.Generics import           Language.Haskell.LSP.Types.Constants import           Language.Haskell.LSP.Types.Uri @@ -39,8 +42,9 @@   Position     { _line      :: Int     , _character :: Int-    } deriving (Show, Read, Eq, Ord)+    } deriving (Show, Read, Eq, Ord, Generic) +instance NFData Position deriveJSON lspOptions ''Position  -- ---------------------------------------------------------------------@@ -68,8 +72,9 @@   Range     { _start :: Position     , _end   :: Position-    } deriving (Show, Read, Eq, Ord)+    } deriving (Show, Read, Eq, Ord, Generic) +instance NFData Range deriveJSON lspOptions ''Range  -- ---------------------------------------------------------------------@@ -88,6 +93,7 @@   Location     { _uri   :: Uri     , _range :: Range-    } deriving (Show, Read, Eq, Ord)+    } deriving (Show, Read, Eq, Ord, Generic) +instance NFData Location deriveJSON lspOptions ''Location

@@ -1,17 +1,22 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-}+{-# LANGUAGE DeriveGeneric #-} module Language.Haskell.LSP.Types.Uri where +import           Control.DeepSeq import qualified Data.Aeson                                 as A import           Data.Hashable import           Data.Text                                  (Text) import qualified Data.Text                                  as T+import           GHC.Generics import           Network.URI import qualified System.FilePath.Posix                      as FPP import qualified System.FilePath.Windows                    as FPW import qualified System.Info  newtype Uri = Uri { getUri :: Text }-  deriving (Eq,Ord,Read,Show,A.FromJSON,A.ToJSON,Hashable,A.ToJSONKey,A.FromJSONKey)+  deriving (Eq,Ord,Read,Show,Generic,A.FromJSON,A.ToJSON,Hashable,A.ToJSONKey,A.FromJSONKey)++instance NFData Uri  fileScheme :: String fileScheme = "file:"