Add support for empty inline table (#240)

orchestr7 · Sep 4, 2023 · 59d3269 · 59d3269
1 parent 8db0064
commit 59d3269
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/tree/nodes/tables/TomlInlineTable.kt b/ktoml-core/src/commonMain/kotlin/com/akuleshov7/ktoml/tree/nodes/tables/TomlInlineTable.kt
@@ -131,6 +131,9 @@ public class TomlInlineTable internal constructor(
                 .trimCurlyBraces()
                 .trim()
                 .also {
+                    if (it.isEmpty()) {
+                        return listOf(TomlStubEmptyNode(lineNo))
+                    }
                     if (it.endsWith(",")) {
                         throw ParseException(
                             "Trailing commas are not permitted in inline tables: [$this] ", lineNo

diff --git a/ktoml-core/src/commonTest/kotlin/com/akuleshov7/ktoml/decoders/InlineTableDecoderTest.kt b/ktoml-core/src/commonTest/kotlin/com/akuleshov7/ktoml/decoders/InlineTableDecoderTest.kt
@@ -78,4 +78,44 @@ class InlineTableDecoderTest {
             decoded
         )
     }
+
+    @Serializable
+    data class Point(val x: Int? = null, val y: Int? = null)
+
+    @Serializable
+    data class Position(val point: Point)
+
+    @Serializable
+    data class PositionWrapper(
+        val id: Int,
+        val position: Position,
+        val description: String
+    )
+
+    @Test
+    fun testEmptyInlineTable() {
+        val test1 = """
+            point = {  }
+        """.trimIndent()
+        val test2 = """
+            [point] 
+        """.trimIndent()
+
+        val result1 = Toml.decodeFromString<Position>(test1)
+        val result2 = Toml.decodeFromString<Position>(test2)
+        assertEquals(result2, result1)
+    }
+
+    @Test
+    fun testNestedEmptyInlineTable() {
+        val test = """
+            id = 15
+            description = "abc"
+
+            [position]
+                point = {}
+        """.trimIndent()
+
+        Toml.decodeFromString<PositionWrapper>(test)
+    }
 }