language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-30 16:47:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #7497 from smores56/new-interpolation-syntax

Browse source 
Move to new interpolation syntax
This commit is contained in:
Sam Mohr 2025-01-10 15:25:12 -08:00 • committed by GitHub
commit 528d1d2b69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 630 additions and 596 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/compiler/test_syntax/tests/snapshots/pass/block_string_ann.expr.formatted.roc
View file

@ -1,2 +1,2 @@
"$(g)" : q
"${g}" : q
f

2
crates/compiler/test_syntax/tests/snapshots/pass/block_string_ann.expr.roc
View file

@ -1,2 +1,2 @@
"""$(g)""":q
"""${g}""":q
f

4
crates/compiler/test_syntax/tests/snapshots/pass/multiline_str_crazyness.expr.formatted.roc
View file

@ -1,5 +1,5 @@
"""
"""
"$(i
"${i
"""
""")"
"""}"

2
crates/compiler/test_syntax/tests/snapshots/pass/multiline_str_crazyness.expr.roc
View file

@ -1 +1 @@
"""""""$(i"""""")"
"""""""${i""""""}"

8
crates/compiler/test_syntax/tests/snapshots/pass/multiline_str_interpolation_records.expr.formatted.roc
View file

@ -1,8 +1,8 @@
"""
$({
${{
}
i)
$({
i}
${{
}
i)
i}
"""

8
crates/compiler/test_syntax/tests/snapshots/pass/multiline_str_interpolation_records.expr.roc
View file

@ -1,4 +1,4 @@
"""$({
}i)
$({
}i)"""
"""${{
}i}
${{
}i}"""

4
crates/compiler/test_syntax/tests/snapshots/pass/parens_comment_in_str_interpolation.expr.formatted.roc
View file

@ -1,2 +1,2 @@
"$(S #
)"
"${S #
}"

4
crates/compiler/test_syntax/tests/snapshots/pass/parens_comment_in_str_interpolation.expr.roc
View file

@ -1,2 +1,2 @@
"$((S#
))"
"${(S#
)}"

2
crates/compiler/test_syntax/tests/snapshots/pass/pizza_question.moduledefs.roc
View file

@ -3,5 +3,5 @@ main =
|> List.dropFirst 1
|> List.mapTry? Str.toU8
|> List.sum
|> \total -> "Sum of numbers: $(Num.to_str total)"
|> \total -> "Sum of numbers: ${Num.to_str total}"
|> Str.toUpper

8
crates/compiler/test_syntax/tests/test_fmt.rs
View file

@ -6575,13 +6575,13 @@ mod test_fmt {
expr_formats_to(
indoc!(
"
x = \"foo:\u{200B} $(bar).\"
x = \"foo:\u{200B} ${bar}.\"
x
"
),
indoc!(
r#"
x = "foo:\u(200b) $(bar)."
x = "foo:\u(200b) ${bar}."
x
"#
),
@ -6595,7 +6595,7 @@ mod test_fmt {
"
x =
\"\"\"
foo:\u{200B} $(bar).
foo:\u{200B} ${bar}.
\"\"\"
x
"
@ -6604,7 +6604,7 @@ mod test_fmt {
r#"
x =
"""
foo:\u(200b) $(bar).
foo:\u(200b) ${bar}.
"""
x
"#

8
crates/compiler/test_syntax/tests/test_snapshots.rs
View file

@ -1036,7 +1036,7 @@ mod test_snapshots {
#[test]
fn string_with_interpolation_in_middle() {
assert_segments(r#""Hi, $(name)!""#, |arena| {
assert_segments(r#""Hi, ${name}!""#, |arena| {
let expr = arena.alloc(Var {
module_name: "",
ident: "name",
@ -1052,7 +1052,7 @@ mod test_snapshots {
#[test]
fn string_with_interpolation_in_front() {
assert_segments(r#""$(name), hi!""#, |arena| {
assert_segments(r#""${name}, hi!""#, |arena| {
let expr = arena.alloc(Var {
module_name: "",
ident: "name",
@ -1067,7 +1067,7 @@ mod test_snapshots {
#[test]
fn string_with_interpolation_in_back() {
assert_segments(r#""Hello $(name)""#, |arena| {
assert_segments(r#""Hello ${name}""#, |arena| {
let expr = arena.alloc(Var {
module_name: "",
ident: "name",
@ -1082,7 +1082,7 @@ mod test_snapshots {
#[test]
fn string_with_multiple_interpolations() {
assert_segments(r#""Hi, $(name)! How is $(project) going?""#, |arena| {
assert_segments(r#""Hi, ${name}! How is ${project} going?""#, |arena| {
let expr1 = arena.alloc(Var {
module_name: "",
ident: "name",