Skip to content

[pigeon] Minor fixes to NNBD type handling in Dart #1543

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

Merged
fluttergithubbot merged 6 commits into from
Apr 19, 2022
Merged

[pigeon] Minor fixes to NNBD type handling in Dart #1543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
473538e
Fix nullable enum and class fields
stuartmorgan-g Apr 13, 2022
9ecf6bc
Fix nullable collection return types
stuartmorgan-g Apr 14, 2022
da250fe
Add unit tests
stuartmorgan-g Apr 14, 2022
4713a48
Update version
stuartmorgan-g Apr 14, 2022
dbd4f67
Review comments
stuartmorgan-g Apr 19, 2022
e1177f0
Merge branch 'main' into pigeon-nnbd-misc-fixes
stuartmorgan-g Apr 19, 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
Next Next commit
Fix nullable enum and class fields
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed Apr 15, 2022
commit 473538e945d2343f5389349a37ab05d8366405fd
31 changes: 23 additions & 8 deletions packages/pigeon/lib/dart_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,14 @@ void generateDart(DartOptions opt, Root root, StringSink sink) {
);
for (final NamedType field in klass.fields) {
indent.write('pigeonMap[\'${field.name}\'] = ');
final String conditional = field.type.isNullable ? '?' : '';
if (customClassNames.contains(field.type.baseName)) {
indent.addln(
'${field.name}?.encode();',
'${field.name}$conditional.encode();',
);
} else if (customEnumNames.contains(field.type.baseName)) {
indent.addln(
'${field.name}?.index;',
'${field.name}$conditional.index;',
);
} else {
indent.addln('${field.name};');
Expand All @@ -478,15 +479,29 @@ void generateDart(DartOptions opt, Root root, StringSink sink) {
void writeDecode() {
void writeValueDecode(NamedType field) {
if (customClassNames.contains(field.type.baseName)) {
indent.format('''
final String nonNullValue =
"${field.type.baseName}.decode(pigeonMap['${field.name}']!)";
indent.format(
field.type.isNullable
? '''
pigeonMap['${field.name}'] != null
\t\t? ${field.type.baseName}.decode(pigeonMap['${field.name}']!)
\t\t: null''', leadingSpace: false, trailingNewline: false);
\t\t? $nonNullValue
\t\t: null'''
: nonNullValue,
leadingSpace: false,
trailingNewline: false);
} else if (customEnumNames.contains(field.type.baseName)) {
indent.format('''
final String nonNullValue =
"${field.type.baseName}.values[pigeonMap['${field.name}']! as int]";
indent.format(
field.type.isNullable
? '''
pigeonMap['${field.name}'] != null
\t\t? ${field.type.baseName}.values[pigeonMap['${field.name}']! as int]
\t\t: null''', leadingSpace: false, trailingNewline: false);
\t\t? $nonNullValue
\t\t: null'''
: nonNullValue,
leadingSpace: false,
trailingNewline: false);
} else if (field.type.typeArguments.isNotEmpty) {
final String genericType = _makeGenericTypeArguments(field.type);
final String castCall = _makeGenericCastCall(field.type);
Expand Down
12 changes: 11 additions & 1 deletion packages/pigeon/pigeons/non_null_fields.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,21 @@ class SearchRequest {
String query;
}

class ExtraData {
ExtraData({required this.detailA, required this.detailB});
String detailA;
String detailB;
}

enum ReplyType { success, error }

class SearchReply {
SearchReply(this.result, this.error, this.indices);
SearchReply(this.result, this.error, this.indices, this.extraData, this.type);
String result;
String error;
List<int?> indices;
ExtraData extraData;
ReplyType type;
}

@HostApi()
Expand Down