Add setConfig as an analogue to getConfig (haskell#414)

pgujjula · Apr 13, 2022 · bddb5b6 · bddb5b6
1 parent 8db20a5
commit bddb5b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lsp/src/Language/LSP/Server.hs b/lsp/src/Language/LSP/Server.hs
@@ -26,6 +26,7 @@ module Language.LSP.Server
 
   , getClientCapabilities
   , getConfig
+  , setConfig
   , getRootPath
   , getWorkspaceFolders
 

diff --git a/lsp/src/Language/LSP/Server/Core.hs b/lsp/src/Language/LSP/Server/Core.hs
@@ -452,12 +452,18 @@ freshLspId = do
 -- ---------------------------------------------------------------------
 
 -- | The current configuration from the client as set via the @initialize@ and
--- @workspace/didChangeConfiguration@ requests.
+-- @workspace/didChangeConfiguration@ requests, as well as by calls to
+-- 'setConfig'.
 getConfig :: MonadLsp config m => m config
 getConfig = getsState resConfig
 
 {-# INLINE getConfig #-}
 
+setConfig :: MonadLsp config m => (config -> (a,config)) -> m a
+setConfig = stateState resConfig
+
+{-# INLINE setConfig #-}
+
 getClientCapabilities :: MonadLsp config m => m J.ClientCapabilities
 getClientCapabilities = resClientCapabilities <$> getLspEnv
 

diff --git a/lsp/src/Language/LSP/Server/Processing.hs b/lsp/src/Language/LSP/Server/Processing.hs
@@ -374,7 +374,7 @@ shutdownRequestHandler = \_req k -> do
 handleConfigChange :: Message WorkspaceDidChangeConfiguration -> LspM config ()
 handleConfigChange req = do
   parseConfig <- LspT $ asks resParseConfig
-  res <- stateState resConfig $ \oldConfig -> case parseConfig oldConfig (req ^. LSP.params . LSP.settings) of
+  res <- setConfig $ \oldConfig -> case parseConfig oldConfig (req ^. LSP.params . LSP.settings) of
     Left err -> (Left err, oldConfig)
     Right !newConfig -> (Right (), newConfig)
   case res of