From: Luke Lau <luke_lau@icloud.com>
Date: Sun, 15 Dec 2019 19:14:31 +0000 (+0000)
Subject: Merge pull request #61 from mpickering/wip/persist-virtual-file
X-Git-Tag: 0.9.0.0~5
X-Git-Url: https://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=a7b6c9f03f4878ded66c71ff30529b77110efcb4;hp=f557fbef1bf02076117fabb7d0cefa6434abb358

Merge pull request #61 from mpickering/wip/persist-virtual-file

Track changes to haskell-lsp
---

diff --git a/src/Language/Haskell/LSP/Test.hs b/src/Language/Haskell/LSP/Test.hs
index 4f9cff7..1a3b2e2 100644
--- a/src/Language/Haskell/LSP/Test.hs
+++ b/src/Language/Haskell/LSP/Test.hs
@@ -453,7 +453,7 @@ getVersionedDoc (TextDocumentIdentifier uri) = do
   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)
 
diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 2b6da8e..3426bcc 100644
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -289,7 +289,7 @@ updateState (ReqApplyWorkspaceEdit r) = do
   forM_ bumpedVersions $ \(VersionedTextDocumentIdentifier uri v) ->
     modify $ \s ->
       let oldVFS = vfs s
-          update (VirtualFile oldV t) = VirtualFile (fromMaybe oldV v) t
+          update (VirtualFile oldV file_ver t) = VirtualFile (fromMaybe oldV v) (file_ver + 1) t
           newVFS = updateVFS (Map.adjust update (toNormalizedUri uri)) oldVFS
       in s { vfs = newVFS }