Visitar URL original
Enum support in Pigeon by GaryQian · Pull Request #331 · flutter/packages · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
More tests, working on android
  • Loading branch information
GaryQian committed May 14, 2021
commit 5a347cf08f3a87e13419057b3f1449b09addcbe3
4 changes: 2 additions & 2 deletions packages/pigeon/lib/dart_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ void generateDart(DartOptions opt, Root root, StringSink sink) {
);
} else if (customEnumNames.contains(field.dataType)) {
indent.addln(
'${field.name} == null ? null : ${field.name}.index;',
'${field.name} == null ? null : ${field.name}$unwrapOperator.index;',
);
} else {
indent.addln('${field.name};');
Expand Down Expand Up @@ -283,7 +283,7 @@ pigeonMap['${field.name}'] != null
} else if (customEnumNames.contains(field.dataType)) {
indent.format('''
pigeonMap['${field.name}'] != null
\t\t? ${field.dataType}.values[pigeonMap['${field.name}']$unwrapOperator as int])
\t\t? ${field.dataType}.values[pigeonMap['${field.name}']$unwrapOperator as int]
\t\t: null''', leadingSpace: false, trailingNewline: false);
} else {
indent.add(
Expand Down
33 changes: 32 additions & 1 deletion packages/pigeon/test/dart_generator_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,38 @@ void main() {
generateDart(DartOptions(isNullSafe: false), root, sink);
final String code = sink.toString();
expect(code, contains('pigeonMap[\'enum1\'] = enum1 == null ? null : enum1.index;'));
expect(code, contains('? Enum.values[pigeonMap[\'enum1\'] as int])'));
expect(code, contains('? Enum.values[pigeonMap[\'enum1\'] as int]'));
expect(code, contains('EnumClass doSomething(EnumClass arg);'));
});

test('flutter enum argument with enum class nullsafe', () {
final Root root = Root(apis: <Api>[
Api(name: 'Api', location: ApiLocation.flutter, methods: <Method>[
Method(
name: 'doSomething',
argType: 'EnumClass',
returnType: 'EnumClass',
isAsynchronous: false,
)
])
], classes: <Class>[
Class(
name: 'EnumClass',
fields: <Field>[Field(name: 'enum1', dataType: 'Enum')]),
], enums: <Enum>[
Enum(
name: 'Enum',
members: <String>[
'one',
'two',
],
)
]);
final StringBuffer sink = StringBuffer();
generateDart(DartOptions(isNullSafe: true), root, sink);
final String code = sink.toString();
expect(code, contains('pigeonMap[\'enum1\'] = enum1 == null ? null : enum1!.index;'));
expect(code, contains('? Enum.values[pigeonMap[\'enum1\']! as int]'));
expect(code, contains('EnumClass doSomething(EnumClass arg);'));
});

Expand Down
18 changes: 18 additions & 0 deletions packages/pigeon/test/objc_generator_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,24 @@ void main() {
expect(code, contains('@implementation Foobar'));
});

test('gen one enum header', () {
final Root root = Root(apis: <Api>[], classes: <Class>[], enums: <Enum>[
Enum(
name: 'Enum1',
members: <String>[
'one',
'two',
],
)
]);
final StringBuffer sink = StringBuffer();
generateObjcHeader(ObjcOptions(), root, sink);
final String code = sink.toString();
expect(code, contains('typedef NS_ENUM(NSUInteger, Enum1) {'));
expect(code, contains(' one = 0,'));
expect(code, contains(' two = 1,'));
});

test('gen one api header', () {
final Root root = Root(apis: <Api>[
Api(name: 'Api', location: ApiLocation.host, methods: <Method>[
Expand Down