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

Fixing merge

Browse Source
This commit is contained in:
Mike Farah
2023-10-17 15:06:20 +11:00
parent 20fdc250d3
commit 2356ea0942
3 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/encoder_lua.go
+18 -15
View File
@@ -306,22 +306,25 @@ func (le *luaEncoder) encodeAny(writer io.Writer, node *CandidateNode) error {
}
}
func (le *luaEncoder) Encode(writer io.Writer, node *CandidateNode) error {
if !le.globals && node.Parent == nil {
err := writeString(writer, le.docPrefix)
if err != nil {
return err
}
}
if err := le.encodeAny(writer, node); err != nil {
func (le *luaEncoder) encodeTopLevel(writer io.Writer, node *CandidateNode) error {
err := writeString(writer, le.docPrefix)
if err != nil {
return err
}
if !le.globals && node.Parent == nil {
err := writeString(writer, le.docSuffix)
if err != nil {
return err
}
err = le.encodeAny(writer, node)
if err != nil {
return err
}
return nil
return writeString(writer, le.docSuffix)
}
func (le *luaEncoder) Encode(writer io.Writer, node *CandidateNode) error {
if le.globals {
if node.Kind != MappingNode {
return fmt.Errorf("--lua-global requires a top level MappingNode")
}
return le.encodeMap(writer, node, true)
}
return le.encodeTopLevel(writer, node)
}
pkg/yqlib/lua_test.go
+41 -41
View File
@@ -11,47 +11,47 @@ import (
)
var luaScenarios = []formatScenario{
// {
// description: "Basic input example",
// input: `return {
// ["country"] = "Australia"; -- this place
// ["cities"] = {
// "Sydney",
// "Melbourne",
// "Brisbane",
// "Perth",
// };
// };
// `,
// expected: `country: Australia
// cities:
// - Sydney
// - Melbourne
// - Brisbane
// - Perth
// `,
// },
// {
// description: "Basic output example",
// scenarioType: "encode",
// input: `---
// country: Australia # this place
// cities:
// - Sydney
// - Melbourne
// - Brisbane
// - Perth`,
// expected: `return {
// ["country"] = "Australia"; -- this place
// ["cities"] = {
// "Sydney",
// "Melbourne",
// "Brisbane",
// "Perth",
// };
// };
// `,
// },
{
description: "Basic input example",
input: `return {
["country"] = "Australia"; -- this place
["cities"] = {
"Sydney",
"Melbourne",
"Brisbane",
"Perth",
};
};
`,
expected: `country: Australia
cities:
- Sydney
- Melbourne
- Brisbane
- Perth
`,
},
{
description: "Basic output example",
scenarioType: "encode",
input: `---
country: Australia # this place
cities:
- Sydney
- Melbourne
- Brisbane
- Perth`,
expected: `return {
["country"] = "Australia"; -- this place
["cities"] = {
"Sydney",
"Melbourne",
"Brisbane",
"Perth",
};
};
`,
},
{
description: "Basic roundtrip",
skipDoc: true,