Update recorded playback to build upon new session

[lsp-test.git] / src / Language / Haskell / LSP / Test / Files.hs

diff --git a/src/Language/Haskell/LSP/Test/Files.hs b/src/Language/Haskell/LSP/Test/Files.hs
index 59d51cef5a078212749787c9d6f5b41f089112f0..f82df65cf6cef89640538575cffb69923c32934e 100644 (file)
--- a/src/Language/Haskell/LSP/Test/Files.hs
+++ b/src/Language/Haskell/LSP/Test/Files.hs
@@ -51,17 +51,33 @@ mapUris f event =
     fromClientMsg (NotDidSaveTextDocument n) = NotDidSaveTextDocument $ swapUri (params . textDocument) n
     fromClientMsg (NotDidCloseTextDocument n) = NotDidCloseTextDocument $ swapUri (params . textDocument) n
     fromClientMsg (ReqInitialize r) = ReqInitialize $ params .~ (transformInit (r ^. params)) $ r
+    fromClientMsg (ReqDocumentSymbols r) = ReqDocumentSymbols $ swapUri (params . textDocument) r
+    fromClientMsg (ReqRename r) = ReqRename $ swapUri (params . textDocument) r
     fromClientMsg x = x
 
     fromServerMsg :: FromServerMessage -> FromServerMessage
     fromServerMsg (ReqApplyWorkspaceEdit r) =
-      let newDocChanges = fmap (fmap (swapUri textDocument)) $ r ^. params . edit . documentChanges
-          r1 = (params . edit . documentChanges) .~ newDocChanges $ r
-          newChanges = fmap (swapKeys f) $ r1 ^. params . edit . changes
-          r2 = (params . edit . changes) .~ newChanges $ r1
-      in ReqApplyWorkspaceEdit r2
+      ReqApplyWorkspaceEdit $ params . edit .~ swapWorkspaceEdit (r ^. params . edit) $ r
+
+    fromServerMsg (NotPublishDiagnostics n) = NotPublishDiagnostics $ swapUri params n
+
+    fromServerMsg (RspDocumentSymbols r) = 
+      let newSymbols = fmap (fmap (swapUri location)) $ r ^. result
+      in RspDocumentSymbols $ result .~ newSymbols $ r
+
+    fromServerMsg (RspRename r) =
+      let oldResult = r ^. result :: Maybe WorkspaceEdit
+          newResult = fmap swapWorkspaceEdit oldResult
+      in RspRename $ result .~ newResult $ r
+
     fromServerMsg x = x
 
+    swapWorkspaceEdit :: WorkspaceEdit -> WorkspaceEdit
+    swapWorkspaceEdit e =
+      let newDocChanges = fmap (fmap (swapUri textDocument)) $ e ^. documentChanges
+          newChanges = fmap (swapKeys f) $ e ^. changes
+      in WorkspaceEdit newChanges newDocChanges
+
     swapKeys :: (Uri -> Uri) -> HM.HashMap Uri b -> HM.HashMap Uri b
     swapKeys f = HM.foldlWithKey' (\acc k v -> HM.insert (f k) v acc) HM.empty