We can ship 1.0 without multiline for Groovy and Scala, delegate them…

… out to #105 and #106.
diffplug · Jan 18, 2024 · 71c59c7 · 71c59c7
1 parent 282b7bf
commit 71c59c7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt b/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/guts/Literals.kt
@@ -108,16 +108,20 @@ internal object LiteralString : LiteralFormat<String>() {
           when (language) {
             Language.SCALA, // scala only does $ substitution for s" and f" strings
             Language.JAVA_PRE15,
-            Language.JAVA -> encodeSingleJava(value)
             Language.GROOVY,
+            Language.JAVA -> encodeSingleJava(value)
             Language.KOTLIN -> encodeSingleJavaWithDollars(value)
           }
       else
           when (language) {
+            // TODO: support triple-quoted strings in scala
+            // https://github.com/diffplug/selfie/issues/106
             Language.SCALA,
+            // TODO: support triple-quoted strings in groovy
+            // https://github.com/diffplug/selfie/issues/105
+            Language.GROOVY,
             Language.JAVA_PRE15 -> encodeSingleJava(value)
             Language.JAVA -> encodeMultiJava(value)
-            Language.GROOVY,
             Language.KOTLIN -> encodeMultiKotlin(value)
           }
   override fun parse(str: String, language: Language): String =
@@ -133,10 +137,12 @@ internal object LiteralString : LiteralFormat<String>() {
           when (language) {
             Language.SCALA ->
                 throw UnsupportedOperationException(
-                    "Selfie doesn't support triple-quoted strings in Scala")
+                    "Selfie doesn't support triple-quoted strings in Scala, yet - help wanted: https://github.com/diffplug/selfie/issues/106")
+            Language.GROOVY ->
+                throw UnsupportedOperationException(
+                    "Selfie doesn't support triple-quoted strings in Groovy, yet - help wanted: https://github.com/diffplug/selfie/issues/105")
             Language.JAVA_PRE15,
             Language.JAVA -> parseMultiJava(str)
-            Language.GROOVY,
             Language.KOTLIN -> parseMultiKotlin(str)
           }
   fun encodeSingleJava(value: String): String = encodeSingleJavaish(value, false)

diff --git a/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineIntTest.kt b/undertest-junit5/src/test/kotlin/undertest/junit5/UT_InlineIntTest.kt
@@ -6,6 +6,6 @@ import kotlin.test.Test
 
 class UT_InlineIntTest {
   @Test fun singleInt() {
-    expectSelfie(7777).toBe(7_777)
+    expectSelfie(555).toBe_TODO(789)
   }
 }