feat: Add support for LSP 2 (#2560)

* feat: Add support for LSP 2 * fix: Update CI lsp versions lsp 2.x needs 'row-types' --------- Co-authored-by: Mann mit Hut <[email protected]>
dhall-lang · Dec 25, 2023 · 2000127 · 2000127
1 parent ab58159
commit 2000127
Show file tree

Hide file tree

Showing 10 changed files with 134 additions and 111 deletions.
diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal
@@ -53,7 +53,7 @@ library
     , dhall                >= 1.38.0   && < 1.43
     , dhall-json           >= 1.4      && < 1.8
     , filepath             >= 1.4.2    && < 1.5
-    , lsp                  >= 1.5.0.0  && < 2
+    , lsp                  >= 2.1.0.0  && < 2.2
     , lens                 >= 4.16.1   && < 5.3
     -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
     , megaparsec           >= 7.0.2    && < 10
@@ -104,9 +104,9 @@ Test-Suite tests
     GHC-Options: -Wall
     Build-Depends:
         base                                    ,
-        lsp-types         >= 1.2.0.0  && < 1.7  ,
+        lsp-types         >= 2.0.1    && < 2.1  ,
         hspec             >= 2.7      && < 2.11 ,
-        lsp-test          >= 0.13.0.0 && < 0.15 ,
+        lsp-test          >= 0.15.0.0 && < 0.16 ,
         tasty             >= 0.11.2   && < 1.5  ,
         tasty-hspec       >= 1.1      && < 1.3  ,
         text              >= 0.11     && < 2.1

diff --git a/dhall-lsp-server/src/Dhall/LSP/Backend/Dhall.hs b/dhall-lsp-server/src/Dhall/LSP/Backend/Dhall.hs
@@ -44,7 +44,7 @@ import qualified Dhall.Import       as Dhall
 import qualified Dhall.Map
 import qualified Dhall.Parser       as Dhall
 import qualified Dhall.TypeCheck    as Dhall
-import qualified Language.LSP.Types as LSP.Types
+import qualified Language.LSP.Protocol.Types as LSP.Types
 import qualified Network.URI        as URI