fix copy comments to include document comments

This commit is contained in:
Phillip Wittrock
2020-04-08 09:16:43 -07:00
parent f08594cc22
commit 23589cc2af
2 changed files with 72 additions and 6 deletions

View File

@@ -11,6 +11,7 @@ import (
// CopyComments recursively copies the comments on fields in from to fields in to
func CopyComments(from, to *yaml.RNode) error {
copy(from, to)
// walk the fields copying comments
_, err := walk.Walker{
Sources: []*yaml.RNode{from, to},
@@ -44,13 +45,13 @@ func copy(from, to *yaml.RNode) {
if from == nil || to == nil {
return
}
if from.YNode().LineComment != "" {
to.YNode().LineComment = from.YNode().LineComment
if from.Document().LineComment != "" {
to.Document().LineComment = from.Document().LineComment
}
if from.YNode().HeadComment != "" {
to.YNode().HeadComment = from.YNode().HeadComment
if from.Document().HeadComment != "" {
to.Document().HeadComment = from.Document().HeadComment
}
if from.YNode().FootComment != "" {
to.YNode().FootComment = from.YNode().FootComment
if from.Document().FootComment != "" {
to.Document().FootComment = from.Document().FootComment
}
}