haskell-lsp-types 0.19.0.0 → 0.20.0.0

raw patch · 4 files changed

+26/−8 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ChangeLog.md +8/−0
• haskell-lsp-types.cabal +1/−1
• src/Language/Haskell/LSP/Types/Uri.hs +15/−5
• src/Language/Haskell/LSP/Types/WorkspaceEdit.hs +2/−2

@@ -1,5 +1,13 @@ # Revision history for haskell-lsp-types +## 0.20.0.0++* Don't log errors for '$/' notifications (@jinwoo)+* Force utf8 encoding when writing vfs temp files (@jneira)+* Store a hash in a NormalizedUri (@mpickering)+* Move "Semigroup WorkspaceEdit" instance (@sheaf)+* Fix vfs line endings (@jneira)+ ## 0.19.0.0 -- 2019-12-14  * Fix vfs line endings (@jneira)

@@ -1,5 +1,5 @@ name:                haskell-lsp-types-version:             0.19.0.0+version:             0.20.0.0 synopsis:            Haskell library for the Microsoft Language Server Protocol, data types  description:         An implementation of the types to allow language implementors to

@@ -22,17 +22,27 @@ -- | When URIs are supposed to be used as keys, it is important to normalize -- the percent encoding in the URI since URIs that only differ -- when it comes to the percent-encoding should be treated as equivalent.-newtype NormalizedUri = NormalizedUri Text-  deriving (Eq,Ord,Read,Show,Generic,Hashable)+--+-- If you care about performance then you should use a hash map. The keys+-- are cached in order to make hashing very fast.+data NormalizedUri = NormalizedUri !Int !Text+  deriving (Read,Show,Generic, Eq) +-- Slow but compares paths alphabetically as you would expect.+instance Ord NormalizedUri where+  compare (NormalizedUri _ u1) (NormalizedUri _ u2) = compare u1 u2++instance Hashable NormalizedUri where+  hash (NormalizedUri h _) = h+ toNormalizedUri :: Uri -> NormalizedUri-toNormalizedUri uri =-    NormalizedUri $ T.pack $ escapeURIString isUnescapedInURI $ unEscapeString $ T.unpack t+toNormalizedUri uri = NormalizedUri (hash norm) norm   where (Uri t) = maybe uri filePathToUri (uriToFilePath uri)         -- To ensure all `Uri`s have the file path like the created ones by `filePathToUri`+        norm = T.pack $ escapeURIString isUnescapedInURI $ unEscapeString $ T.unpack t  fromNormalizedUri :: NormalizedUri -> Uri-fromNormalizedUri (NormalizedUri t) = Uri t+fromNormalizedUri (NormalizedUri _ t) = Uri t  fileScheme :: String fileScheme = "file:"

@@ -153,12 +153,12 @@   mempty = WorkspaceEdit Nothing Nothing   mappend (WorkspaceEdit a b) (WorkspaceEdit c d) = WorkspaceEdit (a <> c) (b <> d) -deriveJSON lspOptions ''WorkspaceEdit- #if __GLASGOW_HASKELL__ >= 804 instance Semigroup WorkspaceEdit where   (<>) = mappend #endif++deriveJSON lspOptions ''WorkspaceEdit  -- ---------------------------------------------------------------------