Skip to content

Accept directories in 'findCradle' #415

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
merged 2 commits into from
Oct 10, 2023
Merged

Accept directories in 'findCradle' #415

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e34ef7f
Accept directories in 'findCradle'
fendor Oct 9, 2023
e5ae93a
Add testcases for 'findCradle'
fendor Oct 9, 2023
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
11 changes: 9 additions & 2 deletions src/HIE/Bios/Cradle.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,17 @@ import Text.ParserCombinators.ReadP (readP_to_S)

----------------------------------------------------------------

-- | Given root\/foo\/bar.hs, return root\/hie.yaml, or wherever the yaml file was found.
-- | Given @root\/foo\/bar.hs@, return @root\/hie.yaml@, or wherever the yaml file was found.
--
-- Note, 'findCradle' used to **not** work for directories and required a Haskell file.
-- This has been fixed since @0.14.0@.
-- However, 'loadCradle' and 'loadImplicitCradle' still require a Haskell
-- source file and won't work properly with a directory parameter.
findCradle :: FilePath -> IO (Maybe FilePath)
findCradle wfile = do
let wdir = takeDirectory wfile
wdir <- doesDirectoryExist wfile >>= \case
Copy link
Contributor

@michaelpj michaelpj Oct 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this will behave a bit weirdly for directories that don't exist. I guess we have no way of knowing if a path points to a directory or not without checking on the filesystem...

True -> pure wfile
False -> pure (takeDirectory wfile)
runMaybeT (yamlConfig wdir)

-- | Given root\/hie.yaml load the Cradle.
Expand Down