Skip to content

Commit be4d769

Browse files
committed
migrate to analyzer 13
1 parent fa523f2 commit be4d769

5 files changed

Lines changed: 17 additions & 13 deletions

File tree

packages/dart_mappable_builder/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# 4.9.0
2+
3+
- Bump `analyzer` to `>=13.0.0 <14.0.0`
4+
15
# 4.8.0
26

3-
- Bump `analyzer` to `>=10.0.0 <12.0.0`.
7+
- Bump `analyzer` to `>=10.0.0 <13.0.0`.
48

59
## 4.7.0
610

packages/dart_mappable_builder/lib/src/elements/class/mixins/param_elements_mixin.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ mixin ParamElementsMixin on MapperElement<ClassElement> {
157157
if (arg.name == param.name) {
158158
return superConstructor.formalParameters[i];
159159
}
160-
} else if (arg is NamedExpression) {
161-
var exp = arg.expression;
160+
} else if (arg is NamedArgument) {
161+
var exp = arg.argumentExpression;
162162
if (exp is SimpleIdentifier) {
163163
if (exp.name == param.name) {
164-
var superName = arg.name.label.name;
164+
var superName = arg.name.lexeme;
165165
return superConstructor.formalParameters.firstWhere(
166166
(p) => p.isNamed && p.name == superName,
167167
);

packages/dart_mappable_builder/lib/src/elements/field/class_mapper_field_element.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ class ClassMapperFieldElement extends MapperFieldElement {
125125
}
126126

127127
var node = await p.getResolvedNode();
128-
if (node is DefaultFormalParameter &&
129-
node.defaultValue.toString() != 'null') {
130-
if (node.defaultValue case SimpleIdentifier(
128+
if (node is FormalParameter && node.defaultClause != null &&
129+
node.defaultClause!.value.toSource() != 'null') {
130+
if (node.defaultClause!.value case SimpleIdentifier(
131131
element: PropertyAccessorElement(enclosingElement: ClassElement clazz),
132132
name: String name,
133133
)) {
134134
return ', def: ${clazz.name}.$name';
135135
}
136-
return ', def: ${node.defaultValue?.toSource()}';
136+
return ', def: ${node.defaultClause?.value.toSource()}';
137137
} else if (p.hasDefaultValue && p.defaultValueCode != 'null') {
138138
return ', def: ${p.defaultValueCode}';
139139
}

packages/dart_mappable_builder/lib/src/utils.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ extension ArgumentProperty on ArgumentList {
9494
AstNode? getArgument(dynamic property) {
9595
for (var i = 0; i < arguments.length; i++) {
9696
var arg = arguments[i];
97-
if (arg is NamedExpression && property is String) {
98-
if (arg.name.label.name == property) {
99-
return arg.expression;
97+
if (arg is NamedArgument && property is String) {
98+
if (arg.name.lexeme == property) {
99+
return arg.argumentExpression;
100100
}
101101
} else if (property is int && i == property) {
102102
return arg;

packages/dart_mappable_builder/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dart_mappable_builder
22
description: Improved json serialization and data classes with full support for generics, inheritance, customization and more.
3-
version: 4.8.0
3+
version: 4.9.0
44
repository: https://github.com/schultek/dart_mappable
55
issue_tracker: https://github.com/schultek/dart_mappable/issues
66
funding:
@@ -12,7 +12,7 @@ environment:
1212
resolution: workspace
1313

1414
dependencies:
15-
analyzer: '>=10.0.0 <13.0.0'
15+
analyzer: '>=13.0.0 <14.0.0'
1616
ansicolor: ^2.0.1
1717
build: ^4.0.0
1818
collection: ^1.15.0

0 commit comments

Comments
 (0)