Skip to content
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

Jump to bottom

Resolve absolute path to operatorsFile #116

Closed
wants to merge 2 commits into from
Closed

Resolve absolute path to operatorsFile #116

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
844ea5e
Resolve absolute path to operatorsFile
Dec 8, 2023
4adbe2c
Update bin/Main.purs
colinwahl Dec 8, 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
12 changes: 7 additions & 5 deletions bin/Main.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,13 @@ resolveRcForDir root = go List.Nil
case FormatOptions.fromJson =<< parseJson contents' of
Left jsonError ->
throwError $ error $ "Could not decode " <> filePath <> ": " <> printJsonDecodeError jsonError
Right options -> do
let
resolvedOptions =
options { operatorsFile = Path.relative dir <$> options.operatorsFile }
pure $ unwind cache (Just resolvedOptions) (List.Cons dir paths)
Right options -> case options.operatorsFile of
Nothing -> pure $ unwind cache (Just options) (List.Cons dir paths)
Just file -> do
operatorsFile <- liftEffect $ Path.resolve [ dir ] file
let
resolvedOptions = options { operatorsFile = Just operatorsFile }
pure $ unwind cache (Just resolvedOptions) (List.Cons dir paths)
colinwahl marked this conversation as resolved.
Show resolved Hide resolved

unwind :: RcMap -> Maybe FormatOptions -> List FilePath -> Tuple (Maybe FormatOptions) RcMap
unwind cache res = case _ of
Expand Down
Loading