Fix indent calculation when a line contains only expressions and whitespaces.

Author: bennyhuo

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
 
-VERSION_NAME=1.8.1
+VERSION_NAME=1.8.2
 
 GROUP=com.bennyhuo.kotlin
 
@@ -25,4 +25,4 @@ KOTLIN_PLUGIN_ID=com.bennyhuo.kotlin.trimindent
 
 SONATYPE_HOST=S01
 SONATYPE_AUTOMATIC_RELEASE=true
-RELEASE_SIGNING_ENABLED=true
+RELEASE_SIGNING_ENABLED=true

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

@@ -37,7 +37,15 @@ class TrimIndentIrGenerator : IrGenerationExtension {
                                     acc += if (acc.isEmpty()) {
                                         element.values
                                     } else {
+                                        // prefix${expression}postfix
+                                        val prefix = acc.last()
+                                        if (prefix.isBlank()) {
+                                            // append whatever a non-blank character as a placeholder of the expression.
+                                            acc[acc.lastIndex] = "$prefix!"
+                                        }
+
                                         // the first value is not belong to a new line.
+                                        // It follows the previous expression in the same line.
                                         element.values.subList(1, element.values.size)
                                     }
                                 }
@@ -86,4 +94,4 @@ class TrimIndentIrGenerator : IrGenerationExtension {
             }
         })
     }
-}
+}

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

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

trimindent-compiler/testData/blankLine.kt

@@ -0,0 +1,45 @@
+// SOURCE
+// FILE: Main.kt [MainKt#main]
+val s = """
+        
+        hello
+        
+        """.trimIndent()
+
+val s1 = """
+        $s
+        """.trimIndent()
+
+
+val s2 = """
+         hello
+       $s
+         world
+         """.trimIndent()
+fun main() {
+    println(s)
+    println(s1)
+    println(s2)
+}
+// EXPECT
+// FILE: MainKt.main.stdout
+
+hello
+
+
+hello
+
+  hello
+
+hello
+
+  world
+// FILE: Main.kt.ir
+val s: String = "\nhello\n"
+val s1: String = "${s}"
+val s2: String = "  hello\n${s}\n  world"
+fun main() {
+    println(s)
+    println(s1)
+    println(s2)
+}