@@ -14,25 +14,21 @@ module Obelisk.Command.Run where
14import Control.Arrow ((&&&))
14import Control.Arrow ((&&&))
15import Control.Exception (Exception, bracket)
15import Control.Exception (Exception, bracket)
16import Control.Lens (ifor, (.~), (&))
16import Control.Lens (ifor, (.~), (&))
17−import Control.Monad (filterM)
17+import Control.Monad (filterM, unless, void)
18import Control.Monad.Except (runExceptT, throwError)
18import Control.Monad.Except (runExceptT, throwError)
19import Control.Monad.IO.Class (liftIO)
19import Control.Monad.IO.Class (liftIO)
20import Control.Monad.Reader (MonadIO)
20import Control.Monad.Reader (MonadIO)
21−import Data.Bifoldable (bifoldr1)
22−import Data.Bifunctor (bimap)
23import Data.Coerce (coerce)
21import Data.Coerce (coerce)
24import Data.Default (def)
22import Data.Default (def)
25import Data.Either (partitionEithers)
23import Data.Either (partitionEithers)
26import Data.Foldable (fold, for_, toList)
24import Data.Foldable (fold, for_, toList)
27import Data.Functor.Identity (runIdentity)
25import Data.Functor.Identity (runIdentity)
28−import Data.List (intercalate)
29import Data.List.NonEmpty (NonEmpty)
26import Data.List.NonEmpty (NonEmpty)
30import qualified Data.List.NonEmpty as NE
27import qualified Data.List.NonEmpty as NE
31import Data.Map (Map)
28import Data.Map (Map)
32import qualified Data.Map as Map
29import qualified Data.Map as Map
33import qualified Data.Map.Monoidal as MMap
30import qualified Data.Map.Monoidal as MMap
34−import Data.Maybe (catMaybes, fromMaybe, mapMaybe)
31+import Data.Maybe
35−import Data.Ord (comparing)
36import Data.Set (Set)
32import Data.Set (Set)
37import qualified Data.Set as Set
33import qualified Data.Set as Set
38import Data.String.Here.Interpolated (i)
34import Data.String.Here.Interpolated (i)
@@ -46,17 +42,17 @@ import Distribution.Compiler (CompilerFlavor(..))
46import Distribution.PackageDescription.Parsec (parseGenericPackageDescription)
42import Distribution.PackageDescription.Parsec (parseGenericPackageDescription)
47import Distribution.Parsec.ParseResult (runParseResult)
43import Distribution.Parsec.ParseResult (runParseResult)
48import qualified Distribution.System as Dist
44import qualified Distribution.System as Dist
49−import Distribution.Types.BuildInfo (buildable, cppOptions, defaultExtensions, defaultLanguage, hsSourceDirs, options)
45+import Distribution.Types.BuildInfo
50−import Distribution.Types.CondTree (simplifyCondTree)
46+import Distribution.Types.CondTree
51−import Distribution.Types.GenericPackageDescription (ConfVar (Arch, Impl, OS), condLibrary)
47+import Distribution.Types.GenericPackageDescription
52−import Distribution.Types.Library (libBuildInfo)
48+import Distribution.Types.Library
53−import Distribution.Utils.Generic (toUTF8BS, readUTF8File)
49+import Distribution.Utils.Generic
54import qualified Distribution.Parsec.Common as Dist
50import qualified Distribution.Parsec.Common as Dist
55import qualified Hpack.Config as Hpack
51import qualified Hpack.Config as Hpack
56import qualified Hpack.Render as Hpack
52import qualified Hpack.Render as Hpack
57import qualified Hpack.Yaml as Hpack
53import qualified Hpack.Yaml as Hpack
58−import Language.Haskell.Extension (Extension, Language)
54+import Language.Haskell.Extension
59−import qualified Network.Socket as Socket
55+import Network.Socket hiding (Debug)
60import System.Directory
56import System.Directory
61import System.Environment (getExecutablePath)
57import System.Environment (getExecutablePath)
62import System.FilePath
58import System.FilePath
@@ -66,18 +62,19 @@ import System.IO.Temp (withSystemTempDirectory)
66import Obelisk.App (MonadObelisk)
62import Obelisk.App (MonadObelisk)
67import Obelisk.CliApp (
63import Obelisk.CliApp (
68 Severity (..),
64 Severity (..),
72 readCreateProcessWithExitCode,
69 readCreateProcessWithExitCode,
73 readProcessAndLogStderr,
70 readProcessAndLogStderr,
76 setDelegateCtlc,
72 setDelegateCtlc,
77 withSpinner,
74 withSpinner,
79import Obelisk.Command.Nix
76import Obelisk.Command.Nix
80−import Obelisk.Command.Project (nixShellWithoutPkgs, withProjectRoot, findProjectAssets, bashEscape)
77+import Obelisk.Command.Project (nixShellWithPkgs, withProjectRoot, findProjectAssets)
81import Obelisk.Command.Thunk (attrCacheFileName)
78import Obelisk.Command.Thunk (attrCacheFileName)
82import Obelisk.Command.Utils (findExePath, ghcidExePath)
79import Obelisk.Command.Utils (findExePath, ghcidExePath)
@@ -94,11 +91,9 @@ data CabalPackageInfo = CabalPackageInfo
94 -- ^ List of globally set languages of the library component
91 -- ^ List of globally set languages of the library component
95 , _cabalPackageInfo_compilerOptions :: [(CompilerFlavor, [String])]
92 , _cabalPackageInfo_compilerOptions :: [(CompilerFlavor, [String])]
96 -- ^ List of compiler-specific options (e.g., the "ghc-options" field of the cabal file)
93 -- ^ 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)
101−-- | 'Bool' with a better name for its purpose.
96+-- | 'Bool' with a better name for it's purpose.
102data Interpret = Interpret_Interpret | Interpret_NoInterpret deriving (Eq, Ord, Show)
97data Interpret = Interpret_Interpret | Interpret_NoInterpret deriving (Eq, Ord, Show)
104textInterpret :: Interpret -> Text
99textInterpret :: Interpret -> Text
@@ -112,6 +107,9 @@ data PathTree a = PathTree_Node
112 (Map FilePath (PathTree a)) -- Branches to deeper leaves
107 (Map FilePath (PathTree a)) -- Branches to deeper leaves
113 deriving (Eq, Ord, Show, Functor, Foldable, Traversable)
108 deriving (Eq, Ord, Show, Functor, Foldable, Traversable)
110+emptyPathTree :: PathTree a
111+emptyPathTree = PathTree_Node Nothing mempty
115-- | 2D ASCII drawing of a 'PathTree'. Adapted from Data.Tree.draw.
113-- | 2D ASCII drawing of a 'PathTree'. Adapted from Data.Tree.draw.
116drawPathTree :: (a -> Text) -> PathTree a -> Text
114drawPathTree :: (a -> Text) -> PathTree a -> Text
117drawPathTree showA (PathTree_Node _ ts0) = T.intercalate "\n" $ goForest (Map.toList ts0)
115drawPathTree showA (PathTree_Node _ ts0) = T.intercalate "\n" $ goForest (Map.toList ts0)
@@ -151,7 +149,7 @@ profile profileBasePattern rtsFlags = withProjectRoot "." $ \root -> do
151 liftIO $ createDirectoryIfMissing True $ takeDirectory $ root </> profileBaseName
149 liftIO $ createDirectoryIfMissing True $ takeDirectory $ root </> profileBaseName
152 putLog Debug $ "Storing profiled data under base name of " <> T.pack (root </> profileBaseName)
150 putLog Debug $ "Storing profiled data under base name of " <> T.pack (root </> profileBaseName)
153 freePort <- getFreePort
151 freePort <- getFreePort
154− runProcess_ $ setCwd (Just root) $ setDelegateCtlc True $ proc (outPath </> "bin" </> "ob-run") $
152+ (_, _, _, ph) <- createProcess_ "runProfExe" $ setCwd (Just root) $ setDelegateCtlc True $ proc (outPath </> "bin" </> "ob-run") $
155 [ show freePort
153 [ show freePort
156 , T.unpack assets
154 , T.unpack assets
157 , profileBaseName
155 , profileBaseName
@@ -159,16 +157,16 @@ profile profileBasePattern rtsFlags = withProjectRoot "." $ \root -> do
159 , "-po" <> profileBaseName
157 , "-po" <> profileBaseName
160 ] <> rtsFlags
158 ] <> rtsFlags
161 <> [ "-RTS" ]
159 <> [ "-RTS" ]
160+ void $ waitForProcess ph
163run :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
162run :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
164run root interpretPaths = do
163run root interpretPaths = do
165 pkgs <- getParsedLocalPkgs root interpretPaths
164 pkgs <- getParsedLocalPkgs root interpretPaths
165+ withGhciScript pkgs root $ \dotGhciPath -> do
166+ freePort <- getFreePort
166− assets <- findProjectAssets root
167+ assets <- findProjectAssets root
167− putLog Debug $ "Assets impurely loaded from: " <> assets
168+ 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
169+ runGhcid root True dotGhciPath pkgs $ Just $ unwords
172 [ "Obelisk.Run.run"
170 [ "Obelisk.Run.run"
173 , show freePort
171 , show freePort
174 , "(Obelisk.Run.runServeAsset " ++ show assets ++ ")"
172 , "(Obelisk.Run.runServeAsset " ++ show assets ++ ")"
@@ -179,26 +177,24 @@ run root interpretPaths = do
179runRepl :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
177runRepl :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
180runRepl root interpretPaths = do
178runRepl root interpretPaths = do
181 pkgs <- getParsedLocalPkgs root interpretPaths
179 pkgs <- getParsedLocalPkgs root interpretPaths
182− ghciArgs <- getGhciSessionSettings pkgs "." True
180+ withGhciScript pkgs "." $ \dotGhciPath ->
183− withGhciScriptArgs pkgs $ \dotGhciArgs ->
184− runGhciRepl root pkgs (ghciArgs <> dotGhciArgs)
181+ runGhciRepl root pkgs dotGhciPath
186runWatch :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
183runWatch :: MonadObelisk m => FilePath -> PathTree Interpret -> m ()
187runWatch root interpretPaths = do
184runWatch root interpretPaths = do
188 pkgs <- getParsedLocalPkgs root interpretPaths
185 pkgs <- getParsedLocalPkgs root interpretPaths
189− ghciArgs <- getGhciSessionSettings pkgs root True
186+ withGhciScript pkgs root $ \dotGhciPath ->
190− withGhciScriptArgs pkgs $ \dotGhciArgs ->
191− runGhcid root True (ghciArgs <> dotGhciArgs) pkgs Nothing
187+ runGhcid root True dotGhciPath pkgs Nothing
193−exportGhciConfig :: MonadObelisk m => Bool -> FilePath -> PathTree Interpret -> m [String]
189+exportGhciConfig :: MonadObelisk m => FilePath -> PathTree Interpret -> m [String]
194−exportGhciConfig useRelativePaths root interpretPaths = do
190+exportGhciConfig root interpretPaths = do
195 pkgs <- getParsedLocalPkgs root interpretPaths
191 pkgs <- getParsedLocalPkgs root interpretPaths
196− getGhciSessionSettings pkgs "." useRelativePaths
192+ getGhciSessionSettings pkgs "."
198nixShellForInterpretPaths :: MonadObelisk m => Bool -> String -> FilePath -> PathTree Interpret -> Maybe String -> m ()
194nixShellForInterpretPaths :: MonadObelisk m => Bool -> String -> FilePath -> PathTree Interpret -> Maybe String -> m ()
199nixShellForInterpretPaths isPure shell root interpretPaths cmd = do
195nixShellForInterpretPaths isPure shell root interpretPaths cmd = do
200 pkgs <- getParsedLocalPkgs root interpretPaths
196 pkgs <- getParsedLocalPkgs root interpretPaths
201− nixShellWithoutPkgs root isPure False (packageInfoToNamePathMap pkgs) shell cmd
197+ nixShellWithPkgs root isPure False (packageInfoToNamePathMap pkgs) shell cmd
203-- | Like 'getLocalPkgs' but also parses them and fails if any of them can't be parsed.
199-- | Like 'getLocalPkgs' but also parses them and fails if any of them can't be parsed.
204getParsedLocalPkgs :: MonadObelisk m => FilePath -> PathTree Interpret -> m (NonEmpty CabalPackageInfo)
200getParsedLocalPkgs :: MonadObelisk m => FilePath -> PathTree Interpret -> m (NonEmpty CabalPackageInfo)
@@ -304,16 +300,15 @@ parseCabalPackage
304 -> m (Maybe CabalPackageInfo)
300 -> m (Maybe CabalPackageInfo)
305parseCabalPackage dir = parseCabalPackage' dir >>= \case
301parseCabalPackage dir = parseCabalPackage' dir >>= \case
306 Left err -> Nothing <$ putLog Error err
302 Left err -> Nothing <$ putLog Error err
307− Right (Just (warnings, pkgInfo)) -> do
303+ Right (warnings, pkgInfo) -> do
308 for_ warnings $ putLog Warning . T.pack . show
304 for_ warnings $ putLog Warning . T.pack . show
309 pure $ Just pkgInfo
305 pure $ Just pkgInfo
310− Right Nothing -> pure Nothing
312-- | Like 'parseCabalPackage' but returns errors and warnings directly so as to avoid 'MonadObelisk'.
307-- | Like 'parseCabalPackage' but returns errors and warnings directly so as to avoid 'MonadObelisk'.
313parseCabalPackage'
308parseCabalPackage'
314 :: (MonadIO m)
309 :: (MonadIO m)
315 => FilePath -- ^ Package directory
310 => FilePath -- ^ Package directory
316− -> m (Either T.Text (Maybe ([Dist.PWarning], CabalPackageInfo)))
311+ -> m (Either T.Text ([Dist.PWarning], CabalPackageInfo))
317parseCabalPackage' pkg = runExceptT $ do
312parseCabalPackage' pkg = runExceptT $ do
318 (cabalContents, packageFile, packageName) <- guessCabalPackageFile pkg >>= \case
313 (cabalContents, packageFile, packageName) <- guessCabalPackageFile pkg >>= \case
319 Left GuessPackageFileError_NotFound -> throwError $ "No .cabal or package.yaml file found in " <> T.pack pkg
314 Left GuessPackageFileError_NotFound -> throwError $ "No .cabal or package.yaml file found in " <> T.pack pkg
@@ -341,7 +336,7 @@ parseCabalPackage' pkg = runExceptT $ do
341 case condLibrary <$> result of
336 case condLibrary <$> result of
342 Right (Just condLib) -> do
337 Right (Just condLib) -> do
343 let (_, lib) = simplifyCondTree evalConfVar condLib
338 let (_, lib) = simplifyCondTree evalConfVar condLib
344− pure $ Just $ (warnings,) $ CabalPackageInfo
339+ pure $ (warnings,) $ CabalPackageInfo
345 { _cabalPackageInfo_packageName = T.pack packageName
340 { _cabalPackageInfo_packageName = T.pack packageName
346 , _cabalPackageInfo_packageFile = packageFile
341 , _cabalPackageInfo_packageFile = packageFile
347 , _cabalPackageInfo_packageRoot = takeDirectory packageFile
342 , _cabalPackageInfo_packageRoot = takeDirectory packageFile
@@ -353,19 +348,18 @@ parseCabalPackage' pkg = runExceptT $ do
353 , _cabalPackageInfo_defaultLanguage =
348 , _cabalPackageInfo_defaultLanguage =
354 defaultLanguage $ libBuildInfo lib
349 defaultLanguage $ libBuildInfo lib
355 , _cabalPackageInfo_compilerOptions = options $ libBuildInfo lib
350 , _cabalPackageInfo_compilerOptions = options $ libBuildInfo lib
356− , _cabalPackageInfo_cppOptions = cppOptions $ libBuildInfo lib
358− Right Nothing -> pure Nothing
352+ Right Nothing -> throwError "Haskell package has no library component"
359 Left (_, errors) ->
353 Left (_, errors) ->
360 throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show errors)
354 throwError $ T.pack $ "Failed to parse " <> packageFile <> ":\n" <> unlines (map show errors)
362parsePackagesOrFail :: (MonadObelisk m, Foldable f) => f FilePath -> m (NE.NonEmpty CabalPackageInfo)
356parsePackagesOrFail :: (MonadObelisk m, Foldable f) => f FilePath -> m (NE.NonEmpty CabalPackageInfo)
363parsePackagesOrFail dirs' = do
357parsePackagesOrFail dirs' = do
364− packageInfos' <- fmap catMaybes $ for dirs $ \dir -> do
358+ (pkgDirErrs, packageInfos') <- fmap partitionEithers $ for dirs $ \dir -> do
365 flip fmap (parseCabalPackage dir) $ \case
359 flip fmap (parseCabalPackage dir) $ \case
366 Just packageInfo
360 Just packageInfo
367− | _cabalPackageInfo_buildable packageInfo -> Just packageInfo
361+ | _cabalPackageInfo_buildable packageInfo -> Right packageInfo
368− _ -> Nothing
362+ _ -> Left dir
370 -- Sort duplicate packages such that we prefer shorter paths, but fall back to alphabetical ordering.
364 -- Sort duplicate packages such that we prefer shorter paths, but fall back to alphabetical ordering.
371 let packagesByName = Map.map (NE.sortBy $ comparing $ \p -> let n = _cabalPackageInfo_packageFile p in (length n, n))
365 let packagesByName = Map.map (NE.sortBy $ comparing $ \p -> let n = _cabalPackageInfo_packageFile p in (length n, n))
@@ -387,6 +381,9 @@ parsePackagesOrFail dirs' = do
387 "No valid, buildable packages found" <> (if null dirs then "" else " in " <> intercalate ", " dirs)
381 "No valid, buildable packages found" <> (if null dirs then "" else " in " <> intercalate ", " dirs)
388 Just xs -> pure xs
382 Just xs -> pure xs
384+ unless (null pkgDirErrs) $
385+ putLog Warning $ T.pack $ "Failed to find buildable packages in " <> intercalate ", " pkgDirErrs
390 pure packageInfos
387 pure packageInfos
392 dirs = toList dirs'
389 dirs = toList dirs'
@@ -394,57 +391,41 @@ parsePackagesOrFail dirs' = do
394packageInfoToNamePathMap :: Foldable f => f CabalPackageInfo -> Map Text FilePath
391packageInfoToNamePathMap :: Foldable f => f CabalPackageInfo -> Map Text FilePath
395packageInfoToNamePathMap = Map.fromList . map (_cabalPackageInfo_packageName &&& _cabalPackageInfo_packageRoot) . toList
392packageInfoToNamePathMap = Map.fromList . map (_cabalPackageInfo_packageName &&& _cabalPackageInfo_packageRoot) . toList
397−-- Like 'withGhciScript' but provides the precise ghci arguments to add to a ghci session
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
403−withGhciScriptArgs packageInfos f = withGhciScript loadPreludeManually packageInfos $ \fp -> f ["-XNoImplicitPrelude", "-ghci-script", fp]
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
412-- | Create ghci configuration to load the given packages
394-- | Create ghci configuration to load the given packages
413withGhciScript
395withGhciScript
414 :: (MonadObelisk m, Foldable f)
396 :: (MonadObelisk m, Foldable f)
415− => [String] -- ^ Commands to prefix to file
416− -> f CabalPackageInfo -- ^ List of packages to load into ghci
397+ => f CabalPackageInfo -- ^ List of packages to load into ghci
398+ -> FilePath -- ^ All paths written to the .ghci file will be relative to this path
417 -> (FilePath -> m ()) -- ^ Action to run with the path to generated temporary .ghci
399 -> (FilePath -> m ()) -- ^ Action to run with the path to generated temporary .ghci
419−withGhciScript preCommands (toList -> packageInfos) f =
401+withGhciScript (toList -> packageInfos) pathBase f = do
420− withSystemTempDirectory "ob-ghci" $ \fp -> do
402+ ghciSettings <- getGhciSessionSettings packageInfos pathBase
421− let dotGhciPath = fp </> ".ghci"
403+ let
422− liftIO $ writeFile dotGhciPath dotGhci
425 packageNames = Set.fromList $ map _cabalPackageInfo_packageName packageInfos
404 packageNames = Set.fromList $ map _cabalPackageInfo_packageName packageInfos
426 modulesToLoad = mconcat
405 modulesToLoad = mconcat
427 [ [ "Obelisk.Run" | "obelisk-run" `Set.member` packageNames ]
406 [ [ "Obelisk.Run" | "obelisk-run" `Set.member` packageNames ]
428 , [ "Backend" | "backend" `Set.member` packageNames ]
407 , [ "Backend" | "backend" `Set.member` packageNames ]
429 , [ "Frontend" | "frontend" `Set.member` packageNames ]
408 , [ "Frontend" | "frontend" `Set.member` packageNames ]
431− dotGhci = unlines $
410+ dotGhci = unlines
432− preCommands <>
411+ [ ":set " <> unwords ghciSettings -- TODO: Shell escape
433− [ if null modulesToLoad then "" else ":load " <> unwords modulesToLoad
412+ , if null modulesToLoad then "" else ":load " <> unwords modulesToLoad
434 , "import qualified Obelisk.Run"
413 , "import qualified Obelisk.Run"
435 , "import qualified Frontend"
414 , "import qualified Frontend"
436− , "import qualified Backend"
415+ , "import qualified Backend" ]
437− ]
416+ withSystemTempDirectory "ob-ghci" $ \fp -> do
417+ let dotGhciPath = fp </> ".ghci"
418+ liftIO $ writeFile dotGhciPath dotGhci
439-- | Builds a list of options to pass to ghci or set in .ghci file that configures
421-- | Builds a list of options to pass to ghci or set in .ghci file that configures
440-- the preprocessor and source includes.
422-- the preprocessor and source includes.
441getGhciSessionSettings
423getGhciSessionSettings
442 :: (MonadObelisk m, Foldable f)
424 :: (MonadObelisk m, Foldable f)
443 => f CabalPackageInfo -- ^ List of packages to load into ghci
425 => f CabalPackageInfo -- ^ List of packages to load into ghci
444− -> FilePath -- ^ All paths will be relative to this path
426+ -> FilePath -- ^ All paths written to the .ghci file will be relative to this path
445− -> Bool -- ^ Use relative paths
446 -> m [String]
427 -> m [String]
447−getGhciSessionSettings (toList -> packageInfos) pathBase useRelativePaths = do
428+getGhciSessionSettings (toList -> packageInfos) pathBase = do
448 -- N.B. ghci settings do NOT support escaping in any way. To minimize the likelihood that
429 -- 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
430 -- paths-with-spaces ruin our day, we first canonicalize everything, and then relativize
450 -- all paths to 'pathBase'.
431 -- all paths to 'pathBase'.
@@ -454,69 +435,66 @@ getGhciSessionSettings (toList -> packageInfos) pathBase useRelativePaths = do
454 (pkgFiles, pkgSrcPaths :: [NonEmpty FilePath]) <- fmap unzip $ liftIO $ for packageInfos $ \pkg -> do
435 (pkgFiles, pkgSrcPaths :: [NonEmpty FilePath]) <- fmap unzip $ liftIO $ for packageInfos $ \pkg -> do
455 canonicalSrcDirs <- traverse canonicalizePath $ (_cabalPackageInfo_packageRoot pkg </>) <$> _cabalPackageInfo_sourceDirs pkg
436 canonicalSrcDirs <- traverse canonicalizePath $ (_cabalPackageInfo_packageRoot pkg </>) <$> _cabalPackageInfo_sourceDirs pkg
456 canonicalPkgFile <- canonicalizePath $ _cabalPackageInfo_packageFile pkg
437 canonicalPkgFile <- canonicalizePath $ _cabalPackageInfo_packageFile pkg
457− pure (canonicalPkgFile `relativeTo'` canonicalPathBase, (`relativeTo'` canonicalPathBase) <$> canonicalSrcDirs)
438+ pure (makeRelative canonicalPathBase canonicalPkgFile, makeRelative canonicalPathBase <$> canonicalSrcDirs)
461− <> ["-F", "-pgmF", selfExe, "-optF", preprocessorIdentifier]
441+ $ ["-F", "-pgmF", selfExe, "-optF", preprocessorIdentifier]
462 <> concatMap (\p -> ["-optF", p]) pkgFiles
442 <> concatMap (\p -> ["-optF", p]) pkgFiles
463 <> [ "-i" <> intercalate ":" (concatMap toList pkgSrcPaths) ]
443 <> [ "-i" <> intercalate ":" (concatMap toList pkgSrcPaths) ]
465− relativeTo' = if useRelativePaths then relativeTo else const
467−baseGhciOptions :: [String]
469− [ "-ignore-dot-ghci"
470− , "-no-user-package-db"
471− , "-package-env", "-"
474-- | Run ghci repl
445-- | Run ghci repl
475runGhciRepl
446runGhciRepl
476 :: (MonadObelisk m, Foldable f)
447 :: (MonadObelisk m, Foldable f)
477 => FilePath -- ^ Path to project root
448 => FilePath -- ^ Path to project root
478− -> f CabalPackageInfo -- ^ Packages to keep unbuilt
449+ -> f CabalPackageInfo
479− -> [String] -- ^ GHCi arguments
450+ -> FilePath -- ^ Path to .ghci
481−runGhciRepl root (toList -> packages) ghciArgs =
452+runGhciRepl root (toList -> packages) dotGhci =
482 -- NOTE: We do *not* want to use $(staticWhich "ghci") here because we need the
453 -- NOTE: We do *not* want to use $(staticWhich "ghci") here because we need the
483 -- ghc that is provided by the shell in the user's project.
454 -- ghc that is provided by the shell in the user's project.
484− nixShellWithoutPkgs root True False (packageInfoToNamePathMap packages) "ghc" $
455+ nixShellWithPkgs root True False (packageInfoToNamePathMap packages) "ghc" $ Just $ "ghci " <> makeBaseGhciOptions dotGhci -- TODO: Shell escape
485− Just $ unwords $ fmap bashEscape $ "ghci" : ghciArgs
487-- | Run ghcid
457-- | Run ghcid
489 :: (MonadObelisk m, Foldable f)
459 :: (MonadObelisk m, Foldable f)
490 => FilePath -- ^ Path to project root
460 => FilePath -- ^ Path to project root
491 -> Bool -- ^ Should we chdir to root when running this process?
461 -> Bool -- ^ Should we chdir to root when running this process?
492− -> [String] -- ^ GHCi arguments
462+ -> FilePath -- ^ Path to .ghci
493− -> f CabalPackageInfo -- ^ Packages to keep unbuilt
463+ -> f CabalPackageInfo
494 -> Maybe String -- ^ Optional command to run at every reload
464 -> Maybe String -- ^ Optional command to run at every reload
496−runGhcid root chdirToRoot ghciArgs (toList -> packages) mcmd =
466+runGhcid root chdirToRoot dotGhci (toList -> packages) mcmd =
497− nixShellWithoutPkgs root True chdirToRoot (packageInfoToNamePathMap packages) "ghc" $
467+ nixShellWithPkgs root True chdirToRoot (packageInfoToNamePathMap packages) "ghc" $ Just $ unwords $ ghcidExePath : opts -- TODO: Shell escape
498− Just $ unwords $ fmap bashEscape $ ghcidExePath : opts
500− opts = concat
469+ opts =
471+ , "--command='ghci -ignore-dot-ghci " <> makeBaseGhciOptions dotGhci <> "' "
502− , ["--outputfile=ghcid-output.txt"]
472+ , "--outputfile=ghcid-output.txt"
503− , map (\x -> "--reload=" <> x) reloadFiles
473+ ] <> map (\x -> "--reload='" <> x <> "'") reloadFiles
504− , map (\x -> "--restart=" <> x) restartFiles
474+ <> map (\x -> "--restart='" <> x <> "'") restartFiles
505− , maybe [] (\cmd -> ["--test=" <> cmd]) mcmd
475+ <> testCmd
506− , ["--command=" <> unwords ("ghci" : ghciArgs)]
476+ testCmd = maybeToList (flip fmap mcmd $ \cmd -> "--test='" <> cmd <> "'") -- TODO: Shell escape
508 adjustRoot x = if chdirToRoot then makeRelative root x else x
478 adjustRoot x = if chdirToRoot then makeRelative root x else x
509 reloadFiles = map adjustRoot [root </> "config"]
479 reloadFiles = map adjustRoot [root </> "config"]
510 restartFiles = map (adjustRoot . _cabalPackageInfo_packageFile) packages
480 restartFiles = map (adjustRoot . _cabalPackageInfo_packageFile) packages
482+makeBaseGhciOptions :: FilePath -> String
483+makeBaseGhciOptions dotGhci =
485+ [ "-no-user-package-db"
487+ , "-ghci-script " <> dotGhci
512−getFreePort :: MonadIO m => m Socket.PortNumber
490+getFreePort :: MonadIO m => m PortNumber
513−getFreePort = liftIO $ Socket.withSocketsDo $ do
491+getFreePort = liftIO $ withSocketsDo $ do
514− addr:_ <- Socket.getAddrInfo (Just Socket.defaultHints) (Just "127.0.0.1") (Just "0")
492+ addr:_ <- getAddrInfo (Just defaultHints) (Just "127.0.0.1") (Just "0")
515− bracket (open addr) Socket.close Socket.socketPort
493+ bracket (open addr) close socketPort
517 open addr = do
495 open addr = do
518− sock <- Socket.socket (Socket.addrFamily addr) (Socket.addrSocketType addr) (Socket.addrProtocol addr)
496+ sock <- socket (addrFamily addr) (addrSocketType addr) (addrProtocol addr)
519− Socket.bind sock (Socket.addrAddress addr)
497+ bind sock (addrAddress addr)
520 return sock
498 return sock
@@ -526,29 +504,3 @@ pathToTree a p = go $ splitDirectories p
527 go [] = PathTree_Node (Just a) mempty
505 go [] = PathTree_Node (Just a) mempty
528 go (x : xs) = PathTree_Node Nothing $ Map.singleton x $ go xs
506 go (x : xs) = PathTree_Node Nothing $ Map.singleton x $ go xs
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
537−-- | Makes the first absolute path relative to the second absolute path.
539−-- Both input paths MUST be absolute.
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
548− $ bimap (collapse . (".." <$) . catMaybes) (collapse . catMaybes)
550− $ dropWhile (\(a,b) -> a == b)
551− $ zipDefaultWith Nothing Nothing (,)
552− (map Just $ splitDirectories base)
553− (map Just $ splitDirectories dir)
554− where collapse = foldr (</>) ""