Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions json_serializable/lib/src/field_helpers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ class _FieldSet implements Comparable<_FieldSet> {
/// preference for the getter if it's defined.
int offsetFor(FieldElement2 e) {
if (e.isSynthetic) {
return (e.getter2 ?? e.setter2)!.firstFragment.nameOffset2!;
return (e.getter2 ?? e.setter2)!.firstFragment.nameOffset2 ?? 0;
}
return e.firstFragment.nameOffset2!;
return e.firstFragment.nameOffset2 ?? 0;
}

return offsetFor(a).compareTo(offsetFor(b));
Expand Down
31 changes: 31 additions & 0 deletions json_serializable/test/integration/json_test_example.dart
Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,34 @@ class RegressionTestIssue1210 with RegressionTestIssue1210Mixin {

Map<String, dynamic> toJson() => _$RegressionTestIssue1210ToJson(this);
}

@JsonSerializable()
class CustomList extends ListBase<String> {
// Regression test for issue:
// https://github.com/google/json_serializable.dart/issues/1512

final List<String> _innerList = [];

CustomList();

@override
int get length => _innerList.length;

@override
set length(int newLength) {
_innerList.length = newLength;
}

@override
String operator [](int index) => _innerList[index];

@override
void operator []=(int index, String value) {
_innerList[index] = value;
}

factory CustomList.fromJson(Map<String, dynamic> json) =>
_$CustomListFromJson(json);

Map<String, dynamic> toJson() => _$CustomListToJson(this);
}
12 changes: 12 additions & 0 deletions json_serializable/test/integration/json_test_example.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -266,3 +266,34 @@ class RegressionTestIssue1210 with RegressionTestIssue1210Mixin {

Map<String, dynamic> toJson() => _$RegressionTestIssue1210ToJson(this);
}

@JsonSerializable(anyMap: true)
class CustomList extends ListBase<String> {
// Regression test for issue:
// https://github.com/google/json_serializable.dart/issues/1512

final List<String> _innerList = [];

CustomList();

@override
int get length => _innerList.length;

@override
set length(int newLength) {
_innerList.length = newLength;
}

@override
String operator [](int index) => _innerList[index];

@override
void operator []=(int index, String value) {
_innerList[index] = value;
}

factory CustomList.fromJson(Map<String, dynamic> json) =>
_$CustomListFromJson(json);

Map<String, dynamic> toJson() => _$CustomListToJson(this);
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.