Skip to content

Commit 2000127

Browse files
Vekhirmmhat
andauthored
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 <mmhat@users.noreply.github.com>
1 parent ab58159 commit 2000127

File tree

10 files changed

+134
-111
lines changed

10 files changed

+134
-111
lines changed

dhall-lsp-server/dhall-lsp-server.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ library
5353
, dhall >= 1.38.0 && < 1.43
5454
, dhall-json >= 1.4 && < 1.8
5555
, filepath >= 1.4.2 && < 1.5
56-
, lsp >= 1.5.0.0 && < 2
56+
, lsp >= 2.1.0.0 && < 2.2
5757
, lens >= 4.16.1 && < 5.3
5858
-- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
5959
, megaparsec >= 7.0.2 && < 10
@@ -104,9 +104,9 @@ Test-Suite tests
104104
GHC-Options: -Wall
105105
Build-Depends:
106106
base ,
107-
lsp-types >= 1.2.0.0 && < 1.7 ,
107+
lsp-types >= 2.0.1 && < 2.1 ,
108108
hspec >= 2.7 && < 2.11 ,
109-
lsp-test >= 0.13.0.0 && < 0.15 ,
109+
lsp-test >= 0.15.0.0 && < 0.16 ,
110110
tasty >= 0.11.2 && < 1.5 ,
111111
tasty-hspec >= 1.1 && < 1.3 ,
112112
text >= 0.11 && < 2.1

dhall-lsp-server/src/Dhall/LSP/Backend/Dhall.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import qualified Dhall.Import as Dhall
4444
import qualified Dhall.Map
4545
import qualified Dhall.Parser as Dhall
4646
import qualified Dhall.TypeCheck as Dhall
47-
import qualified Language.LSP.Types as LSP.Types
47+
import qualified Language.LSP.Protocol.Types as LSP.Types
4848
import qualified Network.URI as URI
4949

5050

0 commit comments

Comments
 (0)