HLS for the new generated LSP 2 release

cabal.project

@@ -56,7 +56,7 @@ package *
 
 write-ghc-environment-files: never
 
-index-state: 2023-05-13T12:00:00Z
+index-state: 2023-06-17T12:00:00Z
 
 constraints:
   -- For GHC 9.4, older versions of entropy fail to build on Windows

configuration-ghc-90.nix

@@ -24,6 +24,10 @@ let
 
       ghc-lib-parser = hself.callCabal2nix "ghc-lib-parser" inputs.ghc-lib-parser-94 {};
 
+      lsp = hself.callCabal2nix "lsp" inputs.lsp {};
+      lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
+      lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
+
       hlint = appendConfigureFlag (hself.callCabal2nix "hlint" inputs.hlint-35 {}) "-fghc-lib";
 
       hls-hlint-plugin = hself.callCabal2nixWithOptions "hls-hlint-plugin"

configuration-ghc-92.nix

@@ -41,6 +41,10 @@ let
 
       implicit-hie-cradle = hself.callCabal2nix "implicit-hie-cradle" inputs.haskell-implicit-hie-cradle { };
 
+      lsp = hself.callCabal2nix "lsp" inputs.lsp {};
+      lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
+      lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
+
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =
         hself.callCabal2nixWithOptions "haskell-language-server" ./.

configuration-ghc-94.nix

@@ -17,6 +17,10 @@ let
 
       stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
 
+      lsp = hself.callCabal2nix "lsp" inputs.lsp {};
+      lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
+      lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
+
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =
         hself.callCabal2nixWithOptions "haskell-language-server" ./.

configuration-ghc-96.nix

@@ -54,6 +54,10 @@ let
 
       stylish-haskell = appendConfigureFlag  hsuper.stylish-haskell "-fghc-lib";
 
+      lsp = hself.callCabal2nix "lsp" inputs.lsp {};
+      lsp-types = hself.callCabal2nix "lsp-types" inputs.lsp-types {};
+      lsp-test = hself.callCabal2nix "lsp-test" inputs.lsp-test {};
+
       # Re-generate HLS drv excluding some plugins
       haskell-language-server =
         hself.callCabal2nixWithOptions "haskell-language-server" ./.

exe/Main.hs

@@ -4,33 +4,33 @@
 {-# LANGUAGE OverloadedStrings #-}
 module Main(main) where
 
-import           Control.Arrow                ((&&&))
-import           Control.Monad.IO.Class       (liftIO)
-import           Data.Function                ((&))
-import           Data.Text                    (Text)
-import qualified Development.IDE.Main         as GhcideMain
-import           Development.IDE.Types.Logger (Doc, Priority (Error, Info),
-                                               WithPriority (WithPriority, priority),
-                                               cfilter, cmapWithPrio,
-                                               defaultLayoutOptions,
-                                               layoutPretty,
-                                               makeDefaultStderrRecorder,
-                                               payload, renderStrict,
-                                               withDefaultRecorder)
-import qualified Development.IDE.Types.Logger as Logger
-import qualified HlsPlugins                   as Plugins
-import           Ide.Arguments                (Arguments (..),
-                                               GhcideArguments (..),
-                                               getArguments)
-import           Ide.Main                     (defaultMain)
-import qualified Ide.Main                     as IdeMain
-import           Ide.PluginUtils              (pluginDescToIdePlugins)
-import           Ide.Types                    (PluginDescriptor (pluginNotificationHandlers),
-                                               defaultPluginDescriptor,
-                                               mkPluginNotificationHandler)
-import           Language.LSP.Server          as LSP
-import           Language.LSP.Types           as LSP
-import           Prettyprinter                (Pretty (pretty), vsep)
+import           Control.Arrow                 ((&&&))
+import           Control.Monad.IO.Class        (liftIO)
+import           Data.Function                 ((&))
+import           Data.Text                     (Text)
+import qualified Development.IDE.Main          as GhcideMain
+import           Development.IDE.Types.Logger  (Doc, Priority (Error, Info),
+                                                WithPriority (WithPriority, priority),
+                                                cfilter, cmapWithPrio,
+                                                defaultLayoutOptions,
+                                                layoutPretty,
+                                                makeDefaultStderrRecorder,
+                                                payload, renderStrict,
+                                                withDefaultRecorder)
+import qualified Development.IDE.Types.Logger  as Logger
+import qualified HlsPlugins                    as Plugins
+import           Ide.Arguments                 (Arguments (..),
+                                                GhcideArguments (..),
+                                                getArguments)
+import           Ide.Main                      (defaultMain)
+import qualified Ide.Main                      as IdeMain
+import           Ide.PluginUtils               (pluginDescToIdePlugins)
+import           Ide.Types                     (PluginDescriptor (pluginNotificationHandlers),
+                                                defaultPluginDescriptor,
+                                                mkPluginNotificationHandler)
+import           Language.LSP.Protocol.Message as LSP
+import           Language.LSP.Server           as LSP
+import           Prettyprinter                 (Pretty (pretty), vsep)
 
 data Log
   = LogIdeMain IdeMain.Log
@@ -53,7 +53,7 @@ main = do
     -- This plugin just installs a handler for the `initialized` notification, which then
     -- picks up the LSP environment and feeds it to our recorders
     let lspRecorderPlugin = (defaultPluginDescriptor "LSPRecorderCallback")
-          { pluginNotificationHandlers = mkPluginNotificationHandler LSP.SInitialized $ \_ _ _ _ -> do
+          { pluginNotificationHandlers = mkPluginNotificationHandler LSP.SMethod_Initialized $ \_ _ _ _ -> do
               env <- LSP.getLspEnv
               liftIO $ (cb1 <> cb2) env
           }

exe/Wrapper.hs

@@ -55,15 +55,16 @@ import           Development.IDE.Types.Logger       (Doc, Logger (Logger),
 import           GHC.Stack.Types                    (emptyCallStack)
 import           Ide.Plugin.Config                  (Config)
 import           Ide.Types                          (IdePlugins (IdePlugins))
+import           Language.LSP.Protocol.Message      (Method (Method_Initialize),
+                                                     ResponseError,
+                                                     SMethod (SMethod_Exit, SMethod_WindowShowMessageRequest),
+                                                     TRequestMessage)
+import           Language.LSP.Protocol.Types        (MessageActionItem (MessageActionItem),
+                                                     MessageType (MessageType_Error),
+                                                     ShowMessageRequestParams (ShowMessageRequestParams),
+                                                     type (|?) (InL))
 import           Language.LSP.Server                (LspM)
 import qualified Language.LSP.Server                as LSP
-import           Language.LSP.Types                 (MessageActionItem (MessageActionItem),
-                                                     MessageType (MtError),
-                                                     Method (Initialize),
-                                                     RequestMessage,
-                                                     ResponseError,
-                                                     SMethod (SExit, SWindowShowMessageRequest),
-                                                     ShowMessageRequestParams (ShowMessageRequestParams))
 
 -- ---------------------------------------------------------------------
 
@@ -288,12 +289,12 @@ launchErrorLSP recorder errorMsg = do
         -- Forcefully exit
         let exit = void $ tryPutMVar clientMsgVar ()
 
-        let doInitialize :: LSP.LanguageContextEnv Config -> RequestMessage Initialize -> IO (Either ResponseError (LSP.LanguageContextEnv Config, ()))
+        let doInitialize :: LSP.LanguageContextEnv Config -> TRequestMessage Method_Initialize -> IO (Either ResponseError (LSP.LanguageContextEnv Config, ()))
             doInitialize env _ = do
 
               let restartTitle = "Try to restart"
-              void $ LSP.runLspT env $ LSP.sendRequest SWindowShowMessageRequest (ShowMessageRequestParams MtError errorMsg (Just [MessageActionItem restartTitle])) $ \case
-                    Right (Just (MessageActionItem title))
+              void $ LSP.runLspT env $ LSP.sendRequest SMethod_WindowShowMessageRequest (ShowMessageRequestParams MessageType_Error errorMsg (Just [MessageActionItem restartTitle])) $ \case
+                    Right (InL (MessageActionItem title))
                        | title == restartTitle -> liftIO exit
                     _ -> pure ()
 
@@ -314,4 +315,4 @@ launchErrorLSP recorder errorMsg = do
     setup
 
 exitHandler :: IO () -> LSP.Handlers (ErrorLSPM c)
-exitHandler exit = LSP.notificationHandler SExit $ const $ liftIO exit
+exitHandler exit = LSP.notificationHandler SMethod_Exit $ const $ liftIO exit

flake.nix

@@ -41,6 +41,20 @@
       flake = false;
     };
 
+    # not sure if this is the correct way to get lsp* packages in
+    lsp = {
+      url = "https://hackage.haskell.org/package/lsp-2.0.0.0/lsp-2.0.0.0.tar.gz";
+      flake = false;
+    };
+    lsp-types = {
+      url = "https://hackage.haskell.org/package/lsp-types-2.0.0.1/lsp-types-2.0.0.1.tar.gz";
+      flake = false;
+    };
+    lsp-test = {
+      url = "https://hackage.haskell.org/package/lsp-test-0.15.0.0/lsp-test-0.15.0.0.tar.gz";
+      flake = false;
+    };
+
     haskell-unix-compat = {
       url = "github:jacobstanley/unix-compat/3f6bd688cb56224955e77245a2649ba99ea32fff";
       flake = false;

ghcide-bench/ghcide-bench.cabal

@@ -2,7 +2,7 @@ cabal-version:      3.0
 build-type:         Simple
 category:           Development
 name:               ghcide-bench
-version:            2.0.0.0
+version:            2.1.0.0
 license:            Apache-2.0
 license-file:       LICENSE
 author:             The Haskell IDE team
@@ -89,6 +89,7 @@ library
         safe-exceptions,
         shake,
         text,
+        row-types
     default-extensions:
         BangPatterns
         DeriveFunctor
@@ -118,7 +119,7 @@ test-suite test
         base,
         extra,
         ghcide-bench,
-        lsp-test ^>= 0.14,
+        lsp-test ^>= 0.15,
         tasty,
         tasty-hunit >= 0.10,
         tasty-rerun,