Skip to content

better ghci result after :load collisions with Main module #1886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgsloan merged 1 commit into from
Mar 9, 2016
Merged

better ghci result after :load collisions with Main module #1886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/Stack/Ghci.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,9 @@ ghci opts@GhciOpts{..} = do
T.unwords (map T.pack (nubOrd omittedOpts)))
allModules <- checkForDuplicateModules ghciNoLoadModules pkgs
oiDir <- objectInterfaceDir bconfig
(modulesToLoad, thingsToLoad) <- if ghciNoLoadModules then return ([], []) else do
(modulesToLoad, mainFile) <- if ghciNoLoadModules then return ([], Nothing) else do
mainFile <- figureOutMainFile bopts mainIsTargets targets pkgs
let thingsToLoad = maybe [] (return . toFilePath) mainFile <> allModules
return (allModules, thingsToLoad)
return (allModules, mainFile)
let odir =
[ "-odir=" <> toFilePathNoTrailingSep oiDir
, "-hidir=" <> toFilePathNoTrailingSep oiDir ]
Expand All @@ -160,9 +159,10 @@ ghci opts@GhciOpts{..} = do
else do
let scriptPath = tmpDir </> $(mkRelFile "ghci-script")
fp = toFilePath scriptPath
loadModules = ":load " <> unwords (map show thingsToLoad)
loadModules = ":load " <> unwords (map show modulesToLoad)
addMainFile = maybe "" ((":add " <>) . toFilePath) mainFile
bringIntoScope = ":module + " <> unwords modulesToLoad
liftIO (writeFile fp (unlines [loadModules,bringIntoScope]))
liftIO (writeFile fp (unlines [loadModules,addMainFile,bringIntoScope]))
setScriptPerms fp
execGhci (macrosOpts ++ ["-ghci-script=" <> fp])

Expand Down