projects
/
lsp-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #61 from mpickering/wip/persist-virtual-file
[lsp-test.git]
/
src
/
Language
/
Haskell
/
LSP
/
Test.hs
diff --git
a/src/Language/Haskell/LSP/Test.hs
b/src/Language/Haskell/LSP/Test.hs
index b098bf723ec559763951fd3bde1e991837661751..1a3b2e2ad7098511fc9a27ce67480ac6f2adcd95 100644
(file)
--- a/
src/Language/Haskell/LSP/Test.hs
+++ b/
src/Language/Haskell/LSP/Test.hs
@@
-37,6
+37,7
@@
module Language.Haskell.LSP.Test
, module Language.Haskell.LSP.Test.Parsing
-- * Utilities
-- | Quick helper functions for common tasks.
, module Language.Haskell.LSP.Test.Parsing
-- * Utilities
-- | Quick helper functions for common tasks.
+
-- ** Initialization
, initializeResponse
-- ** Documents
-- ** Initialization
, initializeResponse
-- ** Documents
@@
-273,7
+274,7
@@
sendNotification TextDocumentDidOpen params = do
n :: DidOpenTextDocumentNotification
n = NotificationMessage "2.0" TextDocumentDidOpen params'
oldVFS <- vfs <$> get
n :: DidOpenTextDocumentNotification
n = NotificationMessage "2.0" TextDocumentDidOpen params'
oldVFS <- vfs <$> get
-
newVFS <- liftIO $
openVFS oldVFS n
+
let (newVFS,_) =
openVFS oldVFS n
modify (\s -> s { vfs = newVFS })
sendMessage n
modify (\s -> s { vfs = newVFS })
sendMessage n
@@
-283,7
+284,7
@@
sendNotification TextDocumentDidClose params = do
n :: DidCloseTextDocumentNotification
n = NotificationMessage "2.0" TextDocumentDidClose params'
oldVFS <- vfs <$> get
n :: DidCloseTextDocumentNotification
n = NotificationMessage "2.0" TextDocumentDidClose params'
oldVFS <- vfs <$> get
-
newVFS <- liftIO $
closeVFS oldVFS n
+
let (newVFS,_) =
closeVFS oldVFS n
modify (\s -> s { vfs = newVFS })
sendMessage n
modify (\s -> s { vfs = newVFS })
sendMessage n
@@
-292,7
+293,7
@@
sendNotification TextDocumentDidChange params = do
n :: DidChangeTextDocumentNotification
n = NotificationMessage "2.0" TextDocumentDidChange params'
oldVFS <- vfs <$> get
n :: DidChangeTextDocumentNotification
n = NotificationMessage "2.0" TextDocumentDidChange params'
oldVFS <- vfs <$> get
-
newVFS <- liftIO $
changeFromClientVFS oldVFS n
+
let (newVFS,_) =
changeFromClientVFS oldVFS n
modify (\s -> s { vfs = newVFS })
sendMessage n
modify (\s -> s { vfs = newVFS })
sendMessage n
@@
-452,7
+453,7
@@
getVersionedDoc (TextDocumentIdentifier uri) = do
fs <- vfsMap . vfs <$> get
let ver =
case fs Map.!? toNormalizedUri uri of
fs <- vfsMap . vfs <$> get
let ver =
case fs Map.!? toNormalizedUri uri of
- Just
(VirtualFile v _) -> Just v
+ Just
vf -> Just (virtualFileVersion vf)
_ -> Nothing
return (VersionedTextDocumentIdentifier uri ver)
_ -> Nothing
return (VersionedTextDocumentIdentifier uri ver)