Merge remote-tracking branch 'upstream/master' into resolve-helper

Author: joyfulmantis

README.md

@@ -70,7 +70,7 @@ main :: IO Int
 main = runServer $ ServerDefinition
   { onConfigurationChange = const $ pure $ Right ()
   , doInitialize = \env _req -> pure $ Right env
-  , staticHandlers = handlers
+  , staticHandlers = \_caps -> handlers
   , interpretHandler = \env -> Iso (runLspT env) liftIO
   , options = defaultOptions
   }

lsp-test/bench/SimpleBench.hs

@@ -35,7 +35,7 @@ server = ServerDefinition
   { onConfigurationChange = const $ const $ Right ()
   , defaultConfig = ()
   , doInitialize = \env _req -> pure $ Right env
-  , staticHandlers = handlers
+  , staticHandlers = \_caps -> handlers
   , interpretHandler = \env -> Iso (runLspT env) liftIO
   , options = defaultOptions
   }

lsp-test/func-test/FuncTest.hs

@@ -35,7 +35,7 @@ main = hspec $ do
             { onConfigurationChange = const $ const $ Right ()
             , defaultConfig = ()
             , doInitialize = \env _req -> pure $ Right env
-            , staticHandlers = handlers killVar
+            , staticHandlers = \_caps -> handlers killVar
             , interpretHandler = \env -> Iso (runLspT env) liftIO
             , options = defaultOptions
             }
@@ -82,7 +82,7 @@ main = hspec $ do
             { onConfigurationChange = const $ const $ Right ()
             , defaultConfig = ()
             , doInitialize = \env _req -> pure $ Right env
-            , staticHandlers = handlers
+            , staticHandlers = \_caps -> handlers
             , interpretHandler = \env -> Iso (runLspT env) liftIO
             , options = defaultOptions
             }

lsp-test/lsp-test.cabal

@@ -1,6 +1,6 @@
 cabal-version:      2.4
 name:               lsp-test
-version:            0.15.0.0
+version:            0.15.0.1
 synopsis:           Functional test framework for LSP servers.
 description:
   A test framework for writing tests against
@@ -59,7 +59,7 @@ library
     , filepath
     , Glob                  >=0.9   && <0.11
     , lens
-    , lsp                   ^>=2.0
+    , lsp                   ^>=2.1
     , lsp-types             ^>=2.0
     , mtl                   <2.4
     , parser-combinators    >=1.2
@@ -102,7 +102,7 @@ test-suite tests
     , filepath
     , hspec
     , lens
-    , lsp           ^>=2.0
+    , lsp           ^>=2.1
     , lsp-test
     , mtl           <2.4
     , parser-combinators

lsp-test/test/DummyServer.hs

@@ -31,7 +31,7 @@ withDummyServer f = do
         { doInitialize = \env _req -> pure $ Right env
         , defaultConfig = ()
         , onConfigurationChange = const $ pure $ Right ()
-        , staticHandlers = handlers
+        , staticHandlers = \_caps -> handlers
         , interpretHandler = \env ->
             Iso (\m -> runLspT env (runReaderT m handlerEnv)) liftIO
         , options = defaultOptions {optExecuteCommandCommands = Just ["doAnEdit"]}

lsp-types/ChangeLog.md

@@ -1,8 +1,9 @@
 # Revision history for lsp-types
 
-## 2.0.0.2
+## 2.0.1.0
 
 * Removed deprecation pragmas from fields, as these cannot currently be avoided.
+* Added `isOptionalMethod`, that checks whether a method is optional according to the spec.
 
 ## 2.0.0.1
 

lsp-types/lsp-types.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               lsp-types
-version:            2.0.0.2
+version:            2.0.1.0
 synopsis:
   Haskell library for the Microsoft Language Server Protocol, data types
 

lsp-types/src/Language/LSP/Protocol/Message/Method.hs

@@ -14,6 +14,7 @@ module Language.LSP.Protocol.Message.Method where
 
 import           Data.Aeson.Types
 import           Data.Function                      (on)
+import           Data.List                          (isPrefixOf)
 import           Data.GADT.Compare
 import           Data.Proxy
 import           Data.Type.Equality
@@ -29,6 +30,11 @@ import           Unsafe.Coerce
 -- SomeMethod
 ---------------
 
+-- | Is this an "optional" method which servers and clients are allowed to ignore?
+isOptionalMethod :: SomeMethod -> Bool
+-- See https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#dollarRequests
+isOptionalMethod m = "$/" `isPrefixOf` someMethodToMethodString m
+
 deriving stock instance Show SomeMethod
 instance Eq SomeMethod where
   (==) = (==) `on` someMethodToMethodString

lsp/ChangeLog.md

@@ -1,5 +1,13 @@
 # Revision history for lsp
 
+## 2.1.0.0
+
+* Fix handling of optional methods.
+* `staticHandlers` now takes the client capabilities as an argument. 
+  These are static across the lifecycle of the server, so this allows
+  a server to decide at construction e.g. whether to provide handlers
+  for resolve methods depending on whether the client supports it.
+
 ## 2.0.0.0
 
 * Support `lsp-types-2.0.0.0`.

lsp/example/Reactor.hs

@@ -96,7 +96,7 @@ run = flip E.catches handlers $ do
             J.Success cfg -> Right cfg
       , doInitialize = \env _ -> forkIO (reactor stderrLogger rin) >> pure (Right env)
       -- Handlers log to both the client and stderr
-      , staticHandlers = lspHandlers dualLogger rin
+      , staticHandlers = \_caps -> lspHandlers dualLogger rin
       , interpretHandler = \env -> Iso (runLspT env) liftIO
       , options = lspOptions
       }