Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Avoid crash in case of nonsensical hoogle db #1174

Merged
merged 1 commit into from
Apr 19, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/Haskell/Ide/Engine/Plugin/Hoogle.hs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
module Haskell.Ide.Engine.Plugin.Hoogle where

import Control.Monad.IO.Class
import Control.Monad (join)
import Control.Exception
import Data.Aeson
import Data.Bifunctor
import Data.Maybe
Expand Down Expand Up @@ -42,7 +44,11 @@ hoogleDescriptor plId = PluginDescriptor

-- ---------------------------------------------------------------------

data HoogleError = NoDb | NoResults deriving (Eq,Ord,Show)
data HoogleError
= NoDb
| DbFail T.Text
| NoResults
deriving (Eq,Ord,Show)

newtype HoogleDb = HoogleDb (Maybe FilePath)

Expand All @@ -53,6 +59,8 @@ hoogleErrorToIdeError NoResults =
IdeError PluginError "No results found" Null
hoogleErrorToIdeError NoDb =
IdeError PluginError "Hoogle database not found. Run hoogle generate to generate" Null
hoogleErrorToIdeError (DbFail msg) =
IdeError PluginError ("Hoogle failed with following error: " <> msg) Null

instance ExtensionClass HoogleDb where
initialValue = HoogleDb Nothing
Expand Down Expand Up @@ -215,8 +223,8 @@ lookupCmd' n term = do
runHoogleQuery :: Maybe FilePath -> T.Text -> ([Target] -> Either HoogleError a) -> IO (Either HoogleError a)
runHoogleQuery Nothing _ _ = return $ Left NoDb
runHoogleQuery (Just db) quer f = do
res <- searchHoogle db quer
return (f res)
res <- try (searchHoogle db quer) :: IO (Either ErrorCall [Target])
return . join $ bimap (DbFail . T.pack . show) f res


-- | Run a query for Hoogle on the given Hoogle database.
Expand Down