Expose more functions

Author: michaelpj

lsp-test/src/Language/LSP/Test.hs

@@ -52,7 +52,10 @@ module Language.LSP.Test
   -- ** Initialization
   , initializeResponse
   -- ** Config
+  , modifyConfig
   , setConfig
+  , modifyConfigSection
+  , setConfigSection
   -- ** Documents
   , createDoc
   , openDoc
@@ -148,6 +151,7 @@ import System.Process (ProcessHandle, CreateProcess)
 import qualified System.FilePath.Glob as Glob
 import Control.Monad.State (execState)
 import Data.Traversable (for)
+import Data.String (fromString)
 
 -- | Starts a new session.
 --
@@ -411,12 +415,14 @@ setIgnoringConfigurationRequests :: Bool -> Session ()
 setIgnoringConfigurationRequests value = do
   modify (\ss -> ss { ignoringConfigurationRequests = value })
 
--- | Set the client config. This will send a notification to the server that the
+-- | Modify the client config. This will send a notification to the server that the
 -- config has changed.
-setConfig :: Object
-          -> Session ()
-setConfig newConfig = do
-  modify (\ss -> ss { curLspConfig = newConfig})
+modifyConfig :: (Object -> Object) -> Session ()
+modifyConfig f = do
+  oldConfig <- curLspConfig <$> get
+  let newConfig = f oldConfig
+  modify (\ss -> ss { curLspConfig = newConfig })
+
   caps <- asks sessionCapabilities
   let supportsConfiguration = fromMaybe False $ caps ^? L.workspace . _Just . L.configuration . _Just
       -- TODO: make this configurable?
@@ -425,6 +431,21 @@ setConfig newConfig = do
       configToSend = if supportsConfiguration then J.Null else Object newConfig
   sendNotification SMethod_WorkspaceDidChangeConfiguration $ DidChangeConfigurationParams configToSend
 
+-- | Set the client config. This will send a notification to the server that the
+-- config has changed.
+setConfig :: Object -> Session ()
+setConfig newConfig = modifyConfig (const newConfig)
+
+-- | Modify a client config section (if already present, otherwise does nothing).
+-- This will send a notification to the server that the config has changed.
+modifyConfigSection :: String -> (Value -> Value) -> Session ()
+modifyConfigSection section f = modifyConfig (\o -> o & ix (fromString section) %~ f)
+
+-- | Set a client config section. This will send a notification to the server that the
+-- config has changed.
+setConfigSection :: String -> Value -> Session ()
+setConfigSection section settings = modifyConfig (\o -> o & at(fromString section) ?~ settings)
+
 -- | /Creates/ a new text document. This is different from 'openDoc'
 -- as it sends a workspace/didChangeWatchedFiles notification letting the server
 -- know that a file was created within the workspace, __provided that the server

lsp-test/src/Language/LSP/Test/Session.hs

@@ -115,7 +115,7 @@ data SessionConfig = SessionConfig
   -- Can be overriden with the environment variable @LSP_TEST_LOG_MESSAGES@.
   , logColor       :: Bool -- ^ Add ANSI color to the logged messages, defaults to True.
   , lspConfig      :: Object
-  -- ^ The initial LSP config as JSON value, defaults to the empty object.
+  -- ^ The initial LSP config as JSON object, defaults to the empty object.
   -- This should include the config section for the server if it has one, i.e. if
   -- the server has a 'mylang' config section, then the config should be an object
   -- with a 'mylang' key whose value is the actual config for the server. You

lsp-test/test/Test.hs

@@ -9,7 +9,6 @@ import DummyServer
 import           Test.Hspec
 import           Data.Aeson
 import qualified Data.Aeson as J
-import qualified Data.Aeson.KeyMap as J
 import           Data.Default
 import qualified Data.Map.Strict as M
 import           Data.Either
@@ -146,7 +145,7 @@ main = hspec $ around withDummyServer $ do
         c <- requestConfig
         -- from the server definition
         liftIO $ c `shouldBe` 1
-        setConfig $ J.singleton "dummy" (toJSON @Int 2)
+        setConfigSection "dummy" (toJSON @Int 2)
         -- ensure the configuration change has happened
         configurationRequest
         c <- requestConfig