on master help sign in
Upgrade to haskell-lsp 0.19 (#254)
8ea5d69Moritz Kiefer
ghcide.cabal+2−2
@@ -41,8 +41,8 @@ library
41 extra,
41 extra,
42 filepath,
42 filepath,
43 hashable,
43 hashable,
44− haskell-lsp-types >= 0.18,
44+ haskell-lsp-types == 0.19.*,
45− haskell-lsp >= 0.18,
45+ haskell-lsp == 0.19.*,
46 mtl,
46 mtl,
47 network-uri,
47 network-uri,
48 prettyprinter-ansi-terminal,
48 prettyprinter-ansi-terminal,
src/Development/IDE/Core/FileStore.hs+3−2
@@ -76,7 +76,8 @@ makeVFSHandle = do
76 modifyVar_ vfsVar $ \(nextVersion, vfs) -> pure $ (nextVersion + 1, ) $
76 modifyVar_ vfsVar $ \(nextVersion, vfs) -> pure $ (nextVersion + 1, ) $
77 case content of
77 case content of
78 Nothing -> Map.delete uri vfs
78 Nothing -> Map.delete uri vfs
79+ -- The second version number is only used in persistFileVFS which we do not use so we set it to 0.
79− Just content -> Map.insert uri (VirtualFile nextVersion (Rope.fromText content)) vfs
80+ Just content -> Map.insert uri (VirtualFile nextVersion 0 (Rope.fromText content)) vfs
80 }
81 }
81
82
82makeLSPVFSHandle :: LspFuncs c -> VFSHandle
83makeLSPVFSHandle :: LspFuncs c -> VFSHandle
@@ -139,7 +140,7 @@ getModificationTimeRule vfs =
139 alwaysRerun
140 alwaysRerun
140 mbVirtual <- liftIO $ getVirtualFile vfs $ filePathToUri' file
141 mbVirtual <- liftIO $ getVirtualFile vfs $ filePathToUri' file
141 case mbVirtual of
142 case mbVirtual of
142− Just (VirtualFile ver _) -> pure (Just $ BS.pack $ show ver, ([], Just $ VFSVersion ver))
143+ Just (virtualFileVersion -> ver) -> pure (Just $ BS.pack $ show ver, ([], Just $ VFSVersion ver))
143 Nothing -> liftIO $ fmap wrap (getModTime file')
144 Nothing -> liftIO $ fmap wrap (getModTime file')
144 `catch` \(e :: IOException) -> do
145 `catch` \(e :: IOException) -> do
145 let err | isDoesNotExistError e = "File does not exist: " ++ file'
146 let err | isDoesNotExistError e = "File does not exist: " ++ file'
stack-ghc-lib.yaml+3−3
@@ -2,9 +2,9 @@ resolver: nightly-2019-09-16
2packages:
2packages:
3- .
3- .
4extra-deps:
4extra-deps:
5−- haskell-lsp-0.18.0.0
5+- haskell-lsp-0.19.0.0
6−- haskell-lsp-types-0.18.0.0
6+- haskell-lsp-types-0.19.0.0
7−- lsp-test-0.8.2.0
7+- lsp-test-0.9.0.0
8- hie-bios-0.3.0
8- hie-bios-0.3.0
9- ghc-lib-parser-8.8.1
9- ghc-lib-parser-8.8.1
10- ghc-lib-8.8.1
10- ghc-lib-8.8.1
stack.yaml+3−3
@@ -2,9 +2,9 @@ resolver: nightly-2019-09-16
2packages:
2packages:
3- .
3- .
4extra-deps:
4extra-deps:
5−- haskell-lsp-0.18.0.0
5+- haskell-lsp-0.19.0.0
6−- haskell-lsp-types-0.18.0.0
6+- haskell-lsp-types-0.19.0.0
7−- lsp-test-0.8.2.0
7+- lsp-test-0.9.0.0
8- hie-bios-0.3.0
8- hie-bios-0.3.0
9nix:
9nix:
10 packages: [zlib]
10 packages: [zlib]
stack84.yaml+3−3
@@ -3,9 +3,9 @@ packages:
3- .
3- .
4
4
5extra-deps:
5extra-deps:
6−- haskell-lsp-0.18.0.0
6+- haskell-lsp-0.19.0.0
7−- haskell-lsp-types-0.18.0.0
7+- haskell-lsp-types-0.19.0.0
8−- lsp-test-0.8.2.0
8+- lsp-test-0.9.0.0
9- rope-utf16-splay-0.3.1.0
9- rope-utf16-splay-0.3.1.0
10- shake-0.18.3
10- shake-0.18.3
11- filepattern-0.1.1
11- filepattern-0.1.1
stack88.yaml+3
@@ -2,6 +2,9 @@ resolver: nightly-2019-12-06
2packages:
2packages:
3- .
3- .
4extra-deps:
4extra-deps:
5+- haskell-lsp-0.19.0.0
6+- haskell-lsp-types-0.19.0.0
7+- lsp-test-0.9.0.0
5- hie-bios-0.3.0
8- hie-bios-0.3.0
6allow-newer: true
9allow-newer: true
7nix:
10nix: