-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Correct offset for single-string interpolation #8629
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
c691beb
failing positions
martijnhoekstra a8040df
offset correction for stringlit interpolation
martijnhoekstra e55aa85
adjust repl test position
martijnhoekstra 506a9c4
incorporate review
martijnhoekstra c3432ff
update expect
martijnhoekstra 31e9464
alternative position correction
martijnhoekstra File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package dotty.tools | ||
package dotc | ||
package parsing | ||
|
||
import ast.untpd._ | ||
import org.junit.Test | ||
|
||
class PositionTest extends ParserTest { | ||
martijnhoekstra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
val tq = "\"\"\"" | ||
val program = s""" | ||
|class A { | ||
| val expr = 42 | ||
| val s0 = s"string1" | ||
| val s1 = s"string1$${expr}string2" | ||
| val s2 = s"string1$${expr}string2$${expr}string3" | ||
| val s0m = s${tq}string1${tq} | ||
| val s1m = s${tq}string1$${expr}string2${tq} | ||
| val s2m = s${tq}string1$${expr}string2$${expr}string3${tq} | ||
|}""".stripMargin | ||
|
||
@Test | ||
def interpolationLiteralPosition: Unit = { | ||
val t = parseText(program) | ||
t match { | ||
case PackageDef(_, List(TypeDef(_, Template(_, _, _, statements: List[Tree])))) => { | ||
val interpolations = statements.collect{ case ValDef(_, _, InterpolatedString(_, int)) => int } | ||
val lits = interpolations.flatten.flatMap { | ||
case l @ Literal(_) => List(l) | ||
case Thicket(trees) => trees.collect { case l @ Literal(_) => l } | ||
} | ||
for { | ||
lit <- lits | ||
Literal(c) = lit | ||
str <- List(c.value).collect { case str: String => str} | ||
} { | ||
val fromPos = program.substring(lit.span.start, lit.span.end) | ||
assert(fromPos == str, s"$fromPos == $str") | ||
} | ||
} | ||
} | ||
} | ||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.