hlint

Author: pepeiborra

ghcide/src/Development/IDE/Plugin/CodeAction.hs

@@ -86,7 +86,7 @@ codeAction lsp state _ (TextDocumentIdentifier uri) _range CodeActionContext{_di
             <*> use GhcSession `traverse` mbFile
             <*> use GetAnnotatedParsedSource `traverse` mbFile
     -- This is quite expensive 0.6-0.7s on GHC
-    pkgExports   <- fromMaybe mempty (envPackageExports <$> env)
+    pkgExports   <- maybe mempty envPackageExports env
     localExports <- readVar (exportsMap $ shakeExtras state)
     let
       exportsMap = localExports <> pkgExports

ghcide/src/Development/IDE/Types/HscEnvEq.hs

@@ -24,7 +24,7 @@ import TcRnMonad (initIfaceLoad, WhereFrom (ImportByUser))
 import LoadIface (loadInterface)
 import qualified Maybes
 import OpenTelemetry.Eventlog (withSpan)
-import Control.Monad.Extra (mapMaybeM, join)
+import Control.Monad.Extra (mapMaybeM, join, eitherM)
 import Control.Concurrent.Extra (newVar, modifyVar)
 import Control.Concurrent.Async (Async, async, waitCatch)
 import Control.Exception (throwIO, mask)
@@ -127,7 +127,7 @@ instance Binary HscEnvEq where
 onceAsync :: IO a -> IO (IO a)
 onceAsync act = do
     var <- newVar OncePending
-    let run as = either throwIO pure =<< waitCatch as
+    let run as = eitherM throwIO pure (waitCatch as)
     pure $ mask $ \unmask -> join $ modifyVar var $ \v -> case v of
         OnceRunning x -> pure (v, unmask $ run x)
         OncePending -> do