Always qualify ambiguous types #110
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
dnkoutso
commented
Jan 7, 2024
| @@ -268,7 +268,7 @@ class FileSpecTests { | |||
|
|
|||
| class Test { | |||
|
|
|||
| let a: Array | |||
| let a: Swift.Array | |||
There was a problem hiding this comment.
This makes sense because above we do:
.addProperty("a", typeName("Swift.Array"))
.addProperty("b", typeName("Foundation.Array"))
dnkoutso
force-pushed
the
always_qualify_duplicate_types
branch
from
1542b64
to
5ec895e
Compare
kdubb
approved these changes
Jan 8, 2024
| @@ -443,7 +447,7 @@ internal class CodeWriter( | |||
| /** | |||
| * Returns the non-colliding importable types and module names for all referenced types. | |||
| */ | |||
| private fun generateImports(): Pair<Map<String, DeclaredTypeName>, Set<String>> { | |||
| private fun generateImports(): Pair<Map<String, List<DeclaredTypeName>>, Set<String>> { | |||
There was a problem hiding this comment.
Would it be better to do the collision check inside and still only export the actually imported types? Rather than a list with possible collisions?
Not actually sure if that idea works.
There was a problem hiding this comment.
hmmm I will give it a shot! I see what you are suggesting.
There was a problem hiding this comment.
@kdubb I attempted it and tried to use day with referencedTypeNames but that broke a bunch of the tests.
I think this change gives me the most confidence given all tests pass and the ones that changed made sense ot 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.
In this PR if we find ambiguous types we do not qualify them all. The test case was written against Foundation types which are almost always implicitly available so any file that was producing such output was successfully compiling.
A problem arises when the types that collide are not within Foundation system framework but rather some custom frameworks.
This logic here updates to always qualify them if there are more than one found for a given type.