suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-06 13:25:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Line and Column working with Goccy, Fixed Anchor Map problem

Browse Source
This commit is contained in:
Mike Farah 2025-05-04 19:29:42 +10:00
parent 2bd08ea4e8
commit 2c7cce0878
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/yqlib/candidate_node_goccy_yaml.go
View File

@ -51,6 +51,9 @@ func (o *CandidateNode) UnmarshalGoccyYAML(node ast.Node, cm yaml.CommentMap, an
} }
o.Value = node.String() o.Value = node.String()
o.Line = node.GetToken().Position.Line
o.Column = node.GetToken().Position.Column
switch node.Type() { switch node.Type() {
case ast.IntegerType: case ast.IntegerType:
o.Kind = ScalarNode o.Kind = ScalarNode
@ -170,6 +173,7 @@ func (o *CandidateNode) UnmarshalGoccyYAML(node ast.Node, cm yaml.CommentMap, an
case ast.MergeKeyType: case ast.MergeKeyType:
log.Debugf("UnmarshalYAML - a merge key") log.Debugf("UnmarshalYAML - a merge key")
o.Kind = ScalarNode o.Kind = ScalarNode
o.Tag = "!!merge" // note - I should be able to get rid of this.
o.Value = "<<" o.Value = "<<"
default: default:
@ -181,22 +185,23 @@ func (o *CandidateNode) UnmarshalGoccyYAML(node ast.Node, cm yaml.CommentMap, an
func (o *CandidateNode) goccyProcessMappingValueNode(mappingEntry *ast.MappingValueNode, cm yaml.CommentMap, anchorMap map[string]*CandidateNode) error { func (o *CandidateNode) goccyProcessMappingValueNode(mappingEntry *ast.MappingValueNode, cm yaml.CommentMap, anchorMap map[string]*CandidateNode) error {
log.Debug("UnmarshalYAML MAP KEY entry %v", mappingEntry.Key) log.Debug("UnmarshalYAML MAP KEY entry %v", mappingEntry.Key)
keyNode, err := o.goccyDecodeIntoChild(mappingEntry.Key, cm, anchorMap)
if err != nil { // AddKeyValueFirst because it clones the nodes, and we want to have the real refs when Unmarshalling
// particularly for the anchorMap
keyNode, valueNode := o.AddKeyValueChild(&CandidateNode{}, &CandidateNode{})
if err := keyNode.UnmarshalGoccyYAML(mappingEntry.Key, cm, anchorMap); err != nil {
return err return err
} }
keyNode.IsMapKey = true
log.Debug("UnmarshalYAML MAP VALUE entry %v", mappingEntry.Value) log.Debug("UnmarshalYAML MAP VALUE entry %v", mappingEntry.Value)
valueNode, err := o.goccyDecodeIntoChild(mappingEntry.Value, cm, anchorMap) if err := valueNode.UnmarshalGoccyYAML(mappingEntry.Value, cm, anchorMap); err != nil {
if err != nil {
return err return err
} }
if mappingEntry.FootComment != nil { if mappingEntry.FootComment != nil {
valueNode.FootComment = mappingEntry.FootComment.String() valueNode.FootComment = mappingEntry.FootComment.String()
} }
o.AddKeyValueChild(keyNode, valueNode)
return nil return nil
} }