suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-09-05 17:36:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bad cature groups with multiple matches #1114

Browse Source
This commit is contained in:
Mike Farah
2022-02-20 13:28:13 +11:00
parent 304fc462a4
commit fc447b46ce
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/operator_strings.go
+4 -4
View File
@@ -136,19 +136,19 @@ func match(matchPrefs matchPreferences, regEx *regexp.Regexp, candidate *Candida
}
for i, matches := range allMatches {
capturesNode := &yaml.Node{Kind: yaml.SequenceNode}
capturesListNode := &yaml.Node{Kind: yaml.SequenceNode}
match, submatches := matches[0], matches[1:]
for j, submatch := range submatches {
captureNode := &yaml.Node{Kind: yaml.MappingNode}
captureNode.Content = addMatch(capturesNode.Content, submatch, allIndices[i][2+j*2], subNames[j+1])
capturesNode.Content = append(capturesNode.Content, captureNode)
captureNode.Content = addMatch(captureNode.Content, submatch, allIndices[i][2+j*2], subNames[j+1])
capturesListNode.Content = append(capturesListNode.Content, captureNode)
}
node := &yaml.Node{Kind: yaml.MappingNode}
node.Content = addMatch(node.Content, match, allIndices[i][0], "")
node.Content = append(node.Content,
createScalarNode("captures", "captures"),
capturesNode,
capturesListNode,
)
results.PushBack(candidate.CreateReplacement(node))