@@ -69,28 +69,18 @@ const autoConstructor = _AutoConstructor();
69
69
// parameters in this constructor.
70
70
for (var param in superconstructor.positionalParameters) {
71
71
var requiredKeyword = param.isRequired ? 'required' : '' ;
72
- var defaultValue = param.defaultValue == null
73
- ? ''
74
- : Code .fromParts ([' = ' , param.defaultValue! ]);
75
72
parts.addAll ([
76
73
'\n $requiredKeyword ' ,
77
74
param.type.code,
78
75
' ${param .identifier .name },' ,
79
- defaultValue,
80
- ',' ,
81
76
]);
82
77
}
83
78
for (var param in superconstructor.namedParameters) {
84
79
var requiredKeyword = param.isRequired ? '' : 'required ' ;
85
- var defaultValue = param.defaultValue == null
86
- ? ''
87
- : Code .fromParts ([' = ' , param.defaultValue! ]);
88
80
parts.addAll ([
89
81
'\n $requiredKeyword ' ,
90
82
param.type.code,
91
- ' ${param .identifier .name }' ,
92
- defaultValue,
93
- ',' ,
83
+ ' ${param .identifier .name },' ,
94
84
]);
95
85
}
96
86
}
@@ -131,14 +121,16 @@ const copyWith = _CopyWith();
131
121
var allFields = await clazz.allFields (builder).toList ();
132
122
var namedParams = [
133
123
for (var field in allFields)
134
- ParameterCode .fromParts (
135
- [field.type.code, '? ${field .identifier .name }' ]),
124
+ ParameterCode (
125
+ name: field.identifier.name,
126
+ type: field.type.code.asNullable,
127
+ keywords: const [],
128
+ defaultValue: null ),
136
129
];
137
130
var args = [
138
131
for (var field in allFields)
139
- NamedArgumentCode .fromString (
140
- '${field .identifier .name }: ${field .identifier .name } '
141
- '?? this.${field .identifier .name }' ),
132
+ '${field .identifier .name }: ${field .identifier .name } '
133
+ '?? this.${field .identifier .name }' ,
142
134
];
143
135
builder.declareInClass (DeclarationCode .fromParts ([
144
136
clazz.identifier,
0 commit comments