From: Luke Lau <luke_lau@icloud.com>
Date: Thu, 9 May 2019 10:01:03 +0000 (+0100)
Subject: Merge pull request #36 from alanz/az-hie-bios
X-Git-Tag: 0.5.2.2
X-Git-Url: http://git.lukelau.me/?p=lsp-test.git;a=commitdiff_plain;h=07287dee784681a0334eae15cd6c158321941b60;hp=59380ca81c003f777fdfd48b92fbe873474fb9a8

Merge pull request #36 from alanz/az-hie-bios

Adapt to new VirtualFile structure
---

diff --git a/lsp-test.cabal b/lsp-test.cabal
index 7997540..9969500 100644
--- a/lsp-test.cabal
+++ b/lsp-test.cabal
@@ -1,5 +1,5 @@
 name:                lsp-test
-version:             0.5.2.1
+version:             0.5.2.2
 synopsis:            Functional test framework for LSP servers.
 description:
   A test framework for writing tests against
@@ -36,7 +36,7 @@ library
                      , parser-combinators:Control.Applicative.Combinators
   default-language:    Haskell2010
   build-depends:       base >= 4.10 && < 5
-                     , haskell-lsp == 0.12.*
+                     , haskell-lsp >= 0.12.1 && < 0.13
                      , aeson
                      , aeson-pretty
                      , ansi-terminal
@@ -78,7 +78,7 @@ test-suite tests
   build-depends:       base >= 4.10 && < 5
                      , hspec
                      , lens
-                     , haskell-lsp == 0.12.*
+                     , haskell-lsp >= 0.12.1 && < 0.13
                      , lsp-test
                      , data-default
                      , aeson
diff --git a/src/Language/Haskell/LSP/Test.hs b/src/Language/Haskell/LSP/Test.hs
index 696f84a..6156b00 100644
--- a/src/Language/Haskell/LSP/Test.hs
+++ b/src/Language/Haskell/LSP/Test.hs
@@ -436,7 +436,7 @@ getVersionedDoc (TextDocumentIdentifier uri) = do
   fs <- vfs <$> get
   let ver =
         case fs Map.!? uri of
-          Just (VirtualFile v _) -> Just v
+          Just (VirtualFile v _ _) -> Just v
           _ -> Nothing
   return (VersionedTextDocumentIdentifier uri ver)
 
diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs
index 291a3e0..a3ba35b 100644
--- a/src/Language/Haskell/LSP/Test/Session.hs
+++ b/src/Language/Haskell/LSP/Test/Session.hs
@@ -256,7 +256,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 t mf) = VirtualFile (fromMaybe oldV v) t mf
           newVFS = Map.adjust update uri oldVFS
       in s { vfs = newVFS }
 
diff --git a/stack.yaml b/stack.yaml
index 90c3122..5045e7f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -3,6 +3,6 @@ packages:
   - .
 
 extra-deps:
-  - haskell-lsp-0.12.0.0
-  - haskell-lsp-types-0.12.0.0
-  - rope-utf16-splay-0.2.0.0
+  - haskell-lsp-0.12.1.0
+  - haskell-lsp-types-0.12.1.0
+  - rope-utf16-splay-0.3.1.0