Use multi-dollar string interpolation

Author: jeffdgr8

buildSrc/src/main/kotlin/base-convention.gradle.kts

@@ -52,6 +52,7 @@ kotlin {
     sourceSets.configureEach {
         languageSettings {
             optIn("kotlin.time.ExperimentalTime")
+            enableLanguageFeature("MultiDollarInterpolation")
             if (!name.startsWith("common") &&
                 !name.startsWith("jvm") &&
                 !name.startsWith("android")

couchbase-lite-ee/src/commonTest/ee/kotbase/BaseVectorSearchTest.kt

@@ -216,9 +216,9 @@ abstract class BaseVectorSearchTest : BaseDbTest() {
             val expr = vectorExpression ?: wordsQueryDefaultExpression()
 
             if (metric != null) {
-                append("ORDER BY APPROX_VECTOR_DISTANCE($expr, \$vector, \"$metric\") ")
+                append($$"""ORDER BY APPROX_VECTOR_DISTANCE($$expr, $vector, "$$metric") """)
             } else {
-                append("ORDER BY APPROX_VECTOR_DISTANCE($expr, \$vector) ")
+                append($$"ORDER BY APPROX_VECTOR_DISTANCE($$expr, $vector) ")
             }
 
             append("LIMIT $limit")

couchbase-lite-ee/src/commonTest/ee/kotbase/VectorSearchTestMain.kt

@@ -1078,7 +1078,7 @@ class VectorSearchTestMain : BaseVectorSearchTest() {
         createWordsIndex(config)
 
         assertThrowsCBLException(CBLError.Domain.CBLITE, CBLError.Code.INVALID_QUERY) {
-            executeWordsQuery(limit = 300, whereExpression = "APPROX_VECTOR_DISTANCE(vector, \$vector) < 0.5 OR catid = 'cat1'")
+            executeWordsQuery(limit = 300, whereExpression = $$"APPROX_VECTOR_DISTANCE(vector, $vector) < 0.5 OR catid = 'cat1'")
         }
     }
 

couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryExt.kt

@@ -54,7 +54,7 @@ public fun <T : Any> Query.asObjectsFlow(
 
 @Deprecated("For binary compatibility", level = DeprecationLevel.HIDDEN)
 @JvmSynthetic
-@JvmName("asObjectsFlow\$default")
+@JvmName($$"asObjectsFlow$default")
 public fun <T : Any> Query.asObjectsFlow(
     coroutineContext: CoroutineContext?,
     factory: (String) -> T?,

couchbase-lite-ktx/src/commonMain/kotlin/kotbase/ktx/QueryExtensions.kt

@@ -75,7 +75,7 @@ public fun <T : Any> Query.asObjectsFlow(
 
 @Deprecated("For binary compatibility", level = DeprecationLevel.HIDDEN)
 @JvmSynthetic
-@JvmName("asObjectsFlow\$default")
+@JvmName($$"asObjectsFlow$default")
 public fun <T : Any> Query.asObjectsFlow(
     coroutineContext: CoroutineContext?,
     factory: (Map<String, Any?>) -> T?,

couchbase-lite/src/commonTest/kotlin/kotbase/LegacyLogTest.kt

@@ -238,7 +238,7 @@ class LegacyLogTest : BaseDbTest(useLegacyLogging = true) {
 //    @Test
 //    fun testFileLoggingLogFilename() {
 //        testWithConfiguration(LogLevel.DEBUG, LogFileConfiguration(scratchDirPath!!)) {
-//            Log.e(LogDomain.DATABASE, "$$\$TEST MESSAGE")
+//            Log.e(LogDomain.DATABASE, $$$$"$$$TEST MESSAGE")
 //
 //            val files = logFiles
 //            assertTrue(files.size >= 4)

couchbase-lite/src/commonTest/kotlin/kotbase/ParameterTest.kt

@@ -31,10 +31,11 @@ class ParameterTest : BaseDbTest() {
         val params = Parameters()
         params.setString("param", "value")
 
-        val query = testDatabase.createQuery(
-            "SELECT  meta().id"
-                    + " FROM _default._default"
-                    + " WHERE test = \$param"
+        val query = testDatabase.createQuery($$"""
+            SELECT  meta().id
+            FROM _default._default
+            WHERE test = $param
+        """.trimIndent()
         )
 
         query.parameters = params
@@ -47,10 +48,11 @@ class ParameterTest : BaseDbTest() {
         val params = Parameters()
         params.setString("param", "value")
 
-        val query = testDatabase.createQuery(
-            "SELECT  meta().id"
-                    + " FROM _default._default"
-                    + " WHERE test = \$param"
+        val query = testDatabase.createQuery($$"""
+            SELECT  meta().id
+            FROM _default._default
+            WHERE test = $param
+        """.trimIndent()
         )
 
         query.parameters = params
@@ -63,10 +65,11 @@ class ParameterTest : BaseDbTest() {
     fun testParamContents() {
         val params = makeParams()
 
-        val query = testDatabase.createQuery(
-            "SELECT  meta().id"
-                    + " FROM _default._default"
-                    + " WHERE test = \$param"
+        val query = testDatabase.createQuery($$"""
+            SELECT  meta().id
+            FROM _default._default
+            WHERE test = $param
+        """.trimIndent()
         )
 
         query.parameters = params

couchbase-lite/src/commonTest/kotlin/kotbase/QueryTest.kt

@@ -3141,36 +3141,36 @@ class QueryTest : BaseQueryTest() {
     @Test
     fun testQueryDocumentWithDollarSign() {
         saveDocInCollection(MutableDocument()
-            .setString("\$type", "book")
-            .setString("\$description", "about cats")
-            .setString("\$price", "$100")
+            .setString($$"$type", "book")
+            .setString($$"$description", "about cats")
+            .setString($$"$price", "$100")
         )
         saveDocInCollection(MutableDocument()
-            .setString("\$type", "book")
-            .setString("\$description", "about dogs")
-            .setString("\$price", "$95")
+            .setString($$"$type", "book")
+            .setString($$"$description", "about dogs")
+            .setString($$"$price", "$95")
         )
         saveDocInCollection(MutableDocument()
-            .setString("\$type", "animal")
-            .setString("\$description", "puppy")
-            .setString("\$price", "$195")
+            .setString($$"$type", "animal")
+            .setString($$"$description", "puppy")
+            .setString($$"$price", "$195")
         )
 
         var cheapBooks = 0
         var books = 0
 
         val q = QueryBuilder.select(
             SelectResult.expression(Meta.id),
-            SelectResult.expression(Expression.property("\$type")),
-            SelectResult.expression(Expression.property("\$price"))
+            SelectResult.expression(Expression.property($$"$type")),
+            SelectResult.expression(Expression.property($$"$price"))
         )
             .from(DataSource.collection(testCollection))
-            .where(Expression.property("\$type").equalTo(Expression.string("book")))
+            .where(Expression.property($$"$type").equalTo(Expression.string("book")))
 
         q.execute().use { res ->
             for (r in res) {
                 books++
-                val p = r.getString("\$price")!!
+                val p = r.getString($$"$price")!!
                 if (p.substring(1).toInt() < 100) { cheapBooks++ }
             }
             assertEquals(2, books)