WIP: start updating to lsp-2.0

Towards #1350.

This is a giant pain in the butt.  Lots of names, function signatures,
etc. changed and there doesn't seem to be any documentation/migration
guide explaining how to update.

src/swarm-lang/Swarm/Language/LSP.hs

@@ -7,6 +7,7 @@
 -- See the docs/EDITORS.md to learn how to use it.
 module Swarm.Language.LSP where
 
+import Data.Int (Int32)
 import Control.Lens (to, (^.))
 import Control.Monad (void)
 import Control.Monad.IO.Class
@@ -15,9 +16,9 @@ import Data.Text (Text)
 import Data.Text.IO qualified as Text
 import Language.LSP.Diagnostics
 import Language.LSP.Server
-import Language.LSP.Types (Hover (Hover))
-import Language.LSP.Types qualified as J
-import Language.LSP.Types.Lens qualified as J
+import Language.LSP.Protocol.Types (Hover (Hover))
+import Language.LSP.Protocol.Types qualified as J
+import Language.LSP.Protocol.Lens qualified as J
 import Language.LSP.VFS (VirtualFile (..), virtualFileText)
 import Swarm.Language.LSP.Hover qualified as H
 import Swarm.Language.LSP.VarUsage qualified as VU
@@ -34,15 +35,15 @@ lspMain =
   void $
     runServer $
       ServerDefinition
-        { onConfigurationChange = const $ const $ Right ()
+        { onConfigChange = const $ const $ Right ()
         , defaultConfig = ()
         , doInitialize = \env _req -> pure $ Right env
         , staticHandlers = handlers
         , interpretHandler = \env -> Iso (runLspT env) liftIO
         , options =
             defaultOptions
               { -- set sync options to get DidSave event, as well as Open and Close events.
-                textDocumentSync =
+                optTextDocumentSync =
                   Just
                     ( J.TextDocumentSyncOptions
                         (Just True)
@@ -57,15 +58,17 @@ lspMain =
   -- Using SyncFull seems to handle the debounce for us.
   -- The alternative is to use SyncIncremental, but then then
   -- handler is called for each key-stroke.
-  syncKind = J.TdSyncFull
+  syncKind = J.TextDocumentSyncKind_Full
 
 diagnosticSourcePrefix :: Text
 diagnosticSourcePrefix = "swarm-lsp"
 
 debug :: (MonadIO m) => Text -> m ()
 debug msg = liftIO $ Text.hPutStrLn stderr $ "[swarm-lsp] " <> msg
 
-validateSwarmCode :: J.NormalizedUri -> J.TextDocumentVersion -> Text -> LspM () ()
+type TextDocumentVersion = Int32
+
+validateSwarmCode :: J.NormalizedUri -> TextDocumentVersion -> Text -> LspM () ()
 validateSwarmCode doc version content = do
   -- debug $ "Validating: " <> from (show doc) <> " ( " <> content <> ")"
 

src/swarm-lang/Swarm/Language/LSP/Hover.hs

@@ -27,7 +27,7 @@ import Data.Maybe (catMaybes, fromMaybe)
 import Data.Text (Text)
 import Data.Text qualified as T
 import Data.Text.Utf16.Rope qualified as R
-import Language.LSP.Types qualified as J
+import Language.LSP.Protocol.Types qualified as J
 import Language.LSP.VFS
 import Swarm.Language.Context as Ctx
 import Swarm.Language.Module (Module (..))
@@ -53,11 +53,10 @@ lspToRopePosition (J.Position myLine myCol) =
 
 showHoverInfo ::
   J.NormalizedUri ->
-  J.TextDocumentVersion ->
   J.Position ->
   VirtualFile ->
   Maybe (Text, Maybe J.Range)
-showHoverInfo _ _ p vf@(VirtualFile _ _ myRope) =
+showHoverInfo _ p vf@(VirtualFile _ _ myRope) =
   case readTerm' content of
     Left _ -> Nothing
     Right Nothing -> Nothing

src/swarm-lang/Swarm/Language/LSP/VarUsage.hs

@@ -12,7 +12,7 @@ import Data.Set (Set)
 import Data.Set qualified as S
 import Data.Text (Text)
 import Data.Text qualified as T
-import Language.LSP.Types qualified as J
+import Language.LSP.Protocol.Types qualified as J
 import Swarm.Language.Parse qualified as P
 import Swarm.Language.Syntax
 import Swarm.Util qualified as U

swarm.cabal

@@ -131,7 +131,8 @@ library swarm-lang
                       containers,
                       extra,
                       lens,
-                      lsp                           >= 1.6 && < 1.7,
+                      lsp                           >= 2.0 && < 2.5,
+                      lsp-types                     >= 2.0 && < 2.2,
                       hashable,
                       megaparsec,
                       mtl,