@@ -14,20 +14,25 @@ module Obelisk.Command.Run where
1414import Control.Arrow ((&&&))
1515import Control.Exception (Exception, bracket)
1616import Control.Lens (ifor, (.~), (&))
17−import Control.Monad (filterM, unless, void)
17+import Control.Monad (filterM)
1818import Control.Monad.Except (runExceptT, throwError)
1919import Control.Monad.IO.Class (liftIO)
2020import Control.Monad.Reader (MonadIO)
21+import Data.Bifoldable (bifoldr1)
22+import Data.Bifunctor (bimap)
2123import Data.Coerce (coerce)
2224import Data.Default (def)
2325import Data.Either (partitionEithers)
2426import Data.Foldable (fold, for_, toList)
2527import Data.Functor.Identity (runIdentity)
28+import Data.List (intercalate)
2629import Data.List.NonEmpty (NonEmpty)
2730import qualified Data.List.NonEmpty as NE
2831import Data.Map (Map)
2932import qualified Data.Map as Map
30−import Data.Maybe
33+import qualified Data.Map.Monoidal as MMap
34+import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
35+import Data.Ord (comparing)
3136import Data.Set (Set)
3237import qualified Data.Set as Set
3338import Data.String.Here.Interpolated (i)
@@ -41,17 +46,17 @@ import Distribution.Compiler (CompilerFlavor(..))
4146import Distribution.PackageDescription.Parsec (parseGenericPackageDescription)
4247import Distribution.Parsec.ParseResult (runParseResult)
4348import qualified Distribution.System as Dist
44−import Distribution.Types.BuildInfo
45−import Distribution.Types.CondTree
46−import Distribution.Types.GenericPackageDescription
47−import Distribution.Types.Library
48−import Distribution.Utils.Generic
49+import Distribution.Types.BuildInfo (buildable, cppOptions, defaultExtensions, defaultLanguage, hsSourceDirs, options)
50+import Distribution.Types.CondTree (simplifyCondTree)
51+import Distribution.Types.GenericPackageDescription (ConfVar (Arch, Impl, OS), condLibrary)
52+import Distribution.Types.Library (libBuildInfo)
53+import Distribution.Utils.Generic (toUTF8BS, readUTF8File)
4954import qualified Distribution.Parsec.Common as Dist
5055import qualified Hpack.Config as Hpack
5156import qualified Hpack.Render as Hpack
5257import qualified Hpack.Yaml as Hpack
53−import Language.Haskell.Extension
54−import Network.Socket hiding (Debug)
58+import Language.Haskell.Extension (Extension, Language)
59+import qualified Network.Socket as Socket
5560import System.Directory
5661import System.Environment (getExecutablePath)
5762import System.FilePath
@@ -61,19 +66,18 @@ import System.IO.Temp (withSystemTempDirectory)
6166import Obelisk.App (MonadObelisk)
6267import Obelisk.CliApp (
6368 Severity (..),
64− createProcess_,
6569 failWith,
6670 proc,
6771 putLog,
6872 readCreateProcessWithExitCode,
6973 readProcessAndLogStderr,
74+ runProcess_,
7075 setCwd,
7176 setDelegateCtlc,
72− waitForProcess,
7377 withSpinner,
7478 )
7579import Obelisk.Command.Nix
76−import Obelisk.Command.Project (nixShellWithPkgs, withProjectRoot, findProjectAssets)
80+import Obelisk.Command.Project (nixShellWithoutPkgs, withProjectRoot, findProjectAssets, bashEscape)
7781import Obelisk.Command.Thunk (attrCacheFileName)
7882import Obelisk.Command.Utils (findExePath, ghcidExePath)
7983
@@ -90,9 +94,11 @@ data CabalPackageInfo = CabalPackageInfo
9094 -- ^ List of globally set languages of the library component
9195 , _cabalPackageInfo_compilerOptions :: [(CompilerFlavor, [String])]
9296 -- ^ List of compiler-specific options (e.g., the "ghc-options" field of the cabal file)
97+ , _cabalPackageInfo_cppOptions :: [String]
98+ -- ^ List of CPP (C Preprocessor) options (e.g. the "cpp-options" field of the cabal file)
9399 }
94100
95−-- | 'Bool' with a better name for it's purpose.
101+-- | 'Bool' with a better name for its purpose.
96102data Interpret = Interpret_Interpret | Interpret_NoInterpret deriving (Eq, Ord, Show)
97103
98104textInterpret :: Interpret -> Text
@@ -106,9 +112,6 @@ data PathTree a = PathTree_Node
106112 (Map FilePath (PathTree a)) -- Branches to deeper leaves
107113 deriving (Eq, Ord, Show, Functor, Foldable, Traversable)
108114
109−emptyPathTree :: PathTree a
110−emptyPathTree = PathTree_Node Nothing mempty
111−
112115-- | 2D ASCII drawing of a 'PathTree'. Adapted from Data.Tree.draw.
113116drawPathTree :: (a -> Text) -> PathTree a -> Text
114117drawPathTree showA (PathTree_Node _ ts0) = T.intercalate "\n" $ goForest (Map.toList ts0)
@@ -148,7 +151,7 @@ profile profileBasePattern rtsFlags = withProjectRoot "." $ \root -> do
148151 liftIO $ createDirectoryIfMissing True $ takeDirectory $ root </> profileBaseName
149152 putLog Debug $ "Storing profiled data under base name of " <> T.pack (root </> profileBaseName)
150153 freePort <- getFreePort
151− (_, _, _, ph) <- createProcess_ "runProfExe" $ setCwd (Just root) $ setDelegateCtlc True $ proc (outPath </> "bin" </> "ob-run") $
154+ runProcess_ $ setCwd (Just root) $ setDelegateCtlc True $ proc (outPath </> "bin" </> "ob-run") $
152155 [ show freePort
153156 , T.unpack assets
154157 , profileBaseName
@@ -156,16 +159,16 @@ profile profileBasePattern rtsFlags = withProjectRoot "." $ \root -> do
156159 , "-po" <> profileBaseName
157160 ] <> rtsFlags
158161 <> [ "-RTS" ]
159− void $ waitForProcess ph
160162
161163run :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
162164run root interpretPaths = do
163165 pkgs <- getParsedLocalPkgs root interpretPaths
164− withGhciScript pkgs root $ \dotGhciPath -> do
165− freePort <- getFreePort
166− assets <- findProjectAssets root
167− putLog Debug $ "Assets impurely loaded from: " <> assets
168− runGhcid root True dotGhciPath pkgs $ Just $ unwords
166+ assets <- findProjectAssets root
167+ putLog Debug $ "Assets impurely loaded from: " <> assets
168+ ghciArgs <- getGhciSessionSettings pkgs root True
169+ freePort <- getFreePort
170+ withGhciScriptArgs pkgs $ \dotGhciArgs -> do
171+ runGhcid root True (ghciArgs <> dotGhciArgs) pkgs $ Just $ unwords
169172 [ "Obelisk.Run.run"
170173 , show freePort
171174 , "(Obelisk.Run.runServeAsset " ++ show assets ++ ")"
@@ -176,24 +179,26 @@ run root interpretPaths = do
176179runRepl :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
177180runRepl root interpretPaths = do
178181 pkgs <- getParsedLocalPkgs root interpretPaths
179− withGhciScript pkgs "." $ \dotGhciPath ->
180− runGhciRepl root pkgs dotGhciPath
182+ ghciArgs <- getGhciSessionSettings pkgs "." True
183+ withGhciScriptArgs pkgs $ \dotGhciArgs ->
184+ runGhciRepl root pkgs (ghciArgs <> dotGhciArgs)
181185
182186runWatch :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
183187runWatch root interpretPaths = do
184188 pkgs <- getParsedLocalPkgs root interpretPaths
185− withGhciScript pkgs root $ \dotGhciPath ->
186− runGhcid root True dotGhciPath pkgs Nothing
189+ ghciArgs <- getGhciSessionSettings pkgs root True
190+ withGhciScriptArgs pkgs $ \dotGhciArgs ->
191+ runGhcid root True (ghciArgs <> dotGhciArgs) pkgs Nothing
187192
188−exportGhciConfig :: MonadObelisk m => FilePath -> PathTree Interpret -> m [String]
189−exportGhciConfig root interpretPaths = do
193+exportGhciConfig :: MonadObelisk m => Bool -> FilePath -> PathTree Interpret -> m [String]
194+exportGhciConfig useRelativePaths root interpretPaths = do
190195 pkgs <- getParsedLocalPkgs root interpretPaths
191− getGhciSessionSettings pkgs "."
196+ getGhciSessionSettings pkgs "." useRelativePaths
192197
193198nixShellForInterpretPaths :: MonadObelisk m => Bool -> String -> FilePath -> PathTree Interpret -> Maybe String -> m ()
194199nixShellForInterpretPaths isPure shell root interpretPaths cmd = do
195200 pkgs <- getParsedLocalPkgs root interpretPaths
196− nixShellWithPkgs root isPure False (packageInfoToNamePathMap pkgs) shell cmd
201+ nixShellWithoutPkgs root isPure False (packageInfoToNamePathMap pkgs) shell cmd
197202
198203-- | Like 'getLocalPkgs' but also parses them and fails if any of them can't be parsed.
199204getParsedLocalPkgs :: MonadObelisk m => FilePath -> PathTree Interpret -> m (NonEmpty CabalPackageInfo)
@@ -211,11 +216,12 @@ getLocalPkgs root interpretPaths = do
211216
212217 -- We do not want to find packages that are embedded inside other obelisk projects, unless that
213218 -- obelisk project is our own.
214− obeliskPackageExclusions <- liftIO $ fmap Set.fromList $ traverse canonicalizePath $ filter (/= root) $ map takeDirectory obeliskPackagePaths
219+ obeliskPackageExclusions <- liftIO $ fmap Set.fromList $ traverse canonicalizePath $
220+ filter (/= root) $ map takeDirectory obeliskPackagePaths
215221 putLog Debug [i|Excluding obelisk packages: ${T.pack $ unwords $ Set.toList obeliskPackageExclusions}|]
216222 let rootsAndExclusions = calcIntepretFinds "" interpretPaths
217223
218− fmap fold $ for (Map.toAscList rootsAndExclusions) $ \(interpretPathRoot, exclusions) ->
224+ fmap fold $ for (MMap.toAscList rootsAndExclusions) $ \(interpretPathRoot, exclusions) ->
219225 let allExclusions = obeliskPackageExclusions <> exclusions <> Set.singleton ("*" </> attrCacheFileName)
220226 in fmap (Set.fromList . map normalise) $ runFind $
221227 ["-L", interpretPathRoot, "(", "-name", "*.cabal", "-o", "-name", Hpack.packageConfig, ")", "-a", "-type", "f"]
@@ -229,14 +235,14 @@ getLocalPkgs root interpretPaths = do
229235-- | Calculates a set of root 'FilePath's along with each one's corresponding set of exclusions.
230236-- This is used when constructing a set of @find@ commands to run to produce a set of packages
231237-- that matches the user's @--interpret@/@--no-interpret@ settings.
232−calcIntepretFinds :: FilePath -> PathTree Interpret -> Map FilePath (Set FilePath)
238+calcIntepretFinds :: FilePath -> PathTree Interpret -> MMap.MonoidalMap FilePath (Set FilePath)
233239calcIntepretFinds treeRoot0 tree0 = runIdentity $ go treeRoot0 tree0
234240 where
235241 go treeRoot tree = foldPathTreeFor (== Interpret_Interpret) treeRoot tree $ \parent children -> do
236242 exclusions <- foldPathTreeFor (== Interpret_NoInterpret) parent children $ \parent' children' ->
237243 pure $ Map.singleton parent' children'
238− deeperFinds <- fmap fold $ Map.traverseWithKey go exclusions
239− pure $ Map.singleton parent (Map.keysSet exclusions) <> deeperFinds
244+ deeperFinds <- Map.traverseWithKey go exclusions
245+ pure $ MMap.singleton parent (Map.keysSet exclusions) <> fold (MMap.MonoidalMap deeperFinds)
240246
241247-- | Traverses a 'PathTree' and folds all leaves matching a given predicate.
242248foldPathTreeFor
@@ -298,15 +304,16 @@ parseCabalPackage
298304 -> m (Maybe CabalPackageInfo)
299305parseCabalPackage dir = parseCabalPackage' dir >>= \case
300306 Left err -> Nothing <$ putLog Error err
301− Right (warnings, pkgInfo) -> do
307+ Right (Just (warnings, pkgInfo)) -> do
302308 for_ warnings $ putLog Warning . T.pack . show
303309 pure $ Just pkgInfo
310+ Right Nothing -> pure Nothing
304311
305312-- | Like 'parseCabalPackage' but returns errors and warnings directly so as to avoid 'MonadObelisk'.
306313parseCabalPackage'
307314 :: (MonadIO m)
308315 => FilePath -- ^ Package directory
309− -> m (Either T.Text ([Dist.PWarning], CabalPackageInfo))
316+ -> m (Either T.Text (Maybe ([Dist.PWarning], CabalPackageInfo)))
310317parseCabalPackage' pkg = runExceptT $ do
311318 (cabalContents, packageFile, packageName) <- guessCabalPackageFile pkg >>= \case
312319 Left GuessPackageFileError_NotFound -> throwError $ "No .cabal or package.yaml file found in " <> T.pack pkg
@@ -334,7 +341,7 @@ parseCabalPackage' pkg = runExceptT $ do
334341 case condLibrary <$> result of
335342 Right (Just condLib) -> do
336343 let (_, lib) = simplifyCondTree evalConfVar condLib
337− pure $ (warnings,) $ CabalPackageInfo
344+ pure $ Just $ (warnings,) $ CabalPackageInfo
338345 { _cabalPackageInfo_packageName = T.pack packageName
339346 , _cabalPackageInfo_packageFile = packageFile
340347 , _cabalPackageInfo_packageRoot = takeDirectory packageFile
@@ -346,18 +353,19 @@ parseCabalPackage' pkg = runExceptT $ do
346353 , _cabalPackageInfo_defaultLanguage =
347354 defaultLanguage $ libBuildInfo lib
348355 , _cabalPackageInfo_compilerOptions = options $ libBuildInfo lib
356+ , _cabalPackageInfo_cppOptions = cppOptions $ libBuildInfo lib
349357 }
350− Right Nothing -> throwError "Haskell package has no library component"
358+ Right Nothing -> pure Nothing
351359 Left (_, errors) ->
352360 throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show errors)
353361
354362parsePackagesOrFail :: (MonadObelisk m, Foldable f) => f FilePath -> m (NE.NonEmpty CabalPackageInfo)
355363parsePackagesOrFail dirs' = do
356− (pkgDirErrs, packageInfos') <- fmap partitionEithers $ for dirs $ \dir -> do
364+ packageInfos' <- fmap catMaybes $ for dirs $ \dir -> do
357365 flip fmap (parseCabalPackage dir) $ \case
358366 Just packageInfo
359− | _cabalPackageInfo_buildable packageInfo -> Right packageInfo
360− _ -> Left dir
367+ | _cabalPackageInfo_buildable packageInfo -> Just packageInfo
368+ _ -> Nothing
361369
362370 -- Sort duplicate packages such that we prefer shorter paths, but fall back to alphabetical ordering.
363371 let packagesByName = Map.map (NE.sortBy $ comparing $ \p -> let n = _cabalPackageInfo_packageFile p in (length n, n))
@@ -379,9 +387,6 @@ parsePackagesOrFail dirs' = do
379387 "No valid, buildable packages found" <> (if null dirs then "" else " in " <> intercalate ", " dirs)
380388 Just xs -> pure xs
381389
382− unless (null pkgDirErrs) $
383− putLog Warning $ T.pack $ "Failed to find buildable packages in " <> intercalate ", " pkgDirErrs
384−
385390 pure packageInfos
386391 where
387392 dirs = toList dirs'
@@ -389,104 +394,129 @@ parsePackagesOrFail dirs' = do
389394packageInfoToNamePathMap :: Foldable f => f CabalPackageInfo -> Map Text FilePath
390395packageInfoToNamePathMap = Map.fromList . map (_cabalPackageInfo_packageName &&& _cabalPackageInfo_packageRoot) . toList
391396
397+-- Like 'withGhciScript' but provides the precise ghci arguments to add to a ghci session
398+withGhciScriptArgs
399+ :: (MonadObelisk m, Foldable f)
400+ => f CabalPackageInfo -- ^ List of packages to load into ghci
401+ -> ([String] -> m ()) -- ^ Action to run with the extra ghci arguments
402+ -> m ()
403+withGhciScriptArgs packageInfos f = withGhciScript loadPreludeManually packageInfos $ \fp -> f ["-XNoImplicitPrelude", "-ghci-script", fp]
404+ where
405+ -- These lines must be first and allow the session to support a custom Prelude when @-XNoImplicitPrelude@
406+ -- is passed to the ghci session.
407+ loadPreludeManually =
408+ [ ":add Prelude" -- @:add@ is used because it's less noisy when there is no custom Prelude
409+ , ":set -XImplicitPrelude" -- Turn the default setting on
410+ ]
411+
392412-- | Create ghci configuration to load the given packages
393413withGhciScript
394414 :: (MonadObelisk m, Foldable f)
395− => f CabalPackageInfo -- ^ List of packages to load into ghci
396− -> FilePath -- ^ All paths written to the .ghci file will be relative to this path
415+ => [String] -- ^ Commands to prefix to file
416+ -> f CabalPackageInfo -- ^ List of packages to load into ghci
397417 -> (FilePath -> m ()) -- ^ Action to run with the path to generated temporary .ghci
398418 -> m ()
399−withGhciScript (toList -> packageInfos) pathBase f = do
400− ghciSettings <- getGhciSessionSettings packageInfos pathBase
401− let
419+withGhciScript preCommands (toList -> packageInfos) f =
420+ withSystemTempDirectory "ob-ghci" $ \fp -> do
421+ let dotGhciPath = fp </> ".ghci"
422+ liftIO $ writeFile dotGhciPath dotGhci
423+ f dotGhciPath
424+ where
402425 packageNames = Set.fromList $ map _cabalPackageInfo_packageName packageInfos
403426 modulesToLoad = mconcat
404427 [ [ "Obelisk.Run" | "obelisk-run" `Set.member` packageNames ]
405428 , [ "Backend" | "backend" `Set.member` packageNames ]
406429 , [ "Frontend" | "frontend" `Set.member` packageNames ]
407430 ]
408− dotGhci = unlines
409− [ ":set " <> unwords ghciSettings -- TODO: Shell escape
410− , if null modulesToLoad then "" else ":load " <> unwords modulesToLoad
431+ dotGhci = unlines $
432+ preCommands <>
433+ [ if null modulesToLoad then "" else ":load " <> unwords modulesToLoad
411434 , "import qualified Obelisk.Run"
412435 , "import qualified Frontend"
413− , "import qualified Backend" ]
414− withSystemTempDirectory "ob-ghci" $ \fp -> do
415− let dotGhciPath = fp </> ".ghci"
416− liftIO $ writeFile dotGhciPath dotGhci
417− f dotGhciPath
436+ , "import qualified Backend"
437+ ]
418438
419439-- | Builds a list of options to pass to ghci or set in .ghci file that configures
420440-- the preprocessor and source includes.
421441getGhciSessionSettings
422442 :: (MonadObelisk m, Foldable f)
423443 => f CabalPackageInfo -- ^ List of packages to load into ghci
424− -> FilePath -- ^ All paths written to the .ghci file will be relative to this path
444+ -> FilePath -- ^ All paths will be relative to this path
445+ -> Bool -- ^ Use relative paths
425446 -> m [String]
426−getGhciSessionSettings (toList -> packageInfos) pathBase = do
427− selfExe <- liftIO getExecutablePath
428− -- TODO: Shell escape
447+getGhciSessionSettings (toList -> packageInfos) pathBase useRelativePaths = do
448+ -- N.B. ghci settings do NOT support escaping in any way. To minimize the likelihood that
449+ -- paths-with-spaces ruin our day, we first canonicalize everything, and then relativize
450+ -- all paths to 'pathBase'.
451+ selfExe <- liftIO $ canonicalizePath =<< getExecutablePath
452+ canonicalPathBase <- liftIO $ canonicalizePath pathBase
453+
454+ (pkgFiles, pkgSrcPaths :: [NonEmpty FilePath]) <- fmap unzip $ liftIO $ for packageInfos $ \pkg -> do
455+ canonicalSrcDirs <- traverse canonicalizePath $ (_cabalPackageInfo_packageRoot pkg </>) <$> _cabalPackageInfo_sourceDirs pkg
456+ canonicalPkgFile <- canonicalizePath $ _cabalPackageInfo_packageFile pkg
457+ pure (canonicalPkgFile `relativeTo'` canonicalPathBase, (`relativeTo'` canonicalPathBase) <$> canonicalSrcDirs)
458+
429459 pure
430− $ ["-F", "-pgmF", selfExe, "-optF", preprocessorIdentifier]
431− <> concatMap (\p -> ["-optF", makeRelative pathBase $ _cabalPackageInfo_packageFile p]) packageInfos
432− <> [ "-i" <> intercalate ":" (packageInfos >>= rootedSourceDirs) ]
460+ $ baseGhciOptions
461+ <> ["-F", "-pgmF", selfExe, "-optF", preprocessorIdentifier]
462+ <> concatMap (\p -> ["-optF", p]) pkgFiles
463+ <> [ "-i" <> intercalate ":" (concatMap toList pkgSrcPaths) ]
433464 where
434− rootedSourceDirs pkg = NE.toList $
435− makeRelative pathBase . (_cabalPackageInfo_packageRoot pkg </>) <$> _cabalPackageInfo_sourceDirs pkg
465+ relativeTo' = if useRelativePaths then relativeTo else const
466+
467+baseGhciOptions :: [String]
468+baseGhciOptions =
469+ [ "-ignore-dot-ghci"
470+ , "-no-user-package-db"
471+ , "-package-env", "-"
472+ ]
436473
437474-- | Run ghci repl
438475runGhciRepl
439476 :: (MonadObelisk m, Foldable f)
440477 => FilePath -- ^ Path to project root
441− -> f CabalPackageInfo
442− -> FilePath -- ^ Path to .ghci
478+ -> f CabalPackageInfo -- ^ Packages to keep unbuilt
479+ -> [String] -- ^ GHCi arguments
443480 -> m ()
444−runGhciRepl root (toList -> packages) dotGhci =
481+runGhciRepl root (toList -> packages) ghciArgs =
445482 -- NOTE: We do *not* want to use $(staticWhich "ghci") here because we need the
446483 -- ghc that is provided by the shell in the user's project.
447− nixShellWithPkgs root True False (packageInfoToNamePathMap packages) "ghc" $ Just $ "ghci " <> makeBaseGhciOptions dotGhci -- TODO: Shell escape
484+ nixShellWithoutPkgs root True False (packageInfoToNamePathMap packages) "ghc" $
485+ Just $ unwords $ fmap bashEscape $ "ghci" : ghciArgs
448486
449487-- | Run ghcid
450488runGhcid
451489 :: (MonadObelisk m, Foldable f)
452490 => FilePath -- ^ Path to project root
453491 -> Bool -- ^ Should we chdir to root when running this process?
454− -> FilePath -- ^ Path to .ghci
455− -> f CabalPackageInfo
492+ -> [String] -- ^ GHCi arguments
493+ -> f CabalPackageInfo -- ^ Packages to keep unbuilt
456494 -> Maybe String -- ^ Optional command to run at every reload
457495 -> m ()
458−runGhcid root chdirToRoot dotGhci (toList -> packages) mcmd =
459− nixShellWithPkgs root True chdirToRoot (packageInfoToNamePathMap packages) "ghc" $ Just $ unwords $ ghcidExePath : opts -- TODO: Shell escape
496+runGhcid root chdirToRoot ghciArgs (toList -> packages) mcmd =
497+ nixShellWithoutPkgs root True chdirToRoot (packageInfoToNamePathMap packages) "ghc" $
498+ Just $ unwords $ fmap bashEscape $ ghcidExePath : opts
460499 where
461− opts =
462− [ "-W"
463− , "--command='ghci -ignore-dot-ghci " <> makeBaseGhciOptions dotGhci <> "' "
464− , "--outputfile=ghcid-output.txt"
465− ] <> map (\x -> "--reload='" <> x <> "'") reloadFiles
466− <> map (\x -> "--restart='" <> x <> "'") restartFiles
467− <> testCmd
468− testCmd = maybeToList (flip fmap mcmd $ \cmd -> "--test='" <> cmd <> "'") -- TODO: Shell escape
469−
500+ opts = concat
501+ [ ["-W"]
502+ , ["--outputfile=ghcid-output.txt"]
503+ , map (\x -> "--reload=" <> x) reloadFiles
504+ , map (\x -> "--restart=" <> x) restartFiles
505+ , maybe [] (\cmd -> ["--test=" <> cmd]) mcmd
506+ , ["--command=" <> unwords ("ghci" : ghciArgs)]
507+ ]
470508 adjustRoot x = if chdirToRoot then makeRelative root x else x
471509 reloadFiles = map adjustRoot [root </> "config"]
472510 restartFiles = map (adjustRoot . _cabalPackageInfo_packageFile) packages
473511
474−makeBaseGhciOptions :: FilePath -> String
475−makeBaseGhciOptions dotGhci =
476− unwords
477− [ "-no-user-package-db"
478− , "-package-env -"
479− , "-ghci-script " <> dotGhci
480− ]
481−
482−getFreePort :: MonadIO m => m PortNumber
483−getFreePort = liftIO $ withSocketsDo $ do
484− addr:_ <- getAddrInfo (Just defaultHints) (Just "127.0.0.1") (Just "0")
485− bracket (open addr) close socketPort
512+getFreePort :: MonadIO m => m Socket.PortNumber
513+getFreePort = liftIO $ Socket.withSocketsDo $ do
514+ addr:_ <- Socket.getAddrInfo (Just Socket.defaultHints) (Just "127.0.0.1") (Just "0")
515+ bracket (open addr) Socket.close Socket.socketPort
486516 where
487517 open addr = do
488− sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
489− bind sock (addrAddress addr)
518+ sock <- Socket.socket (Socket.addrFamily addr) (Socket.addrSocketType addr) (Socket.addrProtocol addr)
519+ Socket.bind sock (Socket.addrAddress addr)
490520 return sock
491521
492522
@@ -496,3 +526,29 @@ pathToTree a p = go $ splitDirectories p
496526 where
497527 go [] = PathTree_Node (Just a) mempty
498528 go (x : xs) = PathTree_Node Nothing $ Map.singleton x $ go xs
529+
530+-- | Like 'zipWith' but pads with a padding value instead of stopping on the shortest list.
531+zipDefaultWith :: a -> b -> (a -> b -> c) -> [a] -> [b] -> [c]
532+zipDefaultWith _da _db _f [] [] = []
533+zipDefaultWith da db f (a:as) [] = f a db : zipDefaultWith da db f as []
534+zipDefaultWith da db f [] (b:bs) = f da b : zipDefaultWith da db f [] bs
535+zipDefaultWith da db f (a:as) (b:bs) = f a b : zipDefaultWith da db f as bs
536+
537+-- | Makes the first absolute path relative to the second absolute path.
538+--
539+-- Both input paths MUST be absolute.
540+--
541+-- Unlike 'makeRelative' this does not merely strip prefixes. It will introduce
542+-- enough @..@ paths to make the resulting path truly relative in virtually every
543+-- case. The only exception is on Windows when the two paths are on different
544+-- drives. In this case the resulting path may be absolute.
545+relativeTo :: FilePath -> FilePath -> FilePath
546+relativeTo dir base
547+ = bifoldr1 (</>)
548+ $ bimap (collapse . (".." <$) . catMaybes) (collapse . catMaybes)
549+ $ unzip
550+ $ dropWhile (\(a,b) -> a == b)
551+ $ zipDefaultWith Nothing Nothing (,)
552+ (map Just $ splitDirectories base)
553+ (map Just $ splitDirectories dir)
554+ where collapse = foldr (</>) ""