Prevent aliased imports from colliding with existing imports #2052
+144
−22
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
damianw
force-pushed
the
import-alias-collision
branch
2 times, most recently
from
714cbdb to
ce2fbfe
Compare
JakeWharton
approved these changes
Dec 30, 2024
kotlinpoet/src/jvmMain/kotlin/com/squareup/kotlinpoet/CodeWriter.kt
Outdated
Show resolved
Hide resolved
damianw
force-pushed
the
import-alias-collision
branch
from
ce2fbfe to
a4d5afe
Compare
damianw
force-pushed
the
import-alias-collision
branch
from
a4d5afe to
6e3f114
Compare
|
Will wait for others to check it out later this week, or next. It's an off week for everyone (or it should be). |
Egorand
approved these changes
Jan 2, 2025
kotlinpoet/src/jvmMain/kotlin/com/squareup/kotlinpoet/CodeWriter.kt
Outdated
Show resolved
Hide resolved
Egorand
reviewed
Jan 2, 2025
kotlinpoet/src/jvmMain/kotlin/com/squareup/kotlinpoet/CodeWriter.kt
Outdated
Show resolved
Hide resolved
Co-authored-by: Egor Andreevich <[email protected]>
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.
Fixes #2046.
The simplest solution seemed to be to also check against currently-imported names when generating import aliases -- if a name is already imported, use more segments. This introduced the possibility that we might run out of segments though, which I handled by appending underscores if we reach that condition.
docs/changelog.mdhas been updated if applicable