dhall-lsp-server: Update to haskell-lsp 0.19 (#1626)

* dhall-lsp-server: Update to haskell-lsp 0.19

* Also update haskell-lsp to 0.19.0.0 in stack.yaml

* Update to lsp-test 0.10

haskell-lsp 0.19 requires at least lsp-test 0.9.

* Override parser-combinators version in stack lts

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: EggBaconAndSpam

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

@@ -53,7 +53,7 @@ library
     , dhall                >= 1.28.0   && < 1.29
     , dhall-json           >= 1.4      && < 1.7
     , filepath             >= 1.4.2    && < 1.5
-    , haskell-lsp          >= 0.15.0.0 && < 0.18
+    , haskell-lsp          >= 0.19.0.0 && < 0.20
     , rope-utf16-splay     >= 0.3.1.0  && < 0.4
     , hslogger             >= 1.2.10   && < 1.4
     , lens                 >= 4.16.1   && < 4.19
@@ -115,8 +115,8 @@ Test-Suite tests
     GHC-Options: -Wall
     Build-Depends:
         base                                   ,
-        haskell-lsp-types >= 0.15.0  && < 0.18 ,
-        lsp-test          >= 0.6     && < 0.9  ,
+        haskell-lsp-types >= 0.19.0  && < 0.20 ,
+        lsp-test          >= 0.9     && < 0.11  ,
         tasty             >= 0.11.2  && < 1.3  ,
         tasty-hspec       >= 1.1     && < 1.2  ,
         text              >= 0.11    && < 1.3

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

@@ -111,7 +111,7 @@ readUri uri = do
   getVirtualFileFunc <- uses lspFuncs LSP.getVirtualFileFunc
   mVirtualFile <- liftIO $ getVirtualFileFunc (J.toNormalizedUri uri)
   case mVirtualFile of
-    Just (LSP.VirtualFile _ rope _) -> return (Rope.toText rope)
+    Just (LSP.VirtualFile _ _ rope) -> return (Rope.toText rope)
     Nothing -> fail $ "Could not find " <> show uri <> " in VFS."
 
 loadFile :: J.Uri -> HandlerM (Expr Src Void)

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

@@ -77,23 +77,19 @@ syncOptions = J.TextDocumentSyncOptions
 -- Server capabilities. Tells the LSP client that we can execute commands etc.
 lspOptions :: LSP.Core.Options
 lspOptions = def { LSP.Core.textDocumentSync = Just syncOptions
-                 , LSP.Core.completionProvider =
-                     Just (J.CompletionOptions {
-                         _resolveProvider = Nothing
-                       , _triggerCharacters = Just [":", ".", "/"] })
-                 , LSP.Core.executeCommandProvider =
-                     -- Note that this registers the dhall.server.lint command
-                     -- with VSCode, which means that our plugin can't expose a
-                     -- command of the same name. In the case of dhall.lint we
-                     -- name the server-side command dhall.server.lint to work
-                     -- around this peculiarity.
-                     Just (J.ExecuteCommandOptions
-                       (J.List ["dhall.server.lint",
-                                "dhall.server.annotateLet",
-                                "dhall.server.freezeImport",
-                                "dhall.server.freezeAllImports"]))
-                 , LSP.Core.documentLinkProvider =
-                    Just (J.DocumentLinkOptions { _resolveProvider = Just False })
+                 , LSP.Core.completionTriggerCharacters = Just [':', '.', '/']
+                 -- Note that this registers the dhall.server.lint command
+                 -- with VSCode, which means that our plugin can't expose a
+                 -- command of the same name. In the case of dhall.lint we
+                 -- name the server-side command dhall.server.lint to work
+                 -- around this peculiarity.
+                 , LSP.Core.executeCommandCommands =
+                     Just
+                       [ "dhall.server.lint",
+                         "dhall.server.annotateLet",
+                         "dhall.server.freezeImport",
+                         "dhall.server.freezeAllImports"
+                       ]
                  }
 
 lspHandlers :: MVar ServerState -> LSP.Core.Handlers

nix/haskell-lsp-types.nix

@@ -4,8 +4,8 @@
 }:
 mkDerivation {
   pname = "haskell-lsp-types";
-  version = "0.17.0.0";
-  sha256 = "77444fa262393ac58b72b5cb6a4b1db401cdea015b42cab427bb4681dcd1230e";
+  version = "0.19.0.0";
+  sha256 = "a942ab1e504d8ae61b586c9b048e3b1422ab793bd908062332180af01beb3921";
   libraryHaskellDepends = [
     aeson base bytestring data-default deepseq filepath hashable lens
     network-uri scientific text unordered-containers

nix/haskell-lsp.nix

@@ -7,8 +7,8 @@
 }:
 mkDerivation {
   pname = "haskell-lsp";
-  version = "0.17.0.0";
-  sha256 = "fdd8c88739a782a8127b880d4326d49ca56e76bd071c4cc0524d49539b2d899d";
+  version = "0.19.0.0";
+  sha256 = "91885a0707e977ca4e6ab2bda4af3cc0ab5d7394e34c970d93e8e5d158965532";
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [

stack.yaml

@@ -9,8 +9,8 @@ packages:
 extra-deps:
   - th-lift-instances-0.1.13@sha256:2852e468511805cb25d9e3923c9e91647d008ab4a764ec0921e5e40ff8a8e874,2625
   - th-lift-0.8.0.1@sha256:cceb81b12c0580e02a7a3898b6d60cca5e1be080741f69ddde4f12210d8ba7ca,1960
-  - haskell-lsp-0.17.0.0
-  - haskell-lsp-types-0.17.0.0
+  - haskell-lsp-0.19.0.0
+  - haskell-lsp-types-0.19.0.0
   - rope-utf16-splay-0.3.1.0@sha256:15a53c57f8413d193054bb5f045929edae3b2669def4c6af63197b30dc1d5003
   - hnix-0.6.1@sha256:13da97c09489ccf0b908fbe7817401137559eebc377c00cd7b8a66b77e8c251b,24519
   - hashing-0.1.0.1@sha256:98861f16791946cdf28e3c7a6ee9ac8b72d546d6e33c569c7087ef18253294e7,2816
@@ -21,12 +21,13 @@ extra-deps:
   - HsYAML-0.2.0.0@sha256:4e554ee481650156a26a71b40f233979cd943f22ee887b70dae3b8b24de2932f,5273
   - HsYAML-aeson-0.2.0.0@sha256:04796abfc01cffded83f37a10e6edba4f0c0a15d45bef44fc5bb4313d9c87757,1791
   - ordered-containers-0.2.2@sha256:ebf2be3f592d9cf148ea6b8375f8af97148d44f82d8d04476899285e965afdbf,810
-  - lsp-test-0.8.0.0
+  - lsp-test-0.10.0.0
   - aeson-yaml-1.0.5.0@sha256:5786f021c1e088d6a5aa259120ec5b1f22bb1757f4427c1a87e0513d00f17f31,1975
   - prettyprinter-1.5.1@sha256:fca87c3e2611d3499a0341a59857e9b424a23f31646e4737d535a18582284f96,5375
   - atomic-write-0.2.0.7@sha256:3b626dfbc288cd070f1ac31b1c15ddd49822a923778ffe21f92b2116ffc72dc3,4584
   - megaparsec-8.0.0
   - cborg-json-0.2.2.0
+  - parser-combinators-1.2.1
 nix:
   packages:
     - ncurses