fix docgen for ambiguous fields on nested structs

expr-lang · May 19, 2020 · f716d23 · f716d23
1 parent ec30886
commit f716d23
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/docgen/docgen.go b/docgen/docgen.go
@@ -193,7 +193,7 @@ appendix:
 		}
 
 		for name, field := range conf.FieldsFromStruct(t) {
-			if isPrivate(name) || isProtobuf(name) {
+			if isPrivate(name) || isProtobuf(name) || field.Ambiguous {
 				continue
 			}
 			a.Fields[Identifier(name)] = c.use(field.Type)

diff --git a/docgen/docgen_test.go b/docgen/docgen_test.go
@@ -139,9 +139,15 @@ type A struct {
 type B struct {
 	AmbiguousField string
 }
+
+type C struct {
+	A
+	B
+}
 type EnvAmbiguous struct {
 	A
 	B
+	C C
 }
 
 func TestCreateDoc_Ambiguous(t *testing.T) {
@@ -159,6 +165,10 @@ func TestCreateDoc_Ambiguous(t *testing.T) {
 			"OkField": {
 				Kind: "int",
 			},
+			"C": {
+				Kind: "struct",
+				Name: "C",
+			},
 		},
 		Types: map[TypeName]*Type{
 			"A": {
@@ -174,6 +184,14 @@ func TestCreateDoc_Ambiguous(t *testing.T) {
 					"AmbiguousField": {Kind: "string"},
 				},
 			},
+			"C": {
+				Kind: "struct",
+				Fields: map[Identifier]*Type{
+					"A":       {Kind: "struct", Name: "A"},
+					"B":       {Kind: "struct", Name: "B"},
+					"OkField": {Kind: "int"},
+				},
+			},
 		},
 	}