'check' command now supports cabal-dev.

This commit is contained in:
Clint Moore 2011-11-01 15:06:53 -07:00
parent 764ba5b7f3
commit 3efbf59028
3 changed files with 53 additions and 3 deletions

45
CabalDev.hs Normal file
View File

@ -0,0 +1,45 @@
module CabalDev (modifyOptions) where
{-
If the directory 'cabal-dev/packages-X.X.X.conf' exists, add it to the
options ghc-mod uses to check the source. Otherwise just pass it on.
-}
import Data.Maybe (listToMaybe)
import System.FilePath.Find
import System.FilePath.Posix (splitPath,joinPath)
import System.Posix.Directory (getWorkingDirectory)
import System.Directory
import Types
modifyOptions :: Options -> IO Options
modifyOptions opts =
fmap (has_cdev opts) findCabalDev
where
has_cdev :: Options -> Maybe String -> Options
has_cdev op Nothing = op
has_cdev op (Just path) = addPath op path
findCabalDev :: IO (Maybe String)
findCabalDev =
getWorkingDirectory >>= searchIt . splitPath
addPath :: Options -> String -> Options
addPath orig_opts path = do
let orig_paths = packageConfs orig_opts
orig_opts {
packageConfs = orig_paths ++ [path] }
searchIt :: [FilePath] -> IO (Maybe FilePath)
searchIt [] = return Nothing
searchIt path = do
a <- doesDirectoryExist (mpath path)
case a of
False -> return Nothing
True -> do
b <- find always (fileName ~~? "packages*.conf") $ mpath path
maybe (searchIt $ init path) (return . Just) $ listToMaybe b
where
mpath a = (joinPath a) ++ "cabal-dev/"

View File

@ -9,10 +9,15 @@ import GHC
import Prelude hiding (catch)
import Types
import CabalDev (modifyOptions)
----------------------------------------------------------------
checkSyntax :: Options -> String -> IO String
checkSyntax opt file = unlines <$> check opt file
--checkSyntax opt file = unlines <$> check opt file
checkSyntax opt file = do
opt' <- modifyOptions opt
unlines <$> check opt' file
----------------------------------------------------------------

View File

@ -29,8 +29,8 @@ Executable ghc-mod
else
GHC-Options: -Wall
Build-Depends: base >= 4.0 && < 5, ghc, ghc-paths, transformers,
process, directory, filepath, old-time,
hlint >= 1.7.1,
process, directory, filepath, old-time, unix,
hlint >= 1.7.1, filemanip,
attoparsec, enumerator, attoparsec-enumerator
Source-Repository head
Type: git