fix docgen for ambiguous fields in embedded structs

expr-lang · May 18, 2020 · ec30886 · ec30886
1 parent d22339d
commit ec30886
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 0 deletions.
diff --git a/docgen/docgen.go b/docgen/docgen.go
@@ -57,6 +57,9 @@ func CreateDoc(i interface{}) *Context {
 	}
 
 	for name, t := range conf.CreateTypesTable(i) {
+		if t.Ambiguous {
+			continue
+		}
 		c.Variables[Identifier(name)] = c.use(t.Type, fromMethod(t.Method))
 	}
 

diff --git a/docgen/docgen_test.go b/docgen/docgen_test.go
@@ -132,6 +132,54 @@ func TestCreateDoc(t *testing.T) {
 	assert.Equal(t, litter.Sdump(expected), litter.Sdump(doc))
 }
 
+type A struct {
+	AmbiguousField int
+	OkField        int
+}
+type B struct {
+	AmbiguousField string
+}
+type EnvAmbiguous struct {
+	A
+	B
+}
+
+func TestCreateDoc_Ambiguous(t *testing.T) {
+	doc := CreateDoc(&EnvAmbiguous{})
+	expected := &Context{
+		Variables: map[Identifier]*Type{
+			"A": {
+				Kind: "struct",
+				Name: "A",
+			},
+			"B": {
+				Kind: "struct",
+				Name: "B",
+			},
+			"OkField": {
+				Kind: "int",
+			},
+		},
+		Types: map[TypeName]*Type{
+			"A": {
+				Kind: "struct",
+				Fields: map[Identifier]*Type{
+					"AmbiguousField": {Kind: "int"},
+					"OkField":        {Kind: "int"},
+				},
+			},
+			"B": {
+				Kind: "struct",
+				Fields: map[Identifier]*Type{
+					"AmbiguousField": {Kind: "string"},
+				},
+			},
+		},
+	}
+
+	assert.Equal(t, litter.Sdump(expected), litter.Sdump(doc))
+}
+
 func TestCreateDoc_FromMap(t *testing.T) {
 	env := map[string]interface{}{
 		"Tweets": []*Tweet{},