[FIR] Don't unescape twice when processing ESCAPE_STRING_TEMPLATE_ENTRY #5465
+6
−14
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
KvanTTT
reviewed
Jul 1, 2025
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.
This change avoids needlessly unescaping a character escape sequence in a string twice.
In the psi2fir case, different unescaping implementations were used for the path with template expressions and the path without any template expressions ("fast-pass");
ConversionUtils.escapedStringToCharactervs.StringUtil.unescapeStringCharacters. The latter supports all of Java's escape sequences instead of just the ones supported by Kotlin. This was not a problem in practice, because whenConversionUtils.escapedStringToCharacterreturned an error, the potentially wrongly unescaped value insbwas not used. So this PR does not change the output ofAbstractRawFirBuilder.toInterpolatingCall.