Unescape keys *after* parsing the facet stuff, in case the facet has square brackets in its key.

Author: nedtwigg

jvm/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/SnapshotFile.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 DiffPlug
+ * Copyright (C) 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -249,7 +249,7 @@ class SnapshotReader(val valueReader: SnapshotValueReader) {
     require(next.indexOf('[') == -1) {
       "Missing root snapshot, square brackets not allowed: '$next'"
     }
-    return next
+    return SnapshotValueReader.nameEsc.unescape(next)
   }
   fun nextSnapshot(): Snapshot {
     val rootName = peekKey()
@@ -267,7 +267,9 @@ class SnapshotReader(val valueReader: SnapshotValueReader) {
       val facetEndIdx = nextKey.indexOf(']', facetIdx + 1)
       require(facetEndIdx != -1) { "Missing ] in $nextKey" }
       val facetName = nextKey.substring(facetIdx + 1, facetEndIdx)
-      snapshot = snapshot.plusFacet(facetName, valueReader.nextValue())
+      snapshot =
+          snapshot.plusFacet(
+              SnapshotValueReader.nameEsc.unescape(facetName), valueReader.nextValue())
     }
   }
   fun skipSnapshot() {
@@ -357,7 +359,7 @@ class SnapshotValueReader(val lineReader: LineReader) {
     } else if (key.endsWith(" ")) {
       throw ParseException(lineReader, "Trailing spaces are disallowed: '$key'")
     } else {
-      nameEsc.unescape(key)
+      key
     }
   }
   private fun nextLine(): String? {

jvm/selfie-lib/src/commonTest/kotlin/com/diffplug/selfie/SnapshotFileTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 DiffPlug
+ * Copyright (C) 2023-2025 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -92,31 +92,32 @@ class SnapshotFileTest {
             .trimIndent()
   }
 
-    @Test
-    fun escapingBug() {
-        val file =
-            SnapshotFile.parse(
-                SnapshotValueReader.of(
-"""
+  @Test
+  fun escapingBug() {
+    val file =
+        SnapshotFile.parse(
+            SnapshotValueReader.of(
+                """
 ╔═ trialStarted/stripe ═╗
 
 ╔═ trialStarted/stripe[«1»{\n    "params": {\n        "line_items": "line_items=\({quantity=1, price=price_xxxx}\)"\n    },\n    "apiMode": "V1"\n}] ═╗
 {}
 ╔═ [end of file] ═╗
 
 """
-                        .trimIndent()))
-        val keys = file.snapshots.keys.toList()
-        keys.size shouldBe 1
-        keys[0] shouldBe "trialStarted/stripe"
-        val snapshot = file.snapshots.get(keys[0])!!
+                    .trimIndent()))
+    val keys = file.snapshots.keys.toList()
+    keys.size shouldBe 1
+    keys[0] shouldBe "trialStarted/stripe"
+    val snapshot = file.snapshots.get(keys[0])!!
 
-        snapshot.facets.keys.size shouldBe 1
-        snapshot.facets.keys.first() shouldBe """«1»{
+    snapshot.facets.keys.size shouldBe 1
+    snapshot.facets.keys.first() shouldBe
+        """«1»{
     "params": {
         "line_items": "line_items=[{quantity=1, price=price_xxxx}]"
     },
     "apiMode": "V1"
 }"""
-    }
+  }
 }