Improve duplicate imports #1196
Merged
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
johnynek
commented
Apr 11, 2024
| @@ -25,11 +25,11 @@ object NameKind { | |||
|
|
|||
| def externals[T](from: Package.Typed[T]): Iterable[ExternalDef[T]] = { | |||
| val prog = from.program | |||
| prog.externalDefs.to(LazyList).map { n => | |||
| prog._1.externalDefs.to(LazyList).map { n => | |||
There was a problem hiding this comment.
Use the implicit class methods in this file
| @@ -39,12 +39,6 @@ final case class Package[A, B, C, +D]( | |||
| case _ => false | |||
| } | |||
|
|
|||
| // TODO, this isn't great | |||
| @@ -155,7 +154,7 @@ object Package { | |||
| inferred.mapProgram(_ => ()).replaceImports(Nil) | |||
|
|
|||
| def setProgramFrom[A, B](t: Typed[A], newFrom: B): Typed[A] = | |||
There was a problem hiding this comment.
Remove this and just inline it in the one place it is used.
| @@ -468,7 +467,7 @@ object Package { | |||
| val tpes = Doc.text("types: ") + Doc | |||
| .intercalate( | |||
| Doc.comma + Doc.line, | |||
| pack.program.types.definedTypes.toList.map { case (_, t) => | |||
| pack.program._1.types.definedTypes.toList.map { case (_, t) => | |||
| def externalDefs: List[Identifier.Bindable] = | ||
| pack.program._1.externalDefs | ||
|
|
||
| def localImport(n: Identifier): Option[(Package.Interface, ImportedName[NonEmptyList[Referant[Kind.Arg]]])] = |
| val candidates = | ||
| nearest(iname.originalName, exportMap, 3) | ||
| .map(ident => Doc.text(ident._1.sourceCodeRepr)) | ||
|
|
||
| val near = Doc.text(" Nearest: ") + |
There was a problem hiding this comment.
Check that candidates is nonEmpty
| @@ -313,9 +321,24 @@ object PackageMap { | |||
| Memoize.memoizeDagFuture[ResolvedU, Ior[NonEmptyList[ | |||
| PackageError | |||
| ], (TypeEnv[Kind.Arg], Package.Inferred)]] { | |||
| // TODO, we ignore importMap here, we only check earlier we don't | |||
|
|
||
| def resolvedImports: ImportMap[Package.Resolved, Unit] = | ||
| imps.traverse[cats.Id, Package.Resolved, Unit] { (p, i) => | ||
| (nameToRes(p), i) |
There was a problem hiding this comment.
This apply should be safe since we have constructed this ImportMap from the same source.
Add a comment with this explanation
| val inferImports: FutVal[List[ImpRes]] = | ||
| imports.parTraverse(stepImport(_)) | ||
| val inferImports: FutVal[ImportMap[Package.Interface, NonEmptyList[Referant[Kind.Arg]]]] = | ||
| resolvedImports.traverse(stepImport(_, _)) |
There was a problem hiding this comment.
Make sure this is using Parallel Applicative
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.
I noticed if I made a duplicate import that does not exist to a name that collides with a predef name, the error message is bad.
I should add a test exercising this error message to be sure. There were two things: