Bring test suite up to date

Language/Haskell/GhcMod/CabalHelper.hs

@@ -29,7 +29,7 @@ import Data.Monoid
 import Data.List
 import Language.Haskell.GhcMod.Types
 import Language.Haskell.GhcMod.Monad.Types
-import Language.Haskell.GhcMod.Error
+import Language.Haskell.GhcMod.Error as E
 import Language.Haskell.GhcMod.Utils
 import Language.Haskell.GhcMod.World
 import Language.Haskell.GhcMod.PathsAndFiles
@@ -93,7 +93,7 @@ cabalHelper = withCabal $ do
 
   res <- liftIO $ cached cradleRootDir (cabalHelperCache cmds) $ do
            out <- readProcess exe (distdir:cmds) ""
-           evaluate (read out) `catch`
+           evaluate (read out) `E.catch`
                \(SomeException _) -> error "cabalHelper: read failed"
 
   let [ Just (GmCabalHelperEntrypoints eps),

Language/Haskell/GhcMod/Doc.hs

@@ -11,10 +11,10 @@ showPage dflag style = showDocWith dflag PageMode . withStyle dflag style
 showOneLine :: DynFlags -> PprStyle -> SDoc -> String
 showOneLine dflag style = showDocWith dflag OneLineMode . withStyle dflag style
 
-showForUser :: DynFlags -> PrintUnqualified -> SDoc -> String
-showForUser dflags unqual sdoc =
-    showDocWith dflags PageMode $
-      runSDoc sdoc $ initSDocContext dflags $ mkUserStyle unqual AllTheWay
+-- showForUser :: DynFlags -> PrintUnqualified -> SDoc -> String
+-- showForUser dflags unqual sdoc =
+--     showDocWith dflags PageMode $
+--       runSDoc sdoc $ initSDocContext dflags $ mkUserStyle unqual AllTheWay
 
 getStyle :: GhcMonad m => m PprStyle
 getStyle = do

Language/Haskell/GhcMod/Find.hs

@@ -38,8 +38,8 @@ import System.IO
 #endif
 
 #if MIN_VERSION_containers(0,5,0)
-import Data.Map.Strict (Map)
-import qualified Data.Map.Strict as M
+import Data.Map (Map)
+import qualified Data.Map as M
 #else
 import Data.Map (Map)
 import qualified Data.Map as M

Language/Haskell/GhcMod/Gap.hs

@@ -39,6 +39,7 @@ module Language.Haskell.GhcMod.Gap (
   , listVisibleModuleNames
   , listVisibleModules
   , Language.Haskell.GhcMod.Gap.isSynTyCon
+  , parseModuleHeader
   ) where
 
 import Control.Applicative hiding (empty)
@@ -96,6 +97,13 @@ import PackageConfig (PackageConfig, packageConfigId)
 import qualified Data.IntSet as I (IntSet, empty)
 #endif
 
+
+import Bag
+import Lexer as L
+import Parser
+import SrcLoc
+
+
 ----------------------------------------------------------------
 ----------------------------------------------------------------
 --
@@ -487,3 +495,27 @@ isSynTyCon = GHC.isTypeSynonymTyCon
 #else
 isSynTyCon = GHC.isSynTyCon
 #endif
+
+
+parseModuleHeader
+    :: String         -- ^ Haskell module source text (full Unicode is supported)
+    -> DynFlags
+    -> FilePath       -- ^ the filename (for source locations)
+    -> Either ErrorMessages (WarningMessages, Located (HsModule RdrName))
+parseModuleHeader str dflags filename =
+   let
+       loc  = mkRealSrcLoc (mkFastString filename) 1 1
+       buf  = stringToStringBuffer str
+   in
+   case L.unP Parser.parseHeader (mkPState dflags buf loc) of
+
+     PFailed sp err   ->
+#if __GLASGOW_HASKELL__ >= 706
+         Left (unitBag (mkPlainErrMsg dflags sp err))
+#else
+         Left (unitBag (mkPlainErrMsg sp err))
+#endif
+
+     POk pst rdr_module ->
+         let (warns,_) = getMessages pst in
+         Right (warns, rdr_module)

Language/Haskell/GhcMod/HomeModuleGraph.hs

@@ -30,19 +30,13 @@ module Language.Haskell.GhcMod.HomeModuleGraph (
  , moduleGraphToDot
  ) where
 
-import Bag
-import DriverPipeline hiding (unP)
+import DriverPipeline
 import ErrUtils
 import Exception
-import FastString
 import Finder
 import GHC
 import HscTypes
-import Lexer
 import MonadUtils hiding (foldrM)
-import Parser
-import SrcLoc
-import StringBuffer
 
 import Control.Arrow ((&&&))
 import Control.Monad
@@ -51,8 +45,8 @@ import Control.Monad.State.Strict (execStateT)
 import Control.Monad.State.Class
 import Data.Maybe
 import Data.Monoid
-import Data.Map.Strict  (Map)
-import qualified Data.Map.Strict  as Map
+import Data.Map  (Map)
+import qualified Data.Map  as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
 import System.FilePath
@@ -61,6 +55,7 @@ import Language.Haskell.GhcMod.Logging
 import Language.Haskell.GhcMod.Logger
 import Language.Haskell.GhcMod.Monad.Types
 import Language.Haskell.GhcMod.Types
+import Language.Haskell.GhcMod.Gap (parseModuleHeader)
 
 -- | Turn module graph into a graphviz dot file
 --
@@ -249,22 +244,3 @@ fileModuleName env fn = handle (\(_ :: SomeException) -> return $ Right Nothing)
       Right (_, lmdl) -> do
         let HsModule {..} = unLoc lmdl
         return $ Right $ unLoc <$> hsmodName
-
-parseModuleHeader
-    :: String         -- ^ Haskell module source text (full Unicode is supported)
-    -> DynFlags
-    -> FilePath       -- ^ the filename (for source locations)
-    -> Either ErrorMessages (WarningMessages, Located (HsModule RdrName))
-parseModuleHeader str dflags filename =
-   let
-       loc  = mkRealSrcLoc (mkFastString filename) 1 1
-       buf  = stringToStringBuffer str
-   in
-   case unP Parser.parseHeader (mkPState dflags buf loc) of
-
-     PFailed sp err   ->
-         Left (unitBag (mkPlainErrMsg dflags sp err))
-
-     POk pst rdr_module ->
-         let (warns,_) = getMessages pst in
-         Right (warns, rdr_module)

Language/Haskell/GhcMod/Monad/Types.hs

@@ -17,7 +17,7 @@
 {-# LANGUAGE CPP, GeneralizedNewtypeDeriving, FlexibleInstances #-}
 {-# LANGUAGE FlexibleContexts, MultiParamTypeClasses, RankNTypes #-}
 {-# LANGUAGE TypeFamilies, UndecidableInstances, BangPatterns #-}
-{-# LANGUAGE StandaloneDeriving, InstanceSigs #-}
+{-# LANGUAGE StandaloneDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Language.Haskell.GhcMod.Monad.Types (

Language/Haskell/GhcMod/Target.hs

@@ -36,13 +36,14 @@ import Language.Haskell.GhcMod.GhcPkg
 import Language.Haskell.GhcMod.Error
 import Language.Haskell.GhcMod.Logging
 import Language.Haskell.GhcMod.Types
+import Language.Haskell.GhcMod.Utils
 
 import Data.Maybe
 import Data.Either
 import Data.Foldable (foldrM)
 import Data.IORef
-import Data.Map.Strict (Map)
-import qualified Data.Map.Strict  as Map
+import Data.Map (Map)
+import qualified Data.Map  as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
 
@@ -51,8 +52,7 @@ import System.FilePath
 
 withLightHscEnv :: forall m a. IOish m
     => [GHCOption] -> (HscEnv -> m a) -> m a
-withLightHscEnv opts action = gbracket initEnv teardownEnv (action)
-
+withLightHscEnv opts action = gbracket initEnv teardownEnv action
  where
    teardownEnv :: HscEnv -> m ()
    teardownEnv env = liftIO $ do
@@ -241,7 +241,7 @@ resolveEntrypoints env srcDirs ms =
    resolve :: Either FilePath ModuleName -> IO (Maybe ModulePath)
    resolve (Right mn) = findModulePath env mn
    resolve (Left fn') = do
-       mfn <- findFile srcDirs fn'
+       mfn <- findFile' srcDirs fn'
        case mfn of
          Nothing -> return Nothing
          Just fn'' -> do
@@ -253,6 +253,8 @@ resolveEntrypoints env srcDirs ms =
                      case mmn of
                        Nothing -> mkMainModulePath fn
                        Just mn -> ModulePath mn fn
+   findFile' dirs file =
+       mconcat <$> mapM (mightExist . (</>file)) dirs
 
 resolveGmComponents :: (IOish m, GmState m, GmLog m, GmEnv m)
                     => Maybe [Either FilePath ModuleName]

Language/Haskell/GhcMod/Utils.hs

@@ -128,7 +128,7 @@ libexecNotExitsError exe dir = printf
 
 tryFindGhcModTreeLibexecDir :: IO (Maybe FilePath)
 tryFindGhcModTreeLibexecDir  = do
-  exe <- getExecutablePath
+  exe <- getExecutablePath'
   dir <- case takeFileName exe of
     "ghc" -> do -- we're probably in ghci; try CWD
         getCurrentDirectory