Skip to content

Commit 9be9cf9

Browse files
authored
Merge pull request #1148 from utherbit/fixgen
fix(gen): detect conflict when generic is not of the same base type
2 parents 67c195f + 00bf96b commit 9be9cf9

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

gen/schema_gen_sum.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,9 @@ func (g *schemaGen) allOf(name string, schema *jsonschema.Schema) (*ir.Type, err
465465
return nil, err
466466
}
467467

468-
// Do not modify reference fields, as they may still refer to the original schema.
469-
if mergedSchema.Ref.IsZero() {
470-
mergedSchema.Ref = schema.Ref
471-
}
468+
// The reference field must not change
469+
mergedSchema.Ref = schema.Ref
470+
472471
return g.generate(name, mergedSchema, false)
473472
}
474473

0 commit comments

Comments
 (0)