git.iko.soy/ghcide
on master help sign in
#564, fix JUnit tests (#799)
7052432Neil Mitchell
src/Development/IDE/State/Service.hs+3−3
compare with master
unifiedsplit
@@ -20,11 +20,11 @@ module Development.IDE.State.Service(
20 ) where
20 ) where
21
21
22import Control.Concurrent.Extra
22import Control.Concurrent.Extra
23−import Control.Concurrent.STM
24import Control.Monad.Except
23import Control.Monad.Except
25import Development.IDE.Functions.Compile (CompileOpts(..))
24import Development.IDE.Functions.Compile (CompileOpts(..))
26import Development.IDE.State.FileStore
25import Development.IDE.State.FileStore
27import qualified Development.IDE.Logger as Logger
26import qualified Development.IDE.Logger as Logger
27+import Data.Maybe
28import Data.Set (Set)
28import Data.Set (Set)
29import qualified Data.Set as Set
29import qualified Data.Set as Set
30import qualified Data.Text as T
30import qualified Data.Text as T
@@ -71,13 +71,13 @@ unsafeClearDiagnostics = unsafeClearAllDiagnostics
71
71
72-- | Initialise the Compiler Service.
72-- | Initialise the Compiler Service.
73initialise :: Rules ()
73initialise :: Rules ()
74− -> Maybe (Event -> STM ())
74+ -> Maybe (Event -> IO ())
75 -> Logger.Handle IO
75 -> Logger.Handle IO
76 -> CompileOpts
76 -> CompileOpts
77 -> IO IdeState
77 -> IO IdeState
78initialise mainRule toDiags logger options =
78initialise mainRule toDiags logger options =
79 shakeOpen
79 shakeOpen
80− (maybe (const $ pure ()) (atomically .) toDiags)
80+ (fromMaybe (const $ pure ()) toDiags)
81 logger
81 logger
82 (setProfiling options $
82 (setProfiling options $
83 shakeOptions { shakeThreads = optThreads options
83 shakeOptions { shakeThreads = optThreads options