Skip to content

[pigeon] Adds non-null object fields #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ailtonvivaz wants to merge 3 commits into from
Closed

[pigeon] Adds non-null object fields #1191

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a0a348
Adds non-null object fields
ailtonvivaz Mar 12, 2022
57782e5
Bump version to 2.0.2
ailtonvivaz Mar 12, 2022
ec74255
Refactor code
ailtonvivaz Mar 15, 2022
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
Prev Previous commit
Refactor code
  • Loading branch information
@ailtonvivaz
ailtonvivaz committed Mar 15, 2022
commit ec74255eaa5bfb4437f92ebbdda73e01a219785b
26 changes: 14 additions & 12 deletions packages/pigeon/lib/dart_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,25 +470,27 @@ void generateDart(DartOptions opt, Root root, StringSink sink) {
'final Map<Object$nullTag, Object$nullTag> pigeonMap = <Object$nullTag, Object$nullTag>{};',
);
for (final NamedType field in klass.fields) {
final String nullsafe = field.type.isNullable ? '?' : '';
indent.write('pigeonMap[\'${field.name}\'] = ');
if (customClassNames.contains(field.type.baseName)) {
if (opt.isNullSafe) {
indent.addln('${field.name}$nullsafe.encode();');
if (opt.isNullSafe) {
final String nullAwareOperator = field.type.isNullable ? '?' : '';
if (customClassNames.contains(field.type.baseName)) {
indent.addln('${field.name}$nullAwareOperator.encode();');
} else if (customEnumNames.contains(field.type.baseName)) {
indent.addln('${field.name}$nullAwareOperator.index;');
} else {
indent.addln('${field.name};');
}
} else {
if (customClassNames.contains(field.type.baseName)) {
indent.addln(
'${field.name} == null ? null : ${field.name}.encode();');
}
} else if (customEnumNames.contains(field.type.baseName)) {
if (opt.isNullSafe) {
indent.addln('${field.name}$nullsafe.index;');
} else {
} else if (customEnumNames.contains(field.type.baseName)) {
indent.addln(
'${field.name} == null ? null : ${field.name}$unwrapOperator.index;',
'${field.name} == null ? null : ${field.name}.index;',
);
} else {
indent.addln('${field.name};');
}
} else {
indent.addln('${field.name};');
}
}
indent.writeln('return pigeonMap;');
Expand Down