7574885 · ghcide · git.iko.soy

git.iko.soy/ghcide

Tag errors as errors rather than debug messages (#360)

commit757488534f9f90bda96594268c501dc2b2bc0d56 authordavid-md-da <40795121+david-md-da@users.noreply.github.com> dateWed 10 Apr 2019, 17:49 (8 years ago) parentbc9a195

3 files changed+27−10

compare with master

unifiedsplit

src/Development/IDE/Logger.hs+6−3 src/Development/IDE/State/Service.hs+5−2 src/Development/IDE/State/Shake.hs+16−5

src/Development/IDE/Logger.hs+6−3

@@ -13,10 +13,13 @@ module Development.IDE.Logger

1313import qualified Data.Text as T

1414import GHC.Stack

1515

16−data Handle m = Handle

17− { logInfo :: HasCallStack => T.Text -> m ()

16+data Handle m = Handle {

17+ logError :: HasCallStack => T.Text -> m ()

18+ , logWarning :: HasCallStack => T.Text -> m ()

19+ , logInfo :: HasCallStack => T.Text -> m ()

1820 , logDebug :: HasCallStack => T.Text -> m ()

1921 }

2022

2123makeNopHandle :: Monad m => Handle m

22−makeNopHandle = Handle (const $ pure ()) (const $ pure ())

24+makeNopHandle = Handle e e e e where

25+ e _ = pure ()

src/Development/IDE/State/Service.hs+5−2

@@ -16,7 +16,7 @@ module Development.IDE.State.Service(

1616 setFilesOfInterest,

1717 writeProfile,

1818 getDiagnostics, unsafeClearDiagnostics,

19− logDebug

19+ logDebug, logInfo, logWarning, logError

2020 ) where

2121

2222import Control.Concurrent.Extra

@@ -120,5 +120,8 @@ setFilesOfInterest state files = do

120120getServiceEnv :: Action Env

121121getServiceEnv = getIdeGlobalAction

122122

123−logDebug :: IdeState -> T.Text -> IO ()

123+logDebug, logInfo, logWarning, logError :: IdeState -> T.Text -> IO ()

124124logDebug = shakeLogDebug

125+logInfo = shakeLogInfo

126+logWarning = shakeLogWarning

127+logError = shakeLogError

src/Development/IDE/State/Shake.hs+16−5

@@ -23,6 +23,9 @@ module Development.IDE.State.Shake(

2323 setPriority,

2424 sendEvent,

2525 shakeLogDebug,

26+ shakeLogInfo,

27+ shakeLogWarning,

28+ shakeLogError,

2629 ) where

2730

2831import Development.Shake

@@ -36,7 +39,7 @@ import Data.Maybe

3639import Data.Either

3740import Data.List.Extra

3841import qualified Data.Text as T

39−import qualified Development.IDE.Logger as Logger

42+import Development.IDE.Logger as Logger

4043import Development.IDE.Types.LSP

4144import Development.IDE.Types.Diagnostics

4245import Control.Concurrent.Extra

@@ -275,12 +278,12 @@ uses_ key files = do

275278reportSeriousError :: String -> Action ()

276279reportSeriousError t = do

277280 ShakeExtras{logger} <- getShakeExtras

278− liftIO $ Logger.logInfo logger $ T.pack t

281+ liftIO $ Logger.logError logger $ T.pack t

279282

280283reportSeriousErrorDie :: String -> Action a

281284reportSeriousErrorDie t = do

282285 ShakeExtras{logger} <- getShakeExtras

283− liftIO $ Logger.logInfo logger $ T.pack t

286+ liftIO $ Logger.logError logger $ T.pack t

284287 fail t

285288

286289

@@ -385,5 +388,13 @@ sendEvent e = do

385388 ShakeExtras{eventer} <- getShakeExtras

386389 liftIO $ eventer e

387390

388−shakeLogDebug :: IdeState -> T.Text -> IO ()

389−shakeLogDebug IdeState{shakeExtras=ShakeExtras{logger}} msg = Logger.logDebug logger msg

391+-- | bit of an odd signature because we're trying to remove priority

392+sl :: (Handle IO -> T.Text -> IO ()) -> IdeState -> T.Text -> IO ()

393+sl f IdeState{shakeExtras=ShakeExtras{logger}} p = f logger p

394+

395+shakeLogDebug, shakeLogInfo, shakeLogWarning, shakeLogError

396+ :: IdeState -> T.Text -> IO ()

397+shakeLogDebug = sl logDebug

398+shakeLogInfo = sl logInfo

399+shakeLogWarning = sl logWarning

400+shakeLogError = sl logError