fix tests; flatten

gnolang · Nov 23, 2023 · 127ce58 · 127ce58
1 parent f6801d5
commit 127ce58
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 23 deletions.
diff --git a/tm2/pkg/amino/genproto/comments_test.go b/tm2/pkg/amino/genproto/comments_test.go
@@ -48,14 +48,14 @@ option go_package = "github.com/gnolang/gno/tm2/pkg/amino/genproto/pb";
 // message comment
 message TestMessageName {
 	// field comment 1
-	string FieldName1 = 1;
+	string field_name1 = 1 [json_name = "FieldName1"];
 	// field comment 2
-	repeated uint64 FieldName2 = 2;
+	repeated uint64 field_name2 = 2 [json_name = "FieldName2"];
 }
 
 // message comment 2
 message TestMessageName2 {
 	// another field comment
-	string FieldName = 1;
+	string field_name = 1 [json_name = "FieldName"];
 }`)
 }
diff --git a/tm2/pkg/amino/pkg/pkg.go b/tm2/pkg/amino/pkg/pkg.go
@@ -213,27 +213,37 @@ func (pkg *Package) WithComments(filename string) *Package {
 	}
 
 	ast.Inspect(f, func(node ast.Node) bool {
-		if genDecl, ok := node.(*ast.GenDecl); ok {
-			for _, spec := range genDecl.Specs {
-				if typeSpec, ok := spec.(*ast.TypeSpec); ok {
-					if pkgType := pkg.getTypeByName(typeSpec.Name.Name); pkgType != nil {
-						if genDecl.Doc != nil {
-							// Set the type comment.
-							pkgType.Comment = strings.TrimSpace(genDecl.Doc.Text())
-						}
-						if structType, ok := typeSpec.Type.(*ast.StructType); ok {
-							for _, field := range structType.Fields.List {
-								if field.Names != nil && len(field.Names) == 1 && field.Doc != nil {
-									// Set the field comment.
-									if pkgType.FieldComments == nil {
-										pkgType.FieldComments = make(map[string]string)
-									}
-
-									pkgType.FieldComments[field.Names[0].Name] = strings.TrimSpace(field.Doc.Text())
-								}
-							}
-						}
+		genDecl, ok := node.(*ast.GenDecl)
+		if !ok {
+			return true
+		}
+		for _, spec := range genDecl.Specs {
+			typeSpec, ok := spec.(*ast.TypeSpec)
+			if !ok {
+				continue
+			}
+
+			pkgType := pkg.getTypeByName(typeSpec.Name.Name)
+			if pkgType == nil {
+				continue
+			}
+			if genDecl.Doc != nil {
+				// Set the type comment.
+				pkgType.Comment = strings.TrimSpace(genDecl.Doc.Text())
+			}
+
+			structType, ok := typeSpec.Type.(*ast.StructType)
+			if !ok {
+				continue
+			}
+			for _, field := range structType.Fields.List {
+				if field.Names != nil && len(field.Names) == 1 && field.Doc != nil {
+					// Set the field comment.
+					if pkgType.FieldComments == nil {
+						pkgType.FieldComments = make(map[string]string)
 					}
+
+					pkgType.FieldComments[field.Names[0].Name] = strings.TrimSpace(field.Doc.Text())
 				}
 			}
 		}