fix indent bug

jillesvangurp · Feb 17, 2024 · 867fa49 · 867fa49
1 parent c5b8a2a
commit 867fa49
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -208,11 +208,11 @@ Simply add a simple extension function like this:.
 context(Kotlin4Example)!
 fun ExampleOutput<*>.printStdOut() {
   +"""
-  This prints:
+    This prints:
   """.trimIndent()
 
   mdCodeBlock(stdOut, type = "text", wrap = true)
-}        
+}
 ```
 
 And then you can use it `example { 1+1}.printStdOut()`.

diff --git a/src/main/kotlin/com/jillesvangurp/kotlin4example/Kotlin4Example.kt b/src/main/kotlin/com/jillesvangurp/kotlin4example/Kotlin4Example.kt
@@ -649,7 +649,7 @@ fun String.reIndent(indent: Int=2): String {
     return this.lines().firstOrNull {
         val whiteSpace = spaceFinder.find(it)?.value
         whiteSpace?.let {
-            whiteSpace.length > indent
+            whiteSpace.length >= indent
         }  == true
     }?.let {
         val whiteSpace = spaceFinder.find(it)!!.groups[1]!!.value

diff --git a/src/test/kotlin/com/jillesvangurp/kotlin4example/KotlinForExampleTest.kt b/src/test/kotlin/com/jillesvangurp/kotlin4example/KotlinForExampleTest.kt
@@ -155,4 +155,16 @@ class KotlinForExampleTest {
             }
         """.trimIndent()
     }
+
+    @Test
+    fun `should not reindent already indented`() {
+        val json="""
+            {
+              "foo": {
+                "bar": "foo"
+              }
+            }
+        """.trimIndent()
+        json.reIndent() shouldBe json
+    }
 }
diff --git a/src/test/kotlin/com/jillesvangurp/kotlin4example/docs/readme.kt b/src/test/kotlin/com/jillesvangurp/kotlin4example/docs/readme.kt
@@ -161,11 +161,11 @@ val readmeMarkdown by k4ERepo.md {
                 context(Kotlin4Example)!
                 fun ExampleOutput<*>.printStdOut() {
                   +""${'"'}
-                      This prints:
+                    This prints:
                   ""${'"'}.trimIndent()
                  
                   mdCodeBlock(stdOut, type = "text", wrap = true)
-                }                
+                }
             """.trimIndent(), "kotlin")
 
             +"""