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

fixing property comment handling

Browse Source
This commit is contained in:
Mike Farah 2022-10-25 16:00:19 +11:00
parent 23b2aa5668
commit fe27ddedc0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/yqlib/decoder_properties.go
View File

@ -51,8 +51,8 @@ func (dec *propertiesDecoder) applyProperty(properties *properties.Properties, c
value, _ := properties.Get(key) value, _ := properties.Get(key)
path := parsePropKey(key) path := parsePropKey(key)
log.Debug("comments: %v", properties.GetComments(key)) IMPROVEMENT - target the key node with the comment, set as a header comment instead.
log.Debug("comment: %v", properties.GetComment(key))
rhsNode := &yaml.Node{ rhsNode := &yaml.Node{
Value: value, Value: value,
Tag: "!!str", Tag: "!!str",

4
pkg/yqlib/encoder_properties.go
View File

@ -75,7 +75,9 @@ func (pe *propertiesEncoder) Encode(writer io.Writer, node *yaml.Node) error {
} }
func (pe *propertiesEncoder) doEncode(p *properties.Properties, node *yaml.Node, path string) error { func (pe *propertiesEncoder) doEncode(p *properties.Properties, node *yaml.Node, path string) error {
p.SetComment(path, strings.ReplaceAll(headAndLineComment(node), "\n", "\n# "))
commentsWithSpaces := strings.ReplaceAll(headAndLineComment(node), "\n", "\n ")
p.SetComments(path, strings.Split(commentsWithSpaces, "\n"))
switch node.Kind { switch node.Kind {
case yaml.ScalarNode: case yaml.ScalarNode:
var nodeValue string var nodeValue string