Merge pull request 99designs#1242 from 99designs/named_map_references

Do not use pointers on named map types
cgxxv · Jul 10, 2020 · fbe6e39 · fbe6e39
2 parents bf99e35 + 995e771
commit fbe6e39
Show file tree

Hide file tree

Showing 25 changed files with 598 additions and 23 deletions.
diff --git a/codegen/config/binder.go b/codegen/config/binder.go
@@ -412,12 +412,14 @@ func (b *Binder) CopyModifiersFromAst(t *ast.Type, base types.Type) types.Type {
 
 func IsNilable(t types.Type) bool {
 	if namedType, isNamed := t.(*types.Named); isNamed {
-		t = namedType.Underlying()
+		return IsNilable(namedType.Underlying())
 	}
 	_, isPtr := t.(*types.Pointer)
 	_, isMap := t.(*types.Map)
 	_, isInterface := t.(*types.Interface)
-	return isPtr || isMap || isInterface
+	_, isSlice := t.(*types.Slice)
+	_, isChan := t.(*types.Chan)
+	return isPtr || isMap || isInterface || isSlice || isChan
 }
 
 func hasMethod(it types.Type, name string) bool {

diff --git a/codegen/object.go b/codegen/object.go
@@ -82,16 +82,9 @@ func (b *builder) buildObject(typ *ast.Definition) (*Object, error) {
 }
 
 func (o *Object) Reference() types.Type {
-	switch v := o.Type.(type) {
-	case *types.Named:
-		_, isInterface := v.Underlying().(*types.Interface)
-		if isInterface {
-			return o.Type
-		}
-	case *types.Pointer, *types.Slice, *types.Map:
+	if config.IsNilable(o.Type) {
 		return o.Type
 	}
-
 	return types.NewPointer(o.Type)
 }