@@ -137,7 +137,7 @@ class ConverterBuilder extends DogsAdapter<Serializable> {
137137 writeGeneratedConverter (element, structurized, constructorName, codeContext);
138138 if (structurized.fieldNames.isNotEmpty &&
139139 structurized.structure.conformity != StructureConformity .bean) {
140- writeGeneratedBuilder (element, structurized, constructorName, codeContext);
140+ writeGeneratedBuilder (element, structurized, constructorName, codeContext, settings );
141141 writeGeneratedExtension (element, structurized, constructorName, codeContext);
142142 }
143143 }
@@ -279,7 +279,7 @@ If you wish to use class-level generics, please implement a TreeBaseConverterFac
279279 }
280280
281281 static void writeGeneratedBuilder (ClassElement2 element, StructurizeResult structurized,
282- String constructorName, SubjectCodeContext codeContext) {
282+ String constructorName, SubjectCodeContext codeContext, DogsGeneratorSettings settings ) {
283283 var emitter = DartEmitter ();
284284 var copyWithFrontendName = "${element .displayName }\$ Copy" ;
285285 var copyClazz = Class ((builder) {
@@ -328,13 +328,13 @@ If you wish to use class-level generics, please implement a TreeBaseConverterFac
328328 ..type = MethodType .setter
329329 ..requiredParameters.add (Parameter ((builder) => builder
330330 ..name = "value"
331- ..type = Reference (element.type + (element.optional ? "?" : "" ))))
331+ ..type = Reference (element.type + (( element.optional || settings.nullableAccessors) ? "?" : "" ))))
332332 ..body = Code ("\$ values[$index ] = value;" )));
333333
334334 builder.methods.add (Method ((builder) => builder
335335 ..name = element.accessor
336336 ..type = MethodType .getter
337- ..returns = Reference (element.type + (element.optional ? "?" : "" ))
337+ ..returns = Reference (element.type + (( element.optional || settings.nullableAccessors) ? "?" : "" ))
338338 ..lambda = true
339339 ..body = Code ("\$ values[$index ]" )));
340340 }
0 commit comments