Fix embedded trimIndent call expressions.

Author: bennyhuo

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 
-VERSION_NAME=1.8.20-1.0.0
+VERSION_NAME=1.8.20-1.1.0
 
 GROUP=com.bennyhuo.kotlin
 

trimindent-compiler/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
 
     testImplementation(kotlin("test-junit"))
     testImplementation("org.jetbrains.kotlin:kotlin-compiler-embeddable")
-    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.8.0.0")
+    testImplementation("com.bennyhuo.kotlin:kotlin-compile-testing-extensions:1.8.20-1.2.0")
 }
 
 val compileKotlin: KotlinCompile by tasks
@@ -27,4 +27,4 @@ compileKotlin.kotlinOptions.jvmTarget = "1.8"
 buildConfig {
     packageName("$group.trimindent")
     buildConfigField("String", "KOTLIN_PLUGIN_ID", "\"${project.property("KOTLIN_PLUGIN_ID")}\"")
-}
+}

trimindent-compiler/src/main/java/com/bennyhuo/kotlin/trimindent/compiler/TrimIndentIrGenerator.kt

@@ -21,7 +21,7 @@ class TrimIndentIrGenerator : IrGenerationExtension {
                     val extensionReceiver = irCall.extensionReceiver!!
                     if (extensionReceiver is IrConst<*> && extensionReceiver.kind == IrConstKind.String) {
                         extensionReceiver as IrConst<String>
-                        return extensionReceiver.copyWithNewValue(extensionReceiver.value.trimIndent())
+                        return super.visitExpression(extensionReceiver.copyWithNewValue(extensionReceiver.value.trimIndent()))
                     }
 
                     if (extensionReceiver is IrStringConcatenation) {
@@ -86,7 +86,7 @@ class TrimIndentIrGenerator : IrGenerationExtension {
                             }
                         }
 
-                        return extensionReceiver.copyWithNewValues(args)
+                        return super.visitExpression(extensionReceiver.copyWithNewValues(args))
                     }
                 }
 

trimindent-compiler/src/test/java/com/bennyhuo/kotlin/trimindent/compiler/TrimIndentTest.kt

@@ -28,6 +28,11 @@ class TrimIndentTest {
         testBase("blankLine.kt")
     }
 
+    @Test
+    fun embedded() {
+        testBase("embedded.kt")
+    }
+
     private fun testBase(fileName: String) {
         val loader = FileBasedModuleInfoLoader("testData/$fileName")
         val sourceModuleInfos = loader.loadSourceModuleInfos()

trimindent-compiler/testData/embedded.kt

@@ -0,0 +1,78 @@
+// SOURCE
+// FILE: Main.kt [MainKt#main]
+fun main() {
+    val list = listOf(1, 2, 3)
+    val list2 = listOf("a", "b", "c")
+    println("""
+    A:
+        ${list.joinToString("\n") {
+            """
+            - $it 
+                ${list2.joinToString("\n") { "* $it" }}
+            """.trimIndent()
+        }}
+    B: 
+        ${
+        list.joinToString("\n") {
+            """
+            - $it 
+                ${list2.joinToString("\n") { "* $it" }}
+        """.trimIndent()
+        }
+        }
+    """.trimIndent())
+}
+// EXPECT
+// FILE: MainKt.main.stdout
+A:
+    - 1
+        * a
+        * b
+        * c
+    - 2
+        * a
+        * b
+        * c
+    - 3
+        * a
+        * b
+        * c
+B:
+    - 1
+        * a
+        * b
+        * c
+    - 2
+        * a
+        * b
+        * c
+    - 3
+        * a
+        * b
+        * c
+// FILE: Main.kt.ir
+fun main() {
+    val list = listOf(1, 2, 3)
+    val list2 = listOf("a", "b", "c")
+    println("A:\n${list.joinToString(
+        separator = "\n"
+    ) { it: Int ->
+        "- $it \n${list2.joinToString(
+            separator = "\n"
+        ) { it: String ->
+            "* $it"
+        }
+        .prependIndent("    ")}"
+    }
+    .prependIndent("    ")}\nB: \n${list.joinToString(
+        separator = "\n"
+    ) { it: Int ->
+        "- $it \n${list2.joinToString(
+            separator = "\n"
+        ) { it: String ->
+            "* $it"
+        }
+        .prependIndent("    ")}"
+    }
+    .prependIndent("    ")}")
+}