Fix child reassignment after Map

nilium · nilium · commit 4abdca159a06 · 2018-10-01T16:22:11.000-07:00
This fixes a bug that was introduced in e6ce13f where the newChild was checked and added to the child list but was not walked after being mapped. This resulted in invalid handling of the child, since the walk would then proceed incorrectly with the original child instead of its replacement. This in particular breaks things like include mappings that replace a statement with a document (or collection of documents).
diff --git a/walk.go b/walk.go
@@ -82,7 +82,9 @@ func walkInContext(context, parent ParentNode, walker Walker) (err error) {
 				i--
 				continue
 			}
-			children[i] = newChild
+
+			child = newChild
+			children[i] = child
 		}
 
 		switch child := child.(type) {

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ func walkInContext(context, parent ParentNode, walker Walker) (err error) {`
`82`	`82`	`i--`
`83`	`83`	`continue`
`84`	`84`	`}`
`85`		`- children[i] = newChild`
	`85`	`+`
	`86`	`+ child = newChild`
	`87`	`+ children[i] = child`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`switch child := child.(type) {`