suyiiyii
/
yq
mirror of https://github.com/mikefarah/yq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'coryrc-fix-merge-with-dots' into compare

This commit is contained in:
Mike Farah 2020-02-07 09:10:25 +11:00
parent 108b5cb093 de3bfaef60
commit 63313ebb02
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/commands_test.go
View File

@ -1525,7 +1525,7 @@ c:
toast: leave toast: leave
test: 1 test: 1
tell: 1 tell: 1
taco: cool tasty.taco: cool
` `
filename := test.WriteTempYamlFile(content) filename := test.WriteTempYamlFile(content)
defer test.RemoveTempYamlFile(filename) defer test.RemoveTempYamlFile(filename)
@ -1540,7 +1540,7 @@ c:
b: [3, 4] b: [3, 4]
c: c:
toast: leave toast: leave
taco: cool tasty.taco: cool
` `
test.AssertResult(t, expectedOutput, result.Output) test.AssertResult(t, expectedOutput, result.Output)
} }
@ -1706,7 +1706,7 @@ c:
test: 1 test: 1
toast: leave toast: leave
tell: 1 tell: 1
taco: cool tasty.taco: cool
` `
test.AssertResult(t, expectedOutput, result.Output) test.AssertResult(t, expectedOutput, result.Output)
} }
@ -1921,7 +1921,7 @@ c:
test: 1 test: 1
toast: leave toast: leave
tell: 1 tell: 1
taco: cool tasty.taco: cool
` `
test.AssertResult(t, expectedOutput, gotOutput) test.AssertResult(t, expectedOutput, gotOutput)
test.AssertResult(t, os.FileMode(int(0666)), info.Mode()) test.AssertResult(t, os.FileMode(int(0666)), info.Mode())

2
examples/data2.yaml
View File

@ -4,4 +4,4 @@ c:
toast: leave toast: leave
test: 1 test: 1
tell: 1 tell: 1
taco: cool tasty.taco: cool

10
pkg/yqlib/lib.go
View File

@ -51,7 +51,15 @@ func mergePathStackToString(pathStack []interface{}, appendArrays bool) string {
} }
default: default:
sb.WriteString(fmt.Sprintf("%v", path)) s := fmt.Sprintf("%v", path)
hasDot := strings.Contains(s, ".")
if hasDot {
sb.WriteString("[")
}
sb.WriteString(s)
if hasDot {
sb.WriteString("]")
}
} }
if index < len(pathStack)-1 { if index < len(pathStack)-1 {