Fix annotation arguments using string templates not being parsed correctly #632
Conversation
This file contains hidden or 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
| if (templateEntry is KtSimpleNameStringTemplateEntry || | ||
| templateEntry is KtBlockStringTemplateEntry | ||
| ) { | ||
| parsePsiElement(templateEntry.expression as PsiElement) |
Collaborator
There was a problem hiding this comment.
It seems like the bug is that we're calling getChildOfType instead of getChildrenOfType which is why the rest of the string doesn't come along. Why are you parsing both of the elements instead of just doing a joinToString(", ") on both parts?
Member
Author
There was a problem hiding this comment.
In this case there were two separate issues. You're correct about the first one which was that we were only grabbing text for the first part of the template regardless of template length. The second issue was that we were just treating the template as plain text, which results in constants staying as their code text instead of their value (e.g. returning ${CONSTANT} instead of resolving it).
Collaborator
|
Beautiful PR. Thanks! |
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 #631