Avoid missing interpolator in display string

som-snytt · May 15, 2024 · cd4b2f0 · cd4b2f0
1 parent e231592
commit cd4b2f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ val scala211 = "2.11.12"
 val scala212 = "2.12.19"
 val scala213 = "2.13.14"
 val scala3 = "3.1.2"
-val scalaFull = Seq(scala213, scala212, scala211, scala3)
+val scalaFull = Seq(scala213, scala212, /*scala211,*/ scala3)
 ThisBuild / scalaVersion := scala213
 Global / semanticdbEnabled := true
 Global / semanticdbVersion := "4.9.3"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.12.0")
+  Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.16.0")
 val scalaNativeVersion =
-  Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.4.9")
+  Option(System.getenv("SCALANATIVE_VERSION")).getOrElse("0.5.1")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")

diff --git a/src/main/scala-2/com/eed3si9n/expecty/RecorderMacro.scala b/src/main/scala-2/com/eed3si9n/expecty/RecorderMacro.scala
@@ -126,9 +126,19 @@ Instrumented AST: ${showRaw(instrumented)}")
     """
     )
 
+    // to avoid missing interpolator lint, turn "a$b" into "a" + "$" + "b"
+    val cleanSource = {
+      val N = source.length - 1
+      source.indexOf('$') match {
+        case -1 | N => q"$source"
+        case _ =>
+          val parts = source.split('$').toList
+          parts.tail.foldLeft(q"${parts.head}")((t, s) => q"""$t + "$$" + $s""")
+      }
+    }
     Apply(
       Select(Ident(termName(context)("$com_eed3si9n_expecty_recorderRuntime")), termName(context)("recordExpression")),
-      List(q"$source", q"$ast", instrumented, getSourceLocation)
+      List(cleanSource, q"$ast", instrumented, getSourceLocation)
     )
   }