@@ -80,7 +80,7 @@ internal class YamlNodeReader(
8080 if ((event.value == " null" || event.value == " " || event.value == " ~" ) && event.plain) {
8181 return YamlNull (path)
8282 } else {
83- return YamlScalar (event.value, path)
83+ return YamlScalar (event.value, path, plain = event.plain )
8484 }
8585 }
8686
@@ -121,8 +121,9 @@ internal class YamlNodeReader(
121121
122122 else -> {
123123 val keyLocation = parser.peekEvent(path).location
124- val key = readMapKey(path)
125- val keyNode = YamlScalar (key, path.withMapElementKey(key, keyLocation))
124+ val keyEvent = readMapKey(path)
125+ val key = keyEvent.value
126+ val keyNode = YamlScalar (key, path.withMapElementKey(key, keyLocation), plain = keyEvent.plain)
126127
127128 val valueLocation = parser.peekEvent(keyNode.path).location
128129 val valuePath = if (isMerge(keyNode)) path.withMerge(valueLocation) else keyNode.path.withMapElementValue(valueLocation)
@@ -141,7 +142,7 @@ internal class YamlNodeReader(
141142 }
142143 }
143144
144- private fun readMapKey (path : YamlPath ): String {
145+ private fun readMapKey (path : YamlPath ): ScalarEvent {
145146 val event = parser.peekEvent(path)
146147
147148 when (event.eventId) {
@@ -154,7 +155,7 @@ internal class YamlNodeReader(
154155 throw nonScalarMapKeyException(path, event)
155156 }
156157
157- return scalarEvent.value
158+ return scalarEvent
158159 }
159160
160161 else -> {
0 commit comments