[kotlin] Fix #6648: Multi-dollar interpolation for regular strings#6653
Merged
adangel merged 2 commits intoMay 8, 2026
Merged
Conversation
…ue 6648) Kotlin 2.2 introduces multi-dollar string interpolation: a string prefixed with N dollar signs requires N dollars to start an interpolation sequence (e.g. $$"..." needs $$ for interpolation). Three grammar issues are fixed: - Inside mode lacked MultiDollarPrefix, causing parse errors in function and annotation arguments - LineString mode did not check multiLineMinDollars when matching LineStrRef and LineStrExprStart tokens - lineStringLiteral parser rule was missing MultiDollarPrefix Tests added: - Regression tests for the two reported cases (function arg, annotation arg) - KEEP-375 spec examples as parser smoke tests - Tree dump test for LineStrRef and LineStrExprStart in multi-dollar context (moved to KotlinParserMultiLineStringTest) References: pmd#6648 Spec: https://github.com/Kotlin/KEEP/blob/main/proposals/KEEP-0375-dollar-escape.md
Contributor
|
Compared to main: (comment created at 2026-05-07 15:02:28+00:00 for decb6f6) |
adangel
changed the title
adangel
approved these changes
May 8, 2026
|
|
||
| @Test | ||
| void multiDollarLineStringInFunctionArg() { | ||
| assertDoesNotThrow(() -> KotlinParsingHelper.DEFAULT.parse( |
Member
There was a problem hiding this comment.
I guess assertDoesNotThrow only makes sense, when #6650 is merged...
adangel
added
the
in:grammar
adangel
changed the title
adangel
added a commit
that referenced
this pull request
May 8, 2026
adangel
added a commit
that referenced
this pull request
May 8, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Kotlin 2.2 introduces multi-dollar string interpolation: a string prefixed with N dollar signs requires N dollars to start an interpolation sequence (e.g.
$$"..."needs$$for interpolation).Three grammar issues are fixed:
Tests added:
Spec: https://github.com/Kotlin/KEEP/blob/main/proposals/KEEP-0375-dollar-escape.md
Related issues
Ready?
./mvnw clean verifypasses (checked automatically by github actions)