Merge pull request #6488 from roc-lang/forgot-old-interpolation-syntax

update to new interpolation syntax

crates/cli/tests/cli_run.rs

@@ -911,7 +911,7 @@ mod cli_run {
                     provides [main] to pf
 
                 main =
-                    Stdout.line "\nThis roc file can print it's own source code. The source is:\n\n\(ownCode)"
+                    Stdout.line "\nThis roc file can print it's own source code. The source is:\n\n$(ownCode)"
 
                 "#
             ),

crates/cli/tests/fixtures/packages/app.roc

@@ -3,4 +3,4 @@ app "packages-test"
     imports [json.JsonParser, csv.Csv]
     provides [main] to pf
 
-main = "Hello, World! \(JsonParser.example) \(Csv.example)"
+main = "Hello, World! $(JsonParser.example) $(Csv.example)"

crates/cli_testing_examples/benchmarks/Quicksort.roc

@@ -10,7 +10,7 @@ show = \list ->
             |> List.map Num.toStr
             |> Str.joinWith ", "
 
-        "[\(content)]"
+        "[$(content)]"
 
 sortBy : List a, (a -> Num *) -> List a
 sortBy = \list, toComparable ->

crates/cli_testing_examples/benchmarks/rBTreeInsert.roc

@@ -26,7 +26,7 @@ showRBTree = \tree, showKey, showValue ->
             sL = nodeInParens left showKey showValue
             sR = nodeInParens right showKey showValue
 
-            "Node \(sColor) \(sKey) \(sValue) \(sL) \(sR)"
+            "Node $(sColor) $(sKey) $(sValue) $(sL) $(sR)"
 
 nodeInParens : RedBlackTree k v, (k -> Str), (v -> Str) -> Str
 nodeInParens = \tree, showKey, showValue ->
@@ -37,7 +37,7 @@ nodeInParens = \tree, showKey, showValue ->
         Node _ _ _ _ _ ->
             inner = showRBTree tree showKey showValue
 
-            "(\(inner))"
+            "($(inner))"
 
 showColor : NodeColor -> Str
 showColor = \color ->

crates/cli_testing_examples/benchmarks/testAStar.roc

@@ -14,7 +14,7 @@ main =
 #
 #             _ ->
 #                 ns = Num.toStr n
-#                 Task.putLine "No test \(ns)"
+#                 Task.putLine "No test $(ns)"
 showBool : Bool -> Str
 showBool = \b ->
     if

crates/compiler/builtins/roc/Dict.roc

@@ -857,7 +857,7 @@ increaseSize = \@Dict { data, maxBucketCapacity, maxLoadFactor, shifts } ->
             shifts: newShifts,
         }
     else
-        crash "Dict hit limit of \(Num.toStr maxBucketCount) elements. Unable to grow more."
+        crash "Dict hit limit of $(Num.toStr maxBucketCount) elements. Unable to grow more."
 
 allocBucketsFromShift : U8, F32 -> (List Bucket, U64)
 allocBucketsFromShift = \shifts, maxLoadFactor ->

crates/compiler/builtins/roc/Str.roc

@@ -844,7 +844,7 @@ replaceFirst : Str, Str, Str -> Str
 replaceFirst = \haystack, needle, flower ->
     when splitFirst haystack needle is
         Ok { before, after } ->
-            "\(before)\(flower)\(after)"
+            "$(before)$(flower)$(after)"
 
         Err NotFound -> haystack
 
@@ -862,7 +862,7 @@ replaceLast : Str, Str, Str -> Str
 replaceLast = \haystack, needle, flower ->
     when splitLast haystack needle is
         Ok { before, after } ->
-            "\(before)\(flower)\(after)"
+            "$(before)$(flower)$(after)"
 
         Err NotFound -> haystack
 

crates/compiler/can/tests/test_can.rs

@@ -1831,7 +1831,7 @@ mod test_can {
     //                      "abcd\$(efg)hij"
     //                      "#
     //         ),
-    //         Str(r"abcd\(efg)hij".into()),
+    //         Str(r"abcd$(efg)hij".into()),
     //     );
     // }
 

crates/compiler/load/tests/test_reporting.rs

@@ -5549,15 +5549,15 @@ mod test_reporting {
                 r#"
             greeting = "Privet"
 
-            if Bool.true then 1 else "\(greeting), World!"
+            if Bool.true then 1 else "$(greeting), World!"
             "#,
             ),
             @r#"
     ── TYPE MISMATCH in /code/proj/Main.roc ────────────────────────────────────────
 
     This `if` has an `else` branch with a different type from its `then` branch:
 
-    6│      if Bool.true then 1 else "\(greeting), World!"
+    6│      if Bool.true then 1 else "$(greeting), World!"
                                      ^^^^^^^^^^^^^^^^^^^^^
 
     The `else` branch is a string of type:

crates/compiler/module/src/called_via.rs

@@ -86,7 +86,7 @@ pub enum CalledVia {
     UnaryOp(UnaryOp),
 
     /// This call is the result of desugaring string interpolation,
-    /// e.g. "\(first) \(last)" is transformed into Str.concat (Str.concat first " ") last.
+    /// e.g. "$(first) $(last)" is transformed into Str.concat (Str.concat first " ") last.
     StringInterpolation,
 
     /// This call is the result of desugaring a Record Builder field.

crates/compiler/solve/tests/solve_expr.rs

@@ -312,7 +312,7 @@ mod solve_expr {
                 r#"
                 whatItIs = "great"
 
-                "type inference is \(whatItIs)!"
+                "type inference is $(whatItIs)!"
             "#
             ),
             "Str",
@@ -326,7 +326,7 @@ mod solve_expr {
                 r#"
                 whatItIs = "great"
 
-                str = "type inference is \(whatItIs)!"
+                str = "type inference is $(whatItIs)!"
 
                 whatItIs
             "#
@@ -342,7 +342,7 @@ mod solve_expr {
                 r#"
                 rec = { whatItIs: "great" }
 
-                str = "type inference is \(rec.whatItIs)!"
+                str = "type inference is $(rec.whatItIs)!"
 
                 rec
             "#
@@ -4739,7 +4739,7 @@ mod solve_expr {
                 r#"
                 setRocEmail : _ -> { name: Str, email: Str }_
                 setRocEmail = \person ->
-                    { person & email: "\(person.name)@roclang.com" }
+                    { person & email: "$(person.name)@roclang.com" }
                 setRocEmail
                 "#
             ),

crates/compiler/test_gen/src/gen_abilities.rs

@@ -948,7 +948,7 @@ fn specialize_unique_newtype_records() {
             main =
                 when Str.fromUtf8 (Encode.toBytes {a: Bool.true} TotallyNotJson.json) is
                     Ok s -> when Str.fromUtf8 (Encode.toBytes {b: Bool.true} TotallyNotJson.json) is
-                        Ok t -> "\(s)\(t)"
+                        Ok t -> "$(s)$(t)"
                         _ -> "<bad>"
                     _ -> "<bad>"
             "#

crates/compiler/test_gen/src/gen_list.rs

@@ -330,7 +330,7 @@ fn list_map_try_ok() {
             List.mapTry [1, 2, 3] \num ->
                 str = Num.toStr (num * 2)
 
-                Ok "\(str)!"
+                Ok "$(str)!"
         "#,
         // Result Str [] is unwrapped to just Str
         RocList::<RocStr>::from_slice(&[
@@ -3738,10 +3738,10 @@ fn issue_3571_lowlevel_call_function_with_bool_lambda_set() {
                 List.concat state mappedVals
 
             add2 : Str -> Str
-            add2 = \x -> "added \(x)"
+            add2 = \x -> "added $(x)"
 
             mul2 : Str -> Str
-            mul2 = \x -> "multiplied \(x)"
+            mul2 = \x -> "multiplied $(x)"
 
             foo = [add2, mul2]
             bar = ["1", "2", "3", "4"]

crates/compiler/test_gen/src/gen_primitives.rs

@@ -3197,7 +3197,7 @@ fn recursively_build_effect() {
                 hi = "Hello"
                 name = "World"
 
-                "\(hi), \(name)!"
+                "$(hi), $(name)!"
 
             main =
                 when nestHelp 4 is
@@ -3953,8 +3953,8 @@ fn compose_recursive_lambda_set_productive_toplevel() {
             compose = \f, g -> \x -> g (f x)
 
             identity = \x -> x
-            exclaim = \s -> "\(s)!"
-            whisper = \s -> "(\(s))"
+            exclaim = \s -> "$(s)!"
+            whisper = \s -> "($(s))"
 
             main =
                 res: Str -> Str
@@ -3976,8 +3976,8 @@ fn compose_recursive_lambda_set_productive_nested() {
             compose = \f, g -> \x -> g (f x)
 
             identity = \x -> x
-            exclaim = \s -> "\(s)!"
-            whisper = \s -> "(\(s))"
+            exclaim = \s -> "$(s)!"
+            whisper = \s -> "($(s))"
 
             res: Str -> Str
             res = List.walk [ exclaim, whisper ] identity compose
@@ -3998,8 +3998,8 @@ fn compose_recursive_lambda_set_productive_inferred() {
             compose = \f, g -> \x -> g (f x)
 
             identity = \x -> x
-            exclaim = \s -> "\(s)!"
-            whisper = \s -> "(\(s))"
+            exclaim = \s -> "$(s)!"
+            whisper = \s -> "($(s))"
 
             res = List.walk [ exclaim, whisper ] identity compose
             res "hello"
@@ -4024,8 +4024,8 @@ fn compose_recursive_lambda_set_productive_nullable_wrapped() {
                 else \x -> f (g x)
 
              identity = \x -> x
-             exclame = \s -> "\(s)!"
-             whisper = \s -> "(\(s))"
+             exclame = \s -> "$(s)!"
+             whisper = \s -> "($(s))"
 
              main =
                  res: Str -> Str
@@ -4552,7 +4552,7 @@ fn reset_recursive_type_wraps_in_named_type() {
                 Cons x xs ->
                   strX = f x
                   strXs = printLinkedList xs f
-                  "Cons \(strX) (\(strXs))"
+                  "Cons $(strX) ($(strXs))"
             "#
         ),
         RocStr::from("Cons 2 (Cons 3 (Cons 4 (Nil)))"),

crates/compiler/test_mono/src/tests.rs

@@ -1679,7 +1679,7 @@ fn lambda_capture_niches_with_other_lambda_capture() {
                 when val is
                     _ -> ""
 
-        capture2 = \val -> \{} -> "\(val)"
+        capture2 = \val -> \{} -> "$(val)"
 
         x : [A, B, C]
         x = A
@@ -1984,7 +1984,7 @@ fn polymorphic_expression_unification() {
         ]
         parseFunction : Str -> RenderTree
         parseFunction = \name ->
-            last = Indent [Text ".trace(\"\(name)\")" ]
+            last = Indent [Text ".trace(\"$(name)\")" ]
             Indent [last]
 
         values = parseFunction "interface_header"
@@ -2540,7 +2540,7 @@ fn recursively_build_effect() {
             hi = "Hello"
             name = "World"
 
-            "\(hi), \(name)!"
+            "$(hi), $(name)!"
 
         main =
             when nestHelp 4 is
@@ -2856,8 +2856,8 @@ fn compose_recursive_lambda_set_productive_nullable_wrapped() {
             else \x -> f (g x)
 
          identity = \x -> x
-         exclame = \s -> "\(s)!"
-         whisper = \s -> "(\(s))"
+         exclame = \s -> "$(s)!"
+         whisper = \s -> "($(s))"
 
          main =
              res: Str -> Str

crates/glue/platform/Types.roc

@@ -45,7 +45,7 @@ shape = \@Types types, id ->
         Err OutOfBounds ->
             idStr = Num.toStr (InternalTypeId.toNat id)
 
-            crash "TypeId #\(idStr) was not found in Types. This should never happen, and means there was a bug in `roc glue`. If you have time, please open an issue at <https://github.com/roc-lang/roc/issues>"
+            crash "TypeId #$(idStr) was not found in Types. This should never happen, and means there was a bug in `roc glue`. If you have time, please open an issue at <https://github.com/roc-lang/roc/issues>"
 
 alignment : Types, TypeId -> U32
 alignment = \@Types types, id ->
@@ -54,7 +54,7 @@ alignment = \@Types types, id ->
         Err OutOfBounds ->
             idStr = Num.toStr (InternalTypeId.toNat id)
 
-            crash "TypeId #\(idStr) was not found in Types. This should never happen, and means there was a bug in `roc glue`. If you have time, please open an issue at <https://github.com/roc-lang/roc/issues>"
+            crash "TypeId #$(idStr) was not found in Types. This should never happen, and means there was a bug in `roc glue`. If you have time, please open an issue at <https://github.com/roc-lang/roc/issues>"
 
 size : Types, TypeId -> U32
 size = \@Types types, id ->
@@ -63,4 +63,4 @@ size = \@Types types, id ->
         Err OutOfBounds ->
             idStr = Num.toStr (InternalTypeId.toNat id)
 
-            crash "TypeId #\(idStr) was not found in Types. This should never happen, and means there was a bug in `roc glue`. If you have time, please open an issue at <https://github.com/roc-lang/roc/issues>"
+            crash "TypeId #$(idStr) was not found in Types. This should never happen, and means there was a bug in `roc glue`. If you have time, please open an issue at <https://github.com/roc-lang/roc/issues>"