Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
18 changes: 8 additions & 10 deletions packages/pigeon/example/app/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,14 @@ class _MyHomePageState extends State<MyHomePage> {
if (Platform.isAndroid || Platform.isIOS)
StreamBuilder<String>(
stream: getEventStream(),
builder: (
BuildContext context,
AsyncSnapshot<String> snapshot,
) {
if (snapshot.hasData) {
return Text(snapshot.data ?? '');
} else {
return const CircularProgressIndicator();
}
},
builder:
(BuildContext context, AsyncSnapshot<String> snapshot) {
if (snapshot.hasData) {
return Text(snapshot.data ?? '');
} else {
return const CircularProgressIndicator();
}
},
)
else
const Text('event channels are not supported on this platform'),
Expand Down
10 changes: 6 additions & 4 deletions packages/pigeon/example/app/lib/src/messages.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,9 @@ class ExampleHostApi {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) : pigeonVar_binaryMessenger = binaryMessenger,
pigeonVar_messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
final BinaryMessenger? pigeonVar_binaryMessenger;

static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
Expand Down Expand Up @@ -256,8 +257,9 @@ abstract class MessageFlutterApi {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) {
messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
{
final BasicMessageChannel<Object?>
pigeonVar_channel = BasicMessageChannel<Object?>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2983,8 +2983,8 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {

testWidgets('callFlutterEchoProxyApiMap', (_) async {
final ProxyApiTestClass api = _createGenericProxyApiTestClass(
flutterEchoProxyApiMap:
(_, Map<String?, ProxyApiTestClass?> aMap) => aMap,
flutterEchoProxyApiMap: (_, Map<String?, ProxyApiTestClass?> aMap) =>
aMap,
);

final Map<String?, ProxyApiTestClass?> value =
Expand Down Expand Up @@ -3087,8 +3087,8 @@ void runPigeonIntegrationTests(TargetGenerator targetGenerator) {

testWidgets('callFlutterEchoNullableProxyApi', (_) async {
final ProxyApiTestClass api = _createGenericProxyApiTestClass(
flutterEchoNullableProxyApi:
(_, ProxyApiSuperClass? aProxyApi) => aProxyApi,
flutterEchoNullableProxyApi: (_, ProxyApiSuperClass? aProxyApi) =>
aProxyApi,
);

expect(await api.callFlutterEchoNullableProxyApi(null), null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ class BackgroundApi2Host {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) : pigeonVar_binaryMessenger = binaryMessenger,
pigeonVar_messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
final BinaryMessenger? pigeonVar_binaryMessenger;

static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,10 @@ class AllTypes {
intMap: (result[23] as Map<Object?, Object?>?)!.cast<int, int>(),
enumMap: (result[24] as Map<Object?, Object?>?)!.cast<AnEnum, AnEnum>(),
objectMap: (result[25] as Map<Object?, Object?>?)!.cast<Object, Object>(),
listMap:
(result[26] as Map<Object?, Object?>?)!.cast<int, List<Object?>>(),
mapMap:
(result[27] as Map<Object?, Object?>?)!
.cast<int, Map<Object?, Object?>>(),
listMap: (result[26] as Map<Object?, Object?>?)!
.cast<int, List<Object?>>(),
mapMap: (result[27] as Map<Object?, Object?>?)!
.cast<int, Map<Object?, Object?>>(),
);
}

Expand Down Expand Up @@ -433,23 +432,21 @@ class AllNullableTypes {
objectList: (result[19] as List<Object?>?)?.cast<Object?>(),
listList: (result[20] as List<Object?>?)?.cast<List<Object?>?>(),
mapList: (result[21] as List<Object?>?)?.cast<Map<Object?, Object?>?>(),
recursiveClassList:
(result[22] as List<Object?>?)?.cast<AllNullableTypes?>(),
recursiveClassList: (result[22] as List<Object?>?)
?.cast<AllNullableTypes?>(),
map: result[23] as Map<Object?, Object?>?,
stringMap:
(result[24] as Map<Object?, Object?>?)?.cast<String?, String?>(),
stringMap: (result[24] as Map<Object?, Object?>?)
?.cast<String?, String?>(),
intMap: (result[25] as Map<Object?, Object?>?)?.cast<int?, int?>(),
enumMap: (result[26] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
objectMap:
(result[27] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
listMap:
(result[28] as Map<Object?, Object?>?)?.cast<int?, List<Object?>?>(),
mapMap:
(result[29] as Map<Object?, Object?>?)
?.cast<int?, Map<Object?, Object?>?>(),
recursiveClassMap:
(result[30] as Map<Object?, Object?>?)
?.cast<int?, AllNullableTypes?>(),
objectMap: (result[27] as Map<Object?, Object?>?)
?.cast<Object?, Object?>(),
listMap: (result[28] as Map<Object?, Object?>?)
?.cast<int?, List<Object?>?>(),
mapMap: (result[29] as Map<Object?, Object?>?)
?.cast<int?, Map<Object?, Object?>?>(),
recursiveClassMap: (result[30] as Map<Object?, Object?>?)
?.cast<int?, AllNullableTypes?>(),
);
}

Expand Down Expand Up @@ -623,17 +620,16 @@ class AllNullableTypesWithoutRecursion {
listList: (result[19] as List<Object?>?)?.cast<List<Object?>?>(),
mapList: (result[20] as List<Object?>?)?.cast<Map<Object?, Object?>?>(),
map: result[21] as Map<Object?, Object?>?,
stringMap:
(result[22] as Map<Object?, Object?>?)?.cast<String?, String?>(),
stringMap: (result[22] as Map<Object?, Object?>?)
?.cast<String?, String?>(),
intMap: (result[23] as Map<Object?, Object?>?)?.cast<int?, int?>(),
enumMap: (result[24] as Map<Object?, Object?>?)?.cast<AnEnum?, AnEnum?>(),
objectMap:
(result[25] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
listMap:
(result[26] as Map<Object?, Object?>?)?.cast<int?, List<Object?>?>(),
mapMap:
(result[27] as Map<Object?, Object?>?)
?.cast<int?, Map<Object?, Object?>?>(),
objectMap: (result[25] as Map<Object?, Object?>?)
?.cast<Object?, Object?>(),
listMap: (result[26] as Map<Object?, Object?>?)
?.cast<int?, List<Object?>?>(),
mapMap: (result[27] as Map<Object?, Object?>?)
?.cast<int?, Map<Object?, Object?>?>(),
);
}

Expand Down Expand Up @@ -709,13 +705,11 @@ class AllClassesWrapper {
result[1] as AllNullableTypesWithoutRecursion?,
allTypes: result[2] as AllTypes?,
classList: (result[3] as List<Object?>?)!.cast<AllTypes?>(),
nullableClassList:
(result[4] as List<Object?>?)
?.cast<AllNullableTypesWithoutRecursion?>(),
nullableClassList: (result[4] as List<Object?>?)
?.cast<AllNullableTypesWithoutRecursion?>(),
classMap: (result[5] as Map<Object?, Object?>?)!.cast<int?, AllTypes?>(),
nullableClassMap:
(result[6] as Map<Object?, Object?>?)
?.cast<int?, AllNullableTypesWithoutRecursion?>(),
nullableClassMap: (result[6] as Map<Object?, Object?>?)
?.cast<int?, AllNullableTypesWithoutRecursion?>(),
);
}

Expand Down Expand Up @@ -845,8 +839,9 @@ class HostIntegrationCoreApi {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) : pigeonVar_binaryMessenger = binaryMessenger,
pigeonVar_messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
final BinaryMessenger? pigeonVar_binaryMessenger;

static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
Expand Down Expand Up @@ -5842,8 +5837,9 @@ abstract class FlutterIntegrationCoreApi {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) {
messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
{
final BasicMessageChannel<Object?>
pigeonVar_channel = BasicMessageChannel<Object?>(
Expand Down Expand Up @@ -6274,8 +6270,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final List<Object?>? arg_list =
(args[0] as List<Object?>?)?.cast<Object?>();
final List<Object?>? arg_list = (args[0] as List<Object?>?)
?.cast<Object?>();
assert(
arg_list != null,
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null, expected non-null List<Object?>.',
Expand Down Expand Up @@ -6309,8 +6305,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final List<AnEnum?>? arg_enumList =
(args[0] as List<Object?>?)?.cast<AnEnum?>();
final List<AnEnum?>? arg_enumList = (args[0] as List<Object?>?)
?.cast<AnEnum?>();
assert(
arg_enumList != null,
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null, expected non-null List<AnEnum?>.',
Expand Down Expand Up @@ -6381,8 +6377,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final List<AnEnum>? arg_enumList =
(args[0] as List<Object?>?)?.cast<AnEnum>();
final List<AnEnum>? arg_enumList = (args[0] as List<Object?>?)
?.cast<AnEnum>();
assert(
arg_enumList != null,
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList was null, expected non-null List<AnEnum>.',
Expand Down Expand Up @@ -6670,8 +6666,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final Map<int, int>? arg_intMap =
(args[0] as Map<Object?, Object?>?)?.cast<int, int>();
final Map<int, int>? arg_intMap = (args[0] as Map<Object?, Object?>?)
?.cast<int, int>();
assert(
arg_intMap != null,
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap was null, expected non-null Map<int, int>.',
Expand Down Expand Up @@ -6998,8 +6994,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final List<Object?>? arg_list =
(args[0] as List<Object?>?)?.cast<Object?>();
final List<Object?>? arg_list = (args[0] as List<Object?>?)
?.cast<Object?>();
try {
final List<Object?>? output = api.echoNullableList(arg_list);
return wrapResponse(result: output);
Expand Down Expand Up @@ -7029,8 +7025,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnumList was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final List<AnEnum?>? arg_enumList =
(args[0] as List<Object?>?)?.cast<AnEnum?>();
final List<AnEnum?>? arg_enumList = (args[0] as List<Object?>?)
?.cast<AnEnum?>();
try {
final List<AnEnum?>? output = api.echoNullableEnumList(
arg_enumList,
Expand Down Expand Up @@ -7095,8 +7091,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final List<AnEnum>? arg_enumList =
(args[0] as List<Object?>?)?.cast<AnEnum>();
final List<AnEnum>? arg_enumList = (args[0] as List<Object?>?)
?.cast<AnEnum>();
try {
final List<AnEnum>? output = api.echoNullableNonNullEnumList(
arg_enumList,
Expand Down Expand Up @@ -7353,8 +7349,8 @@ abstract class FlutterIntegrationCoreApi {
'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap was null.',
);
final List<Object?> args = (message as List<Object?>?)!;
final Map<int, int>? arg_intMap =
(args[0] as Map<Object?, Object?>?)?.cast<int, int>();
final Map<int, int>? arg_intMap = (args[0] as Map<Object?, Object?>?)
?.cast<int, int>();
try {
final Map<int, int>? output = api.echoNullableNonNullIntMap(
arg_intMap,
Expand Down Expand Up @@ -7568,8 +7564,9 @@ class HostTrivialApi {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) : pigeonVar_binaryMessenger = binaryMessenger,
pigeonVar_messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
final BinaryMessenger? pigeonVar_binaryMessenger;

static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
Expand Down Expand Up @@ -7611,8 +7608,9 @@ class HostSmallApi {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) : pigeonVar_binaryMessenger = binaryMessenger,
pigeonVar_messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
final BinaryMessenger? pigeonVar_binaryMessenger;

static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
Expand Down Expand Up @@ -7690,8 +7688,9 @@ abstract class FlutterSmallApi {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) {
messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
{
final BasicMessageChannel<Object?>
pigeonVar_channel = BasicMessageChannel<Object?>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,9 @@ class EnumApi2Host {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) : pigeonVar_binaryMessenger = binaryMessenger,
pigeonVar_messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
final BinaryMessenger? pigeonVar_binaryMessenger;

static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();
Expand Down Expand Up @@ -198,8 +199,9 @@ abstract class EnumApi2Flutter {
BinaryMessenger? binaryMessenger,
String messageChannelSuffix = '',
}) {
messageChannelSuffix =
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
messageChannelSuffix = messageChannelSuffix.isNotEmpty
? '.$messageChannelSuffix'
: '';
{
final BasicMessageChannel<Object?>
pigeonVar_channel = BasicMessageChannel<Object?>(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,25 +197,22 @@ class EventAllNullableTypes {
objectList: (result[19] as List<Object?>?)?.cast<Object?>(),
listList: (result[20] as List<Object?>?)?.cast<List<Object?>?>(),
mapList: (result[21] as List<Object?>?)?.cast<Map<Object?, Object?>?>(),
recursiveClassList:
(result[22] as List<Object?>?)?.cast<EventAllNullableTypes?>(),
recursiveClassList: (result[22] as List<Object?>?)
?.cast<EventAllNullableTypes?>(),
map: result[23] as Map<Object?, Object?>?,
stringMap:
(result[24] as Map<Object?, Object?>?)?.cast<String?, String?>(),
stringMap: (result[24] as Map<Object?, Object?>?)
?.cast<String?, String?>(),
intMap: (result[25] as Map<Object?, Object?>?)?.cast<int?, int?>(),
enumMap:
(result[26] as Map<Object?, Object?>?)
?.cast<EventEnum?, EventEnum?>(),
objectMap:
(result[27] as Map<Object?, Object?>?)?.cast<Object?, Object?>(),
listMap:
(result[28] as Map<Object?, Object?>?)?.cast<int?, List<Object?>?>(),
mapMap:
(result[29] as Map<Object?, Object?>?)
?.cast<int?, Map<Object?, Object?>?>(),
recursiveClassMap:
(result[30] as Map<Object?, Object?>?)
?.cast<int?, EventAllNullableTypes?>(),
enumMap: (result[26] as Map<Object?, Object?>?)
?.cast<EventEnum?, EventEnum?>(),
objectMap: (result[27] as Map<Object?, Object?>?)
?.cast<Object?, Object?>(),
listMap: (result[28] as Map<Object?, Object?>?)
?.cast<int?, List<Object?>?>(),
mapMap: (result[29] as Map<Object?, Object?>?)
?.cast<int?, Map<Object?, Object?>?>(),
recursiveClassMap: (result[30] as Map<Object?, Object?>?)
?.cast<int?, EventAllNullableTypes?>(),
);
}

Expand Down
Loading