Allow changing the root directory for resolving imports #54
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We can now do
`Resolver.resolve(expr)`
or
`Resolver.resolveRelativeTo(Paths.get("/tmp"))(expr)`
travisbrown
reviewed
Apr 21, 2020
| //We add a placeholder filename "package.dhall" for the base directory as a Local import must have a filename | ||
| new ResolveImportsVisitor(semanticCache, | ||
| semiSemanticCache, | ||
| NonEmptyList.one(Local(relativeTo.resolve("package.dhall")))) |
There was a problem hiding this comment.
I'll try it out tomorrow, but this will do the right thing if relativeTo is a file, right?
There was a problem hiding this comment.
Oh good question! The intention was definitely that it be a directory. I suspect it might not work. Will have a think about that one
travisbrown
approved these changes
Apr 21, 2020
travisbrown
reviewed
Apr 21, 2020
| result <- if (mode == ImportMode.LOCATION) importLocation(imp) else importNonLocation(imp, mode, hash) | ||
| } yield result | ||
| } | ||
| } | ||
|
|
||
| private object ResolveImportsVisitor { | ||
| def apply[F[_] <: AnyRef: Sync: Client]: F[ResolveImportsVisitor[F]] = | ||
| Sync[F].map2(ImportCache[F]("dhall"), ImportCache[F]("dhallj"))(apply[F](_, _)) | ||
| def apply[F[_] <: AnyRef: Sync: Client](relativeTo: Path): F[ResolveImportsVisitor[F]] = |
There was a problem hiding this comment.
What do you think about keeping around the old method signatures as well, using cwd as above? MiMa doesn't like the missing applys, even though this is a private object. Then we could remove them in 0.3.x.
There was a problem hiding this comment.
Oh wow. I didn't think it would care about a private object. Yeah, that's fine by me
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We can now do
Resolver.resolve(expr)or
Resolver.resolveRelativeTo(Paths.get("/tmp"))(expr)