Add fix

Author: pepeiborra

lsp-test/src/Language/LSP/Test/Session.hs

@@ -354,7 +354,10 @@ updateState (FromServerMess SWorkspaceApplyEdit r) = do
   allChangeParams <- case r ^. params . edit . documentChanges of
     Just (List cs) -> do
       mapM_ (checkIfNeedsOpened . documentChangeUri) cs
-      return $ mapMaybe getParamsFromDocumentChange cs
+      -- replace the user provided version numbers with the VFS ones + 1
+      -- (technically we should check that the user versions match the VFS ones)
+      cs' <- traverseOf (traverse . _InL . textDocument) bumpNewestVersion cs
+      return $ mapMaybe getParamsFromDocumentChange cs'
     -- Then fall back to the changes field
     Nothing -> case r ^. params . edit . changes of
       Just cs -> do
@@ -401,7 +404,7 @@ updateState (FromServerMess SWorkspaceApplyEdit r) = do
               return $ s { vfs = newVFS }
 
         getParamsFromTextDocumentEdit :: TextDocumentEdit -> DidChangeTextDocumentParams
-        getParamsFromTextDocumentEdit (TextDocumentEdit docId (List edits)) =
+        getParamsFromTextDocumentEdit (TextDocumentEdit docId (List edits)) = do
           DidChangeTextDocumentParams docId (List $ map editToChangeEvent edits)
 
         editToChangeEvent :: TextEdit |? AnnotatedTextEdit -> TextDocumentContentChangeEvent
@@ -412,6 +415,8 @@ updateState (FromServerMess SWorkspaceApplyEdit r) = do
         getParamsFromDocumentChange (InL textDocumentEdit) = Just $ getParamsFromTextDocumentEdit textDocumentEdit
         getParamsFromDocumentChange _ = Nothing
 
+        bumpNewestVersion (VersionedTextDocumentIdentifier uri _) =
+          head <$> textDocumentVersions uri
 
         -- For a uri returns an infinite list of versions [n,n+1,n+2,...]
         -- where n is the current version

lsp-types/src/Language/LSP/Types/Lens.hs

@@ -9,6 +9,7 @@
 {-# LANGUAGE FlexibleContexts       #-}
 {-# LANGUAGE DataKinds              #-}
 {-# LANGUAGE TypeInType             #-}
+{-# LANGUAGE ExplicitNamespaces #-}
 
 module Language.LSP.Types.Lens where
 
@@ -19,6 +20,7 @@ import           Language.LSP.Types.CodeAction
 import           Language.LSP.Types.CodeLens
 import           Language.LSP.Types.DocumentColor
 import           Language.LSP.Types.Command
+import           Language.LSP.Types.Common (type (|?))
 import           Language.LSP.Types.Completion
 import           Language.LSP.Types.Configuration
 import           Language.LSP.Types.Declaration
@@ -391,3 +393,6 @@ makeFieldsNoPrefix ''SemanticTokensEdit
 makeFieldsNoPrefix ''SemanticTokensDelta
 makeFieldsNoPrefix ''SemanticTokensDeltaPartialResult
 makeFieldsNoPrefix ''SemanticTokensWorkspaceClientCapabilities
+
+-- Unions
+makePrisms ''(|?)