suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2024-11-13 22:38:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

XML Decoder: Comment parsing tweak

Browse Source
This commit is contained in:
Mike Farah 2022-11-27 19:14:41 +11:00
parent 77998d1bb3
commit 1617e5de19
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/yqlib/decoder_xml.go
View File

@ -88,15 +88,14 @@ func (dec *xmlDecoder) createMap(n *xmlNode) (*yaml.Node, error) {
return nil, err return nil, err
} }
} else { } else {
log.Debug("before hack, this is the data len: %", len(children[0].Data))
// comment hack for maps of scalars // comment hack for maps of scalars
// if the value is a scalar, the head comment of the scalar needs to go on the key? // if the value is a scalar, the head comment of the scalar needs to go on the key?
// add tests for <z/> as well as multiple <ds> of inputXmlWithComments > yaml // add tests for <z/> as well as multiple <ds> of inputXmlWithComments > yaml
if len(children[0].Children) == 0 && children[0].HeadComment != "" { if len(children[0].Children) == 0 && children[0].HeadComment != "" {
if len(children[0].Data) > 0 { if len(children[0].Data) > 0 {
log.Debug("scalar comment hack") log.Debug("scalar comment hack, currentlabel [%v]", labelNode.HeadComment)
labelNode.HeadComment = labelNode.HeadComment + "\n" + strings.TrimSpace(children[0].HeadComment) labelNode.HeadComment = joinComments([]string{labelNode.HeadComment, strings.TrimSpace(children[0].HeadComment)}, "\n")
children[0].HeadComment = "" children[0].HeadComment = ""
} else { } else {
// child is null, put the headComment as a linecomment for reasons // child is null, put the headComment as a linecomment for reasons
@ -311,10 +310,10 @@ func (dec *xmlDecoder) decodeXML(root *xmlNode) error {
} else if elem.state == "chardata" { } else if elem.state == "chardata" {
log.Debug("got a line comment for (%v) %v: [%v]", elem.state, elem.label, commentStr) log.Debug("got a line comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
elem.n.LineComment = joinFilter([]string{elem.n.LineComment, commentStr}) elem.n.LineComment = joinComments([]string{elem.n.LineComment, commentStr}, " ")
} else { } else {
log.Debug("got a head comment for (%v) %v: [%v]", elem.state, elem.label, commentStr) log.Debug("got a head comment for (%v) %v: [%v]", elem.state, elem.label, commentStr)
elem.n.HeadComment = joinFilter([]string{elem.n.HeadComment, commentStr}) elem.n.HeadComment = joinComments([]string{elem.n.HeadComment, commentStr}, " ")
} }
case xml.ProcInst: case xml.ProcInst:
@ -339,21 +338,21 @@ func applyFootComment(elem *element, commentStr string) {
lastChildIndex := len(elem.n.Children) - 1 lastChildIndex := len(elem.n.Children) - 1
childKv := elem.n.Children[lastChildIndex] childKv := elem.n.Children[lastChildIndex]
log.Debug("got a foot comment for %v: [%v]", childKv.K, commentStr) log.Debug("got a foot comment for %v: [%v]", childKv.K, commentStr)
childKv.FootComment = joinFilter([]string{elem.n.FootComment, commentStr}) childKv.FootComment = joinComments([]string{elem.n.FootComment, commentStr}, " ")
} else { } else {
log.Debug("got a foot comment for %v: [%v]", elem.label, commentStr) log.Debug("got a foot comment for %v: [%v]", elem.label, commentStr)
elem.n.FootComment = joinFilter([]string{elem.n.FootComment, commentStr}) elem.n.FootComment = joinComments([]string{elem.n.FootComment, commentStr}, " ")
} }
} }
func joinFilter(rawStrings []string) string { func joinComments(rawStrings []string, joinStr string) string {
stringsToJoin := make([]string, 0) stringsToJoin := make([]string, 0)
for _, str := range rawStrings { for _, str := range rawStrings {
if str != "" { if str != "" {
stringsToJoin = append(stringsToJoin, str) stringsToJoin = append(stringsToJoin, str)
} }
} }
return strings.Join(stringsToJoin, " ") return strings.Join(stringsToJoin, joinStr)
} }
// trimNonGraphic returns a slice of the string s, with all leading and trailing // trimNonGraphic returns a slice of the string s, with all leading and trailing

4
pkg/yqlib/xml_test.go
View File

@ -246,8 +246,8 @@ var xmlScenarios = []formatScenario{
}, },
{ {
skipDoc: true, skipDoc: true,
input: "<root> <!-- comment-->value</root>", input: "<root><!-- comment-->value</root>",
expected: "\n# comment\nroot: value\n", //needs fix expected: "# comment\nroot: value\n",
}, },
{ {
skipDoc: true, skipDoc: true,