From ca8d4331893f40b8ad782d57f40b4de0fd9db43f Mon Sep 17 00:00:00 2001 From: Entrox-Licher Date: Sat, 26 Aug 2023 17:57:42 -0400 Subject: [PATCH 1/2] Added minor check to add support for VSCode plugin by rolandostar --- objects/objects.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/objects/objects.go b/objects/objects.go index 6aa3346..87585b5 100644 --- a/objects/objects.go +++ b/objects/objects.go @@ -55,6 +55,13 @@ func (o *objConfig) parseFromJSON(data map[string]interface{}) error { if !ok { return fmt.Errorf("object (%v) doesn't have a string GUID (%s)", dguid, o.data["GUID"]) } + _, ok = o.data["XmlUI_path"] + if !ok { + _, ok = o.data["XmlUI"] + if !ok { + o.data["XmlUI"] = "" + } + } o.guid = guid o.subObj = []*objConfig{} o.subObjOrder = []string{} @@ -294,7 +301,7 @@ func (d *db) print(l file.TextReader, x file.TextReader, order []string) (ObjArr } for _, nextGUID := range order { if _, ok := d.root[nextGUID]; !ok { - return nil, fmt.Errorf("order expected %s, not found in db <%v>", nextGUID, d.root) + return nil, fmt.Errorf("order expected %s, not found in db", nextGUID) } printed, err := d.root[nextGUID].print(l, x) if err != nil { From f0279b1c915f54ef5becbbfd8e37f6fe76f260e8 Mon Sep 17 00:00:00 2001 From: Entrox-Licher Date: Sat, 26 Aug 2023 18:02:05 -0400 Subject: [PATCH 2/2] Fixed accidental change of error message --- objects/objects.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/objects/objects.go b/objects/objects.go index 87585b5..a49808c 100644 --- a/objects/objects.go +++ b/objects/objects.go @@ -301,7 +301,7 @@ func (d *db) print(l file.TextReader, x file.TextReader, order []string) (ObjArr } for _, nextGUID := range order { if _, ok := d.root[nextGUID]; !ok { - return nil, fmt.Errorf("order expected %s, not found in db", nextGUID) + return nil, fmt.Errorf("order expected %s, not found in db <%v>", nextGUID, d.root) } printed, err := d.root[nextGUID].print(l, x) if err != nil {