From 6a14582dc353b8d2c5e8a76a1e014933f0b369c9 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Sun, 1 Mar 2026 19:59:12 -0800 Subject: [PATCH 1/8] Way less null-bang --- .../example/app/lib/src/messages.g.dart | 6 +- packages/pigeon/lib/src/ast.dart | 23 +- .../pigeon/lib/src/dart/dart_generator.dart | 141 ++++++----- .../src/dart/proxy_api_generator_helper.dart | 22 +- .../lib/src/generated/core_tests.gen.dart | 235 +++++++++--------- .../lib/src/generated/enum.gen.dart | 4 +- .../generated/event_channel_tests.gen.dart | 5 +- .../lib/src/generated/message.gen.dart | 4 +- .../lib/src/generated/multiple_arity.gen.dart | 6 +- .../src/generated/non_null_fields.gen.dart | 6 +- .../lib/src/generated/null_fields.gen.dart | 4 +- .../src/generated/nullable_returns.gen.dart | 6 +- .../lib/src/generated/primitive.gen.dart | 32 +-- .../src/generated/proxy_api_tests.gen.dart | 168 +++++++------ .../test/test_message.gen.dart | 8 +- 15 files changed, 343 insertions(+), 327 deletions(-) diff --git a/packages/pigeon/example/app/lib/src/messages.g.dart b/packages/pigeon/example/app/lib/src/messages.g.dart index d62d999988a9..d1c54f1e0afe 100644 --- a/packages/pigeon/example/app/lib/src/messages.g.dart +++ b/packages/pigeon/example/app/lib/src/messages.g.dart @@ -100,7 +100,7 @@ class MessageData { name: result[0] as String?, description: result[1] as String?, code: result[2]! as Code, - data: (result[3] as Map?)!.cast(), + data: (result[3]! as Map).cast(), ); } @@ -259,8 +259,8 @@ abstract class MessageFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod was null.', ); - final List args = (message as List?)!; - final String? arg_aString = (args[0] as String?); + final List args = message! as List; + final String? arg_aString = args[0] as String?; try { final String output = api.flutterMethod(arg_aString); return wrapResponse(result: output); diff --git a/packages/pigeon/lib/src/ast.dart b/packages/pigeon/lib/src/ast.dart index 078c4acedebc..929af9109285 100644 --- a/packages/pigeon/lib/src/ast.dart +++ b/packages/pigeon/lib/src/ast.dart @@ -555,7 +555,8 @@ class TypeDeclaration { } } - /// Returns duplicated `TypeDeclaration` with attached `associatedEnum` value. + /// Returns a new [TypeDeclaration] with [enumDefinition] as the + /// [associatedEnum] value. TypeDeclaration copyWithEnum(Enum enumDefinition) { return TypeDeclaration( baseName: baseName, @@ -565,7 +566,8 @@ class TypeDeclaration { ); } - /// Returns duplicated `TypeDeclaration` with attached `associatedClass` value. + /// Returns a new [TypeDeclaration] with [classDefinition] as the + /// [associatedClass] value. TypeDeclaration copyWithClass(Class classDefinition) { return TypeDeclaration( baseName: baseName, @@ -575,7 +577,8 @@ class TypeDeclaration { ); } - /// Returns duplicated `TypeDeclaration` with attached `associatedProxyApi` value. + /// Returns a new [TypeDeclaration] with [proxyApiDefinition] as the + /// [associatedProxyApi] value. TypeDeclaration copyWithProxyApi(AstProxyApi proxyApiDefinition) { return TypeDeclaration( baseName: baseName, @@ -585,7 +588,7 @@ class TypeDeclaration { ); } - /// Returns duplicated `TypeDeclaration` with attached `associatedProxyApi` value. + /// Returns a new [TypeDeclaration] with [associatedProxyApi]. TypeDeclaration copyWithTypeArguments(List types) { return TypeDeclaration( baseName: baseName, @@ -597,6 +600,18 @@ class TypeDeclaration { ); } + /// Returns a new [TypeDeclaration] with [nullable] as the [isNullable] value. + TypeDeclaration copyWithNullability(bool nullable) { + return TypeDeclaration( + baseName: baseName, + isNullable: nullable, + typeArguments: typeArguments, + associatedClass: associatedClass, + associatedEnum: associatedEnum, + associatedProxyApi: associatedProxyApi, + ); + } + @override String toString() { final typeArgumentsStr = typeArguments.isEmpty diff --git a/packages/pigeon/lib/src/dart/dart_generator.dart b/packages/pigeon/lib/src/dart/dart_generator.dart index a979f6386222..f26f44b0cf30 100644 --- a/packages/pigeon/lib/src/dart/dart_generator.dart +++ b/packages/pigeon/lib/src/dart/dart_generator.dart @@ -231,7 +231,7 @@ class DartGenerator extends StructuredGenerator { docCommentSpec, ); - final String datatype = addGenericTypesNullable(field.type); + final String datatype = addGenericTypes(field.type); indent.writeln('$datatype ${field.name};'); indent.newln(); } @@ -316,19 +316,24 @@ class DartGenerator extends StructuredGenerator { }) { void writeValueDecode(NamedType field, int index) { final resultAt = 'result[$index]'; - final castCallPrefix = field.type.isNullable ? '?' : '!'; final String genericType = _makeGenericTypeArguments(field.type); - final String castCall = _makeGenericCastCall(field.type); - final nullableTag = field.type.isNullable ? '?' : ''; + final nullAssert = field.type.isNullable ? '' : '!'; if (field.type.typeArguments.isNotEmpty) { - indent.add('($resultAt as $genericType?)$castCallPrefix$castCall'); + final String castCall = _makeGenericCastCall(field.type); + if (castCall.isNotEmpty) { + final castCallPrefix = field.type.isNullable ? '?' : ''; + indent.add( + '($resultAt$nullAssert as $genericType)$castCallPrefix$castCall', + ); + } else { + indent.add('($resultAt as $genericType)'); + } } else { - final castCallForcePrefix = field.type.isNullable ? '' : '!'; final castString = field.type.baseName == 'Object' ? '' - : ' as $genericType$nullableTag'; + : ' as $genericType'; - indent.add('$resultAt$castCallForcePrefix$castString'); + indent.add('$resultAt$nullAssert$castString'); } } @@ -555,8 +560,8 @@ class DartGenerator extends StructuredGenerator { final bool isAsync = func.isAsynchronous; final String returnType = isAsync - ? 'Future<${addGenericTypesNullable(func.returnType)}>' - : addGenericTypesNullable(func.returnType); + ? 'Future<${addGenericTypes(func.returnType)}>' + : addGenericTypes(func.returnType); final String argSignature = _getMethodParameterSignature( func.parameters, ); @@ -1136,7 +1141,7 @@ final BinaryMessenger? ${varNamePrefix}binaryMessenger; } } - /// Writes [wrapResponse] method. + /// Writes the `wrapResponse` method. void _writeWrapResponse(InternalDartOptions opt, Root root, Indent indent) { indent.newln(); indent.writeScoped( @@ -1275,7 +1280,7 @@ if (wrapped == null) { addDocumentationComments(indent, documentationComments, docCommentSpec); final String argSignature = _getMethodParameterSignature(parameters); indent.write( - 'Future<${addGenericTypesNullable(returnType)}> $name($argSignature) async ', + 'Future<${addGenericTypes(returnType)}> $name($argSignature) async ', ); indent.addScoped('{', '}', () { writeHostMethodMessageCall( @@ -1338,7 +1343,7 @@ if (wrapped == null) { indent.format(''' final ${varNamePrefix}replyList = await $sendFutureVar as List?; '''); - final validateCall = + final extractCall = ''' _extractReplyValueOrThrow( \t\t${varNamePrefix}replyList, @@ -1347,18 +1352,15 @@ _extractReplyValueOrThrow( ) '''; if (returnType.isVoid) { - indent.format('$validateCall;'); + indent.format('$extractCall;'); } else { const accessor = '${varNamePrefix}replyValue'; if (returnType.isNullable) { - indent.format('final Object? $accessor = $validateCall;'); + indent.format('final Object? $accessor = $extractCall;'); } else { - indent.format('final Object $accessor = $validateCall!;'); - } - String returnTypeName = _makeGenericTypeArguments(returnType); - if (returnType.isNullable) { - returnTypeName = '$returnTypeName?'; + indent.format('final Object $accessor = $extractCall!;'); } + final String returnTypeName = _makeGenericTypeArguments(returnType); final String genericCastCall = _makeGenericCastCall(returnType); if (genericCastCall.isEmpty) { @@ -1425,7 +1427,7 @@ _extractReplyValueOrThrow( '$messageHandlerSetterWithOpeningParentheses(Object? message) async ', ); indent.addScoped('{', '});', () { - final String returnTypeString = addGenericTypesNullable(returnType); + final String returnTypeString = addGenericTypes(returnType); final isAsync = isAsynchronous; const emptyReturnStatement = 'return wrapResponse(empty: true);'; String call; @@ -1436,21 +1438,34 @@ _extractReplyValueOrThrow( indent.writeln("'Argument for $channelName was null.');"); const argsArray = 'args'; indent.writeln( - 'final List $argsArray = (message as List?)!;', + 'final List $argsArray = message! as List;', ); - String argNameFunc(int index, NamedType type) => - _getSafeArgumentName(index, type); enumerate(parameters, (int count, NamedType arg) { - final String argType = _addGenericTypes(arg.type); - final String argName = argNameFunc(count, arg); - final String genericArgType = _makeGenericTypeArguments(arg.type); + final String argType = addGenericTypes(arg.type); + // TODO(srawlins): It seems at some point we can stop making this + // local variable unconditionally nullable, with the assert + // statement below it. Instead we can use the nullability of + // `arg.type`. + final String argTypeNullable = addGenericTypes( + arg.type.copyWithNullability(true), + ); + final String argName = _getSafeArgumentName(count, arg); + final leftHandSide = 'final $argTypeNullable $argName'; final String castCall = _makeGenericCastCall(arg.type); - final leftHandSide = 'final $argType? $argName'; - - indent.writeln( - '$leftHandSide = ($argsArray[$count] as $genericArgType?)${castCall.isEmpty ? '' : '?$castCall'};', - ); + if (castCall.isEmpty) { + indent.writeln( + '$leftHandSide = $argsArray[$count] as $argTypeNullable;', + ); + } else { + final String genericArgType = _makeGenericTypeArguments( + arg.type.copyWithNullability(true), + ); + final valueAsArgType = '$argsArray[$count] as $genericArgType'; + // As `argTypeNullable` is unconditionally nullable, we must use + // `?.` to invoke `cast()`. + indent.writeln('$leftHandSide = ($valueAsArgType)?$castCall;'); + } if (!arg.type.isNullable) { indent.writeln('assert($argName != null,'); @@ -1515,7 +1530,7 @@ _extractReplyValueOrThrow( /// Converts a [TypeDeclaration] to a `code_builder` Reference. cb.Reference refer(TypeDeclaration type, {bool asFuture = false}) { - final String symbol = addGenericTypesNullable(type); + final String symbol = addGenericTypes(type); return cb.refer(asFuture ? 'Future<$symbol>' : symbol); } @@ -1526,19 +1541,28 @@ String _escapeForDartSingleQuotedString(String raw) { .replaceAll(r"'", r"\'"); } -/// Creates a Dart type where all type arguments are [Objects]. +/// Creates a Dart type where all type arguments are [Object]s. String _makeGenericTypeArguments(TypeDeclaration type) { - return type.typeArguments.isNotEmpty - ? '${type.baseName}<${type.typeArguments.map((TypeDeclaration e) => 'Object?').join(', ')}>' - : _addGenericTypes(type); + if (type.typeArguments.isEmpty) { + return addGenericTypes(type); + } + + final withTypeArguments = + '${type.baseName}<${type.typeArguments.map((TypeDeclaration e) => 'Object?').join(', ')}>'; + return '$withTypeArguments${type.isNullable ? '?' : ''}'; } -/// Creates a `.cast<>` call for an type. Returns an empty string if the -/// type has no type arguments. +/// Returns a `.cast<>()` call for [type]. Returns an empty string if [type] has +/// no type arguments. String _makeGenericCastCall(TypeDeclaration type) { - return type.typeArguments.isNotEmpty - ? '.cast<${_flattenTypeArguments(type.typeArguments)}>()' - : ''; + final List typeArguments = type.typeArguments; + if (typeArguments.isEmpty) { + return ''; + } + if (typeArguments.every((e) => e.baseName == 'Object' && e.isNullable)) { + return ''; + } + return '.cast<${_flattenTypeArguments(type.typeArguments)}>()'; } /// Returns an argument name that can be used in a context where it is possible to collide. @@ -1573,7 +1597,7 @@ String _getMethodParameterSignature( String getParameterString(Parameter p) { final required = p.isRequired && !p.isPositional ? 'required ' : ''; - final String type = addGenericTypesNullable(p.type); + final String type = addGenericTypes(p.type); final defaultValue = p.defaultValue == null ? '' : ' = ${p.defaultValue}'; return '$required$type ${p.name}$defaultValue'; @@ -1626,28 +1650,21 @@ String _flattenTypeArguments(List args) { .join(', '); } -/// Creates the type declaration for use in Dart code from a [NamedType] making sure -/// that type arguments are used for primitive generic types. -String _addGenericTypes(TypeDeclaration type) { +/// Returns the string representation of a [TypeDeclaration], including type +/// arguments and a nullability suffix, if the type is nullable. +String addGenericTypes(TypeDeclaration type) { final List typeArguments = type.typeArguments; - switch (type.baseName) { - case 'List': - return typeArguments.isEmpty + final String genericType = switch (type.baseName) { + 'List' => + typeArguments.isEmpty ? 'List' - : 'List<${_flattenTypeArguments(typeArguments)}>'; - case 'Map': - return typeArguments.isEmpty + : 'List<${_flattenTypeArguments(typeArguments)}>', + 'Map' => + typeArguments.isEmpty ? 'Map' - : 'Map<${_flattenTypeArguments(typeArguments)}>'; - default: - return type.baseName; - } -} - -/// Converts the type signature of a [TypeDeclaration] that include generic -/// types. -String addGenericTypesNullable(TypeDeclaration type) { - final String genericType = _addGenericTypes(type); + : 'Map<${_flattenTypeArguments(typeArguments)}>', + _ => type.baseName, + }; return type.isNullable ? '$genericType?' : genericType; } diff --git a/packages/pigeon/lib/src/dart/proxy_api_generator_helper.dart b/packages/pigeon/lib/src/dart/proxy_api_generator_helper.dart index 9691b9b39b0b..7a95b1327ea5 100644 --- a/packages/pigeon/lib/src/dart/proxy_api_generator_helper.dart +++ b/packages/pigeon/lib/src/dart/proxy_api_generator_helper.dart @@ -48,9 +48,7 @@ Iterable asConstructorParameters({ (cb.ParameterBuilder builder) => builder ..name = field.name ..named = true - ..type = defineType - ? cb.refer(addGenericTypesNullable(field.type)) - : null + ..type = defineType ? cb.refer(addGenericTypes(field.type)) : null ..toThis = !defineType ..required = !field.type.isNullable, ); @@ -259,7 +257,7 @@ cb.FunctionType methodAsFunctionType(Method method, {required String apiName}) { cb.refer('$apiName ${classMemberNamePrefix}instance'), ...method.parameters.mapIndexed((int index, NamedType parameter) { return cb.refer( - '${addGenericTypesNullable(parameter.type)} ${getParameterName(index, parameter)}', + '${addGenericTypes(parameter.type)} ${getParameterName(index, parameter)}', ); }), ]), @@ -287,7 +285,7 @@ Iterable staticAttachedFieldsGetters( ..name = field.name ..type = cb.MethodType.getter ..static = true - ..returns = cb.refer(addGenericTypesNullable(field.type)) + ..returns = cb.refer(addGenericTypes(field.type)) ..docs.addAll( asDocumentationComments(field.documentationComments, docCommentSpec), ) @@ -564,7 +562,7 @@ Iterable unattachedFields(Iterable fields) sync* { yield cb.Field( (cb.FieldBuilder builder) => builder ..name = field.name - ..type = cb.refer(addGenericTypesNullable(field.type)) + ..type = cb.refer(addGenericTypes(field.type)) ..modifier = cb.FieldModifier.final$ ..docs.addAll( asDocumentationComments(field.documentationComments, docCommentSpec), @@ -658,7 +656,7 @@ Iterable interfaceApiFields( NamedType parameter, ) { return cb.refer( - '${addGenericTypesNullable(parameter.type)} ${getParameterName(index, parameter)}', + '${addGenericTypes(parameter.type)} ${getParameterName(index, parameter)}', ); }), ]), @@ -683,7 +681,7 @@ Iterable attachedFields(Iterable fields) sync* { yield cb.Field( (cb.FieldBuilder builder) => builder ..name = '${field.isStatic ? '_' : ''}${field.name}' - ..type = cb.refer(addGenericTypesNullable(field.type)) + ..type = cb.refer(addGenericTypes(field.type)) ..modifier = cb.FieldModifier.final$ ..static = field.isStatic ..late = !field.isStatic @@ -750,7 +748,7 @@ cb.Method setUpMessageHandlerMethod({ ..requiredParameters.addAll( unattachedFields.mapIndexed((int index, ApiField field) { return cb.refer( - '${addGenericTypesNullable(field.type)} ${getParameterName(index, field)}', + '${addGenericTypes(field.type)} ${getParameterName(index, field)}', ); }), ), @@ -774,7 +772,7 @@ cb.Method setUpMessageHandlerMethod({ NamedType parameter, ) { return cb.refer( - '${addGenericTypesNullable(parameter.type)} ${getParameterName(index, parameter)}', + '${addGenericTypes(parameter.type)} ${getParameterName(index, parameter)}', ); }), ]), @@ -905,7 +903,7 @@ Iterable attachedFieldMethods( }) sync* { for (final field in fields) { yield cb.Method((cb.MethodBuilder builder) { - final String type = addGenericTypesNullable(field.type); + final String type = addGenericTypes(field.type); const instanceName = '${varNamePrefix}instance'; const identifierInstanceName = '${varNamePrefix}instanceIdentifier'; builder @@ -994,7 +992,7 @@ Iterable hostMethods( (int index, NamedType parameter) => cb.Parameter( (cb.ParameterBuilder builder) => builder ..name = getParameterName(index, parameter) - ..type = cb.refer(addGenericTypesNullable(parameter.type)), + ..type = cb.refer(addGenericTypes(parameter.type)), ), ); yield cb.Method( diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index b325d041e44a..d791a42f1d44 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -250,22 +250,22 @@ class AllTypes { aString: result[10]! as String, anObject: result[11]!, list: result[12]! as List, - stringList: (result[13] as List?)!.cast(), - intList: (result[14] as List?)!.cast(), - doubleList: (result[15] as List?)!.cast(), - boolList: (result[16] as List?)!.cast(), - enumList: (result[17] as List?)!.cast(), - objectList: (result[18] as List?)!.cast(), - listList: (result[19] as List?)!.cast>(), - mapList: (result[20] as List?)!.cast>(), + stringList: (result[13]! as List).cast(), + intList: (result[14]! as List).cast(), + doubleList: (result[15]! as List).cast(), + boolList: (result[16]! as List).cast(), + enumList: (result[17]! as List).cast(), + objectList: (result[18]! as List).cast(), + listList: (result[19]! as List).cast>(), + mapList: (result[20]! as List).cast>(), map: result[21]! as Map, - stringMap: (result[22] as Map?)!.cast(), - intMap: (result[23] as Map?)!.cast(), - enumMap: (result[24] as Map?)!.cast(), - objectMap: (result[25] as Map?)!.cast(), - listMap: (result[26] as Map?)! + stringMap: (result[22]! as Map).cast(), + intMap: (result[23]! as Map).cast(), + enumMap: (result[24]! as Map).cast(), + objectMap: (result[25]! as Map).cast(), + listMap: (result[26]! as Map) .cast>(), - mapMap: (result[27] as Map?)! + mapMap: (result[27]! as Map) .cast>(), ); } @@ -447,7 +447,7 @@ class AllNullableTypes { doubleList: (result[16] as List?)?.cast(), boolList: (result[17] as List?)?.cast(), enumList: (result[18] as List?)?.cast(), - objectList: (result[19] as List?)?.cast(), + objectList: (result[19] as List?), listList: (result[20] as List?)?.cast?>(), mapList: (result[21] as List?)?.cast?>(), recursiveClassList: (result[22] as List?) @@ -457,8 +457,7 @@ class AllNullableTypes { ?.cast(), intMap: (result[25] as Map?)?.cast(), enumMap: (result[26] as Map?)?.cast(), - objectMap: (result[27] as Map?) - ?.cast(), + objectMap: (result[27] as Map?), listMap: (result[28] as Map?) ?.cast?>(), mapMap: (result[29] as Map?) @@ -634,7 +633,7 @@ class AllNullableTypesWithoutRecursion { doubleList: (result[15] as List?)?.cast(), boolList: (result[16] as List?)?.cast(), enumList: (result[17] as List?)?.cast(), - objectList: (result[18] as List?)?.cast(), + objectList: (result[18] as List?), listList: (result[19] as List?)?.cast?>(), mapList: (result[20] as List?)?.cast?>(), map: result[21] as Map?, @@ -642,8 +641,7 @@ class AllNullableTypesWithoutRecursion { ?.cast(), intMap: (result[23] as Map?)?.cast(), enumMap: (result[24] as Map?)?.cast(), - objectMap: (result[25] as Map?) - ?.cast(), + objectMap: (result[25] as Map?), listMap: (result[26] as Map?) ?.cast?>(), mapMap: (result[27] as Map?) @@ -722,10 +720,10 @@ class AllClassesWrapper { allNullableTypesWithoutRecursion: result[1] as AllNullableTypesWithoutRecursion?, allTypes: result[2] as AllTypes?, - classList: (result[3] as List?)!.cast(), + classList: (result[3]! as List).cast(), nullableClassList: (result[4] as List?) ?.cast(), - classMap: (result[5] as Map?)!.cast(), + classMap: (result[5]! as Map).cast(), nullableClassMap: (result[6] as Map?) ?.cast(), ); @@ -1118,7 +1116,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as List).cast(); + return pigeonVar_replyValue as List; } /// Returns the passed list, to test serialization and deserialization. @@ -1232,8 +1230,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as Map) - .cast(); + return pigeonVar_replyValue as Map; } /// Returns the passed map, to test serialization and deserialization. @@ -1865,7 +1862,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as List?)?.cast(); + return pigeonVar_replyValue as List?; } /// Returns the passed list, to test serialization and deserialization. @@ -1983,8 +1980,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as Map?) - ?.cast(); + return pigeonVar_replyValue as Map?; } /// Returns the passed map, to test serialization and deserialization. @@ -2440,7 +2436,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as List).cast(); + return pigeonVar_replyValue as List; } /// Returns the passed list, to test asynchronous serialization and deserialization. @@ -2508,8 +2504,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as Map) - .cast(); + return pigeonVar_replyValue as Map; } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -2934,7 +2929,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as List?)?.cast(); + return pigeonVar_replyValue as List?; } /// Returns the passed list, to test asynchronous serialization and deserialization. @@ -3006,8 +3001,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as Map?) - ?.cast(); + return pigeonVar_replyValue as Map?; } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -3494,7 +3488,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as List).cast(); + return pigeonVar_replyValue as List; } Future> callFlutterEchoEnumList(List enumList) async { @@ -3607,8 +3601,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as Map) - .cast(); + return pigeonVar_replyValue as Map; } Future> callFlutterEchoStringMap( @@ -3968,7 +3961,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as List?)?.cast(); + return pigeonVar_replyValue as List?; } Future?> callFlutterEchoNullableEnumList( @@ -4083,8 +4076,7 @@ class HostIntegrationCoreApi { pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as Map?) - ?.cast(); + return pigeonVar_replyValue as Map?; } Future?> callFlutterEchoNullableStringMap( @@ -4627,8 +4619,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes was null.', ); - final List args = (message as List?)!; - final AllTypes? arg_everything = (args[0] as AllTypes?); + final List args = message! as List; + final AllTypes? arg_everything = args[0] as AllTypes?; assert( arg_everything != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes was null, expected non-null AllTypes.', @@ -4660,9 +4652,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes was null.', ); - final List args = (message as List?)!; - final AllNullableTypes? arg_everything = - (args[0] as AllNullableTypes?); + final List args = message! as List; + final AllNullableTypes? arg_everything = args[0] as AllNullableTypes?; try { final AllNullableTypes? output = api.echoAllNullableTypes( arg_everything, @@ -4692,10 +4683,10 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes was null.', ); - final List args = (message as List?)!; - final bool? arg_aNullableBool = (args[0] as bool?); - final int? arg_aNullableInt = (args[1] as int?); - final String? arg_aNullableString = (args[2] as String?); + final List args = message! as List; + final bool? arg_aNullableBool = args[0] as bool?; + final int? arg_aNullableInt = args[1] as int?; + final String? arg_aNullableString = args[2] as String?; try { final AllNullableTypes output = api.sendMultipleNullableTypes( arg_aNullableBool, @@ -4727,9 +4718,9 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final AllNullableTypesWithoutRecursion? arg_everything = - (args[0] as AllNullableTypesWithoutRecursion?); + args[0] as AllNullableTypesWithoutRecursion?; try { final AllNullableTypesWithoutRecursion? output = api .echoAllNullableTypesWithoutRecursion(arg_everything); @@ -4758,10 +4749,10 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion was null.', ); - final List args = (message as List?)!; - final bool? arg_aNullableBool = (args[0] as bool?); - final int? arg_aNullableInt = (args[1] as int?); - final String? arg_aNullableString = (args[2] as String?); + final List args = message! as List; + final bool? arg_aNullableBool = args[0] as bool?; + final int? arg_aNullableInt = args[1] as int?; + final String? arg_aNullableString = args[2] as String?; try { final AllNullableTypesWithoutRecursion output = api .sendMultipleNullableTypesWithoutRecursion( @@ -4794,8 +4785,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool was null.', ); - final List args = (message as List?)!; - final bool? arg_aBool = (args[0] as bool?); + final List args = message! as List; + final bool? arg_aBool = args[0] as bool?; assert( arg_aBool != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool was null, expected non-null bool.', @@ -4827,8 +4818,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt was null.', ); - final List args = (message as List?)!; - final int? arg_anInt = (args[0] as int?); + final List args = message! as List; + final int? arg_anInt = args[0] as int?; assert( arg_anInt != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt was null, expected non-null int.', @@ -4860,8 +4851,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null.', ); - final List args = (message as List?)!; - final double? arg_aDouble = (args[0] as double?); + final List args = message! as List; + final double? arg_aDouble = args[0] as double?; assert( arg_aDouble != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.', @@ -4893,8 +4884,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null.', ); - final List args = (message as List?)!; - final String? arg_aString = (args[0] as String?); + final List args = message! as List; + final String? arg_aString = args[0] as String?; assert( arg_aString != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null, expected non-null String.', @@ -4926,8 +4917,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null.', ); - final List args = (message as List?)!; - final Uint8List? arg_list = (args[0] as Uint8List?); + final List args = message! as List; + final Uint8List? arg_list = args[0] as Uint8List?; assert( arg_list != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.', @@ -4959,9 +4950,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null.', ); - final List args = (message as List?)!; - final List? arg_list = (args[0] as List?) - ?.cast(); + final List args = message! as List; + final List? arg_list = args[0] as List?; assert( arg_list != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null, expected non-null List.', @@ -4993,7 +4983,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_enumList = (args[0] as List?) ?.cast(); assert( @@ -5027,7 +5017,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_classList = (args[0] as List?)?.cast(); assert( @@ -5063,7 +5053,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_enumList = (args[0] as List?) ?.cast(); assert( @@ -5097,7 +5087,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_classList = (args[0] as List?)?.cast(); assert( @@ -5133,9 +5123,9 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_map = - (args[0] as Map?)?.cast(); + args[0] as Map?; assert( arg_map != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map.', @@ -5167,7 +5157,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_stringMap = (args[0] as Map?)?.cast(); assert( @@ -5203,7 +5193,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_intMap = (args[0] as Map?)?.cast(); assert( @@ -5237,7 +5227,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_enumMap = (args[0] as Map?)?.cast(); assert( @@ -5271,7 +5261,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_classMap = (args[0] as Map?) ?.cast(); @@ -5308,7 +5298,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_stringMap = (args[0] as Map?)?.cast(); assert( @@ -5344,7 +5334,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_intMap = (args[0] as Map?) ?.cast(); assert( @@ -5378,7 +5368,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_enumMap = (args[0] as Map?)?.cast(); assert( @@ -5414,7 +5404,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_classMap = (args[0] as Map?) ?.cast(); @@ -5451,8 +5441,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum was null.', ); - final List args = (message as List?)!; - final AnEnum? arg_anEnum = (args[0] as AnEnum?); + final List args = message! as List; + final AnEnum? arg_anEnum = args[0] as AnEnum?; assert( arg_anEnum != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum was null, expected non-null AnEnum.', @@ -5484,8 +5474,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAnotherEnum was null.', ); - final List args = (message as List?)!; - final AnotherEnum? arg_anotherEnum = (args[0] as AnotherEnum?); + final List args = message! as List; + final AnotherEnum? arg_anotherEnum = args[0] as AnotherEnum?; assert( arg_anotherEnum != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAnotherEnum was null, expected non-null AnotherEnum.', @@ -5517,8 +5507,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool was null.', ); - final List args = (message as List?)!; - final bool? arg_aBool = (args[0] as bool?); + final List args = message! as List; + final bool? arg_aBool = args[0] as bool?; try { final bool? output = api.echoNullableBool(arg_aBool); return wrapResponse(result: output); @@ -5546,8 +5536,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt was null.', ); - final List args = (message as List?)!; - final int? arg_anInt = (args[0] as int?); + final List args = message! as List; + final int? arg_anInt = args[0] as int?; try { final int? output = api.echoNullableInt(arg_anInt); return wrapResponse(result: output); @@ -5575,8 +5565,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble was null.', ); - final List args = (message as List?)!; - final double? arg_aDouble = (args[0] as double?); + final List args = message! as List; + final double? arg_aDouble = args[0] as double?; try { final double? output = api.echoNullableDouble(arg_aDouble); return wrapResponse(result: output); @@ -5604,8 +5594,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString was null.', ); - final List args = (message as List?)!; - final String? arg_aString = (args[0] as String?); + final List args = message! as List; + final String? arg_aString = args[0] as String?; try { final String? output = api.echoNullableString(arg_aString); return wrapResponse(result: output); @@ -5633,8 +5623,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List was null.', ); - final List args = (message as List?)!; - final Uint8List? arg_list = (args[0] as Uint8List?); + final List args = message! as List; + final Uint8List? arg_list = args[0] as Uint8List?; try { final Uint8List? output = api.echoNullableUint8List(arg_list); return wrapResponse(result: output); @@ -5662,9 +5652,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList was null.', ); - final List args = (message as List?)!; - final List? arg_list = (args[0] as List?) - ?.cast(); + final List args = message! as List; + final List? arg_list = args[0] as List?; try { final List? output = api.echoNullableList(arg_list); return wrapResponse(result: output); @@ -5692,7 +5681,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnumList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_enumList = (args[0] as List?) ?.cast(); try { @@ -5724,7 +5713,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableClassList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_classList = (args[0] as List?)?.cast(); try { @@ -5756,7 +5745,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_enumList = (args[0] as List?) ?.cast(); try { @@ -5788,7 +5777,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_classList = (args[0] as List?)?.cast(); try { @@ -5819,9 +5808,9 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_map = - (args[0] as Map?)?.cast(); + args[0] as Map?; try { final Map? output = api.echoNullableMap(arg_map); return wrapResponse(result: output); @@ -5849,7 +5838,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableStringMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_stringMap = (args[0] as Map?)?.cast(); try { @@ -5881,7 +5870,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableIntMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_intMap = (args[0] as Map?)?.cast(); try { @@ -5911,7 +5900,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnumMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_enumMap = (args[0] as Map?)?.cast(); try { @@ -5943,7 +5932,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableClassMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_classMap = (args[0] as Map?) ?.cast(); @@ -5975,7 +5964,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_stringMap = (args[0] as Map?)?.cast(); try { @@ -6006,7 +5995,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_intMap = (args[0] as Map?) ?.cast(); try { @@ -6038,7 +6027,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_enumMap = (args[0] as Map?)?.cast(); try { @@ -6070,7 +6059,7 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_classMap = (args[0] as Map?) ?.cast(); @@ -6102,8 +6091,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum was null.', ); - final List args = (message as List?)!; - final AnEnum? arg_anEnum = (args[0] as AnEnum?); + final List args = message! as List; + final AnEnum? arg_anEnum = args[0] as AnEnum?; try { final AnEnum? output = api.echoNullableEnum(arg_anEnum); return wrapResponse(result: output); @@ -6131,8 +6120,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAnotherNullableEnum was null.', ); - final List args = (message as List?)!; - final AnotherEnum? arg_anotherEnum = (args[0] as AnotherEnum?); + final List args = message! as List; + final AnotherEnum? arg_anotherEnum = args[0] as AnotherEnum?; try { final AnotherEnum? output = api.echoAnotherNullableEnum( arg_anotherEnum, @@ -6185,8 +6174,8 @@ abstract class FlutterIntegrationCoreApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString was null.', ); - final List args = (message as List?)!; - final String? arg_aString = (args[0] as String?); + final List args = message! as List; + final String? arg_aString = args[0] as String?; assert( arg_aString != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString was null, expected non-null String.', @@ -6332,8 +6321,8 @@ abstract class FlutterSmallApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList was null.', ); - final List args = (message as List?)!; - final TestMessage? arg_msg = (args[0] as TestMessage?); + final List args = message! as List; + final TestMessage? arg_msg = args[0] as TestMessage?; assert( arg_msg != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList was null, expected non-null TestMessage.', @@ -6365,8 +6354,8 @@ abstract class FlutterSmallApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString was null.', ); - final List args = (message as List?)!; - final String? arg_aString = (args[0] as String?); + final List args = message! as List; + final String? arg_aString = args[0] as String?; assert( arg_aString != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString was null, expected non-null String.', diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart index d5cb251222e0..7a9f815336bd 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart @@ -223,8 +223,8 @@ abstract class EnumApi2Flutter { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Flutter.echo was null.', ); - final List args = (message as List?)!; - final DataWithEnum? arg_data = (args[0] as DataWithEnum?); + final List args = message! as List; + final DataWithEnum? arg_data = args[0] as DataWithEnum?; assert( arg_data != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Flutter.echo was null, expected non-null DataWithEnum.', diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart index 8ad8dd6ba6c1..db3005f7b19e 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart @@ -194,7 +194,7 @@ class EventAllNullableTypes { doubleList: (result[16] as List?)?.cast(), boolList: (result[17] as List?)?.cast(), enumList: (result[18] as List?)?.cast(), - objectList: (result[19] as List?)?.cast(), + objectList: (result[19] as List?), listList: (result[20] as List?)?.cast?>(), mapList: (result[21] as List?)?.cast?>(), recursiveClassList: (result[22] as List?) @@ -205,8 +205,7 @@ class EventAllNullableTypes { intMap: (result[25] as Map?)?.cast(), enumMap: (result[26] as Map?) ?.cast(), - objectMap: (result[27] as Map?) - ?.cast(), + objectMap: (result[27] as Map?), listMap: (result[28] as Map?) ?.cast?>(), mapMap: (result[29] as Map?) diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart index 3c16b1c9c19d..526ffcdfae28 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart @@ -391,9 +391,9 @@ abstract class MessageFlutterSearchApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageFlutterSearchApi.search was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final MessageSearchRequest? arg_request = - (args[0] as MessageSearchRequest?); + args[0] as MessageSearchRequest?; assert( arg_request != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageFlutterSearchApi.search was null, expected non-null MessageSearchRequest.', diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart index 5b62e1baac51..e460708fbbc8 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart @@ -138,13 +138,13 @@ abstract class MultipleArityFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract was null.', ); - final List args = (message as List?)!; - final int? arg_x = (args[0] as int?); + final List args = message! as List; + final int? arg_x = args[0] as int?; assert( arg_x != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract was null, expected non-null int.', ); - final int? arg_y = (args[1] as int?); + final int? arg_y = args[1] as int?; assert( arg_y != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract was null, expected non-null int.', diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart index d5173300a6b6..cd8ba5aec002 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart @@ -179,7 +179,7 @@ class NonNullFieldSearchReply { return NonNullFieldSearchReply( result: result[0]! as String, error: result[1]! as String, - indices: (result[2] as List?)!.cast(), + indices: (result[2]! as List).cast(), extraData: result[3]! as ExtraData, type: result[4]! as ReplyType, ); @@ -312,9 +312,9 @@ abstract class NonNullFieldFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldFlutterApi.search was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final NonNullFieldSearchRequest? arg_request = - (args[0] as NonNullFieldSearchRequest?); + args[0] as NonNullFieldSearchRequest?; assert( arg_request != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldFlutterApi.search was null, expected non-null NonNullFieldSearchRequest.', diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart index 0c0fe277fa15..5a8d60328dd1 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart @@ -269,9 +269,9 @@ abstract class NullFieldsFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullFieldsFlutterApi.search was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final NullFieldsSearchRequest? arg_request = - (args[0] as NullFieldsSearchRequest?); + args[0] as NullFieldsSearchRequest?; assert( arg_request != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullFieldsFlutterApi.search was null, expected non-null NullFieldsSearchRequest.', diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart index b41ddd61dba0..87580b565103 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart @@ -214,8 +214,8 @@ abstract class NullableArgFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullableArgFlutterApi.doit was null.', ); - final List args = (message as List?)!; - final int? arg_x = (args[0] as int?); + final List args = message! as List; + final int? arg_x = args[0] as int?; try { final int? output = api.doit(arg_x); return wrapResponse(result: output); @@ -374,7 +374,7 @@ abstract class NullableCollectionArgFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionArgFlutterApi.doit was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_x = (args[0] as List?) ?.cast(); try { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart index d1a8fef75d5c..6fd6d723df02 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart @@ -323,8 +323,8 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt was null.', ); - final List args = (message as List?)!; - final int? arg_value = (args[0] as int?); + final List args = message! as List; + final int? arg_value = args[0] as int?; assert( arg_value != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt was null, expected non-null int.', @@ -356,8 +356,8 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBool was null.', ); - final List args = (message as List?)!; - final bool? arg_value = (args[0] as bool?); + final List args = message! as List; + final bool? arg_value = args[0] as bool?; assert( arg_value != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBool was null, expected non-null bool.', @@ -389,8 +389,8 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aString was null.', ); - final List args = (message as List?)!; - final String? arg_value = (args[0] as String?); + final List args = message! as List; + final String? arg_value = args[0] as String?; assert( arg_value != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aString was null, expected non-null String.', @@ -422,8 +422,8 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aDouble was null.', ); - final List args = (message as List?)!; - final double? arg_value = (args[0] as double?); + final List args = message! as List; + final double? arg_value = args[0] as double?; assert( arg_value != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aDouble was null, expected non-null double.', @@ -455,9 +455,9 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_value = - (args[0] as Map?); + args[0] as Map?; assert( arg_value != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aMap was null, expected non-null Map.', @@ -489,8 +489,8 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aList was null.', ); - final List args = (message as List?)!; - final List? arg_value = (args[0] as List?); + final List args = message! as List; + final List? arg_value = args[0] as List?; assert( arg_value != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aList was null, expected non-null List.', @@ -522,8 +522,8 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt32List was null.', ); - final List args = (message as List?)!; - final Int32List? arg_value = (args[0] as Int32List?); + final List args = message! as List; + final Int32List? arg_value = args[0] as Int32List?; assert( arg_value != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt32List was null, expected non-null Int32List.', @@ -555,7 +555,7 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBoolList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final List? arg_value = (args[0] as List?) ?.cast(); assert( @@ -589,7 +589,7 @@ abstract class PrimitiveFlutterApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aStringIntMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final Map? arg_value = (args[0] as Map?)?.cast(); assert( diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart index b645e66dca32..0b6a81b373e6 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart @@ -618,8 +618,8 @@ class _PigeonInternalInstanceManagerApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PigeonInternalInstanceManager.removeStrongReference was null.', ); - final List args = (message as List?)!; - final int? arg_identifier = (args[0] as int?); + final List args = message! as List; + final int? arg_identifier = args[0] as int?; assert( arg_identifier != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PigeonInternalInstanceManager.removeStrongReference was null, expected non-null int.', @@ -2220,9 +2220,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoop was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoop was null, expected non-null ProxyApiTestClass.', @@ -2257,9 +2257,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowError was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowError was null, expected non-null ProxyApiTestClass.', @@ -2294,9 +2294,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowErrorFromVoid was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowErrorFromVoid was null, expected non-null ProxyApiTestClass.', @@ -2331,14 +2331,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoBool was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoBool was null, expected non-null ProxyApiTestClass.', ); - final bool? arg_aBool = (args[1] as bool?); + final bool? arg_aBool = args[1] as bool?; assert( arg_aBool != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoBool was null, expected non-null bool.', @@ -2375,14 +2375,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoInt was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoInt was null, expected non-null ProxyApiTestClass.', ); - final int? arg_anInt = (args[1] as int?); + final int? arg_anInt = args[1] as int?; assert( arg_anInt != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoInt was null, expected non-null int.', @@ -2419,14 +2419,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoDouble was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoDouble was null, expected non-null ProxyApiTestClass.', ); - final double? arg_aDouble = (args[1] as double?); + final double? arg_aDouble = args[1] as double?; assert( arg_aDouble != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoDouble was null, expected non-null double.', @@ -2461,14 +2461,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoString was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoString was null, expected non-null ProxyApiTestClass.', ); - final String? arg_aString = (args[1] as String?); + final String? arg_aString = args[1] as String?; assert( arg_aString != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoString was null, expected non-null String.', @@ -2503,14 +2503,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoUint8List was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoUint8List was null, expected non-null ProxyApiTestClass.', ); - final Uint8List? arg_aList = (args[1] as Uint8List?); + final Uint8List? arg_aList = args[1] as Uint8List?; assert( arg_aList != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoUint8List was null, expected non-null Uint8List.', @@ -2546,15 +2546,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoList was null, expected non-null ProxyApiTestClass.', ); - final List? arg_aList = (args[1] as List?) - ?.cast(); + final List? arg_aList = args[1] as List?; assert( arg_aList != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoList was null, expected non-null List.', @@ -2591,9 +2590,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiList was null, expected non-null ProxyApiTestClass.', @@ -2635,9 +2634,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoMap was null, expected non-null ProxyApiTestClass.', @@ -2680,9 +2679,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiMap was null, expected non-null ProxyApiTestClass.', @@ -2725,14 +2724,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoEnum was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoEnum was null, expected non-null ProxyApiTestClass.', ); - final ProxyApiTestEnum? arg_anEnum = (args[1] as ProxyApiTestEnum?); + final ProxyApiTestEnum? arg_anEnum = args[1] as ProxyApiTestEnum?; assert( arg_anEnum != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoEnum was null, expected non-null ProxyApiTestEnum.', @@ -2769,15 +2768,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApi was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApi was null, expected non-null ProxyApiTestClass.', ); final ProxyApiSuperClass? arg_aProxyApi = - (args[1] as ProxyApiSuperClass?); + args[1] as ProxyApiSuperClass?; assert( arg_aProxyApi != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApi was null, expected non-null ProxyApiSuperClass.', @@ -2813,14 +2812,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableBool was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableBool was null, expected non-null ProxyApiTestClass.', ); - final bool? arg_aBool = (args[1] as bool?); + final bool? arg_aBool = args[1] as bool?; try { final bool? output = (flutterEchoNullableBool ?? @@ -2852,14 +2851,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableInt was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableInt was null, expected non-null ProxyApiTestClass.', ); - final int? arg_anInt = (args[1] as int?); + final int? arg_anInt = args[1] as int?; try { final int? output = (flutterEchoNullableInt ?? @@ -2891,14 +2890,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableDouble was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableDouble was null, expected non-null ProxyApiTestClass.', ); - final double? arg_aDouble = (args[1] as double?); + final double? arg_aDouble = args[1] as double?; try { final double? output = (flutterEchoNullableDouble ?? @@ -2930,14 +2929,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableString was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableString was null, expected non-null ProxyApiTestClass.', ); - final String? arg_aString = (args[1] as String?); + final String? arg_aString = args[1] as String?; try { final String? output = (flutterEchoNullableString ?? @@ -2969,14 +2968,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableUint8List was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableUint8List was null, expected non-null ProxyApiTestClass.', ); - final Uint8List? arg_aList = (args[1] as Uint8List?); + final Uint8List? arg_aList = args[1] as Uint8List?; try { final Uint8List? output = (flutterEchoNullableUint8List ?? @@ -3008,15 +3007,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableList was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableList was null, expected non-null ProxyApiTestClass.', ); - final List? arg_aList = (args[1] as List?) - ?.cast(); + final List? arg_aList = args[1] as List?; try { final List? output = (flutterEchoNullableList ?? @@ -3048,9 +3046,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableMap was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableMap was null, expected non-null ProxyApiTestClass.', @@ -3088,14 +3086,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableEnum was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableEnum was null, expected non-null ProxyApiTestClass.', ); - final ProxyApiTestEnum? arg_anEnum = (args[1] as ProxyApiTestEnum?); + final ProxyApiTestEnum? arg_anEnum = args[1] as ProxyApiTestEnum?; try { final ProxyApiTestEnum? output = (flutterEchoNullableEnum ?? @@ -3127,15 +3125,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableProxyApi was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableProxyApi was null, expected non-null ProxyApiTestClass.', ); final ProxyApiSuperClass? arg_aProxyApi = - (args[1] as ProxyApiSuperClass?); + args[1] as ProxyApiSuperClass?; try { final ProxyApiSuperClass? output = (flutterEchoNullableProxyApi ?? @@ -3167,9 +3165,9 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoopAsync was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoopAsync was null, expected non-null ProxyApiTestClass.', @@ -3203,14 +3201,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoAsyncString was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiTestClass? arg_pigeon_instance = - (args[0] as ProxyApiTestClass?); + args[0] as ProxyApiTestClass?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoAsyncString was null, expected non-null ProxyApiTestClass.', ); - final String? arg_aString = (args[1] as String?); + final String? arg_aString = args[1] as String?; assert( arg_aString != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoAsyncString was null, expected non-null String.', @@ -3568,7 +3566,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as List).cast(); + return pigeonVar_replyValue as List; } /// Returns the passed list with ProxyApis, to test serialization and @@ -3878,7 +3876,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as List?)?.cast(); + return pigeonVar_replyValue as List?; } /// Returns the passed map, to test serialization and deserialization. @@ -4159,7 +4157,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as List).cast(); + return pigeonVar_replyValue as List; } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -4459,7 +4457,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as List?)?.cast(); + return pigeonVar_replyValue as List?; } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -4819,7 +4817,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channelName, isNullValid: false, )!; - return (pigeonVar_replyValue as List).cast(); + return pigeonVar_replyValue as List; } Future> callFlutterEchoProxyApiList( @@ -5097,7 +5095,7 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channelName, isNullValid: true, ); - return (pigeonVar_replyValue as List?)?.cast(); + return pigeonVar_replyValue as List?; } Future?> callFlutterEchoNullableMap( @@ -5365,8 +5363,8 @@ class ProxyApiSuperClass extends PigeonInternalProxyApiBaseClass { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiSuperClass.pigeon_newInstance was null.', ); - final List args = (message as List?)!; - final int? arg_pigeon_instanceIdentifier = (args[0] as int?); + final List args = message! as List; + final int? arg_pigeon_instanceIdentifier = args[0] as int?; assert( arg_pigeon_instanceIdentifier != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiSuperClass.pigeon_newInstance was null, expected non-null int.', @@ -5486,8 +5484,8 @@ class ProxyApiInterface extends PigeonInternalProxyApiBaseClass { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.pigeon_newInstance was null.', ); - final List args = (message as List?)!; - final int? arg_pigeon_instanceIdentifier = (args[0] as int?); + final List args = message! as List; + final int? arg_pigeon_instanceIdentifier = args[0] as int?; assert( arg_pigeon_instanceIdentifier != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.pigeon_newInstance was null, expected non-null int.', @@ -5528,9 +5526,9 @@ class ProxyApiInterface extends PigeonInternalProxyApiBaseClass { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.anInterfaceMethod was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final ProxyApiInterface? arg_pigeon_instance = - (args[0] as ProxyApiInterface?); + args[0] as ProxyApiInterface?; assert( arg_pigeon_instance != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.anInterfaceMethod was null, expected non-null ProxyApiInterface.', @@ -5647,8 +5645,8 @@ class ClassWithApiRequirement extends PigeonInternalProxyApiBaseClass { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ClassWithApiRequirement.pigeon_newInstance was null.', ); - final List args = (message as List?)!; - final int? arg_pigeon_instanceIdentifier = (args[0] as int?); + final List args = message! as List; + final int? arg_pigeon_instanceIdentifier = args[0] as int?; assert( arg_pigeon_instanceIdentifier != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ClassWithApiRequirement.pigeon_newInstance was null, expected non-null int.', diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart index c60370dc5b97..c05c82dac527 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart @@ -128,9 +128,9 @@ abstract class TestHostApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search was null.', ); - final List args = (message as List?)!; + final List args = message! as List; final MessageSearchRequest? arg_request = - (args[0] as MessageSearchRequest?); + args[0] as MessageSearchRequest?; assert( arg_request != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search was null, expected non-null MessageSearchRequest.', @@ -191,8 +191,8 @@ abstract class TestNestedApi { message != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageNestedApi.search was null.', ); - final List args = (message as List?)!; - final MessageNested? arg_nested = (args[0] as MessageNested?); + final List args = message! as List; + final MessageNested? arg_nested = args[0] as MessageNested?; assert( arg_nested != null, 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageNestedApi.search was null, expected non-null MessageNested.', From 318a5af0a40990579b668d38da5175d841c310f7 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Sun, 1 Mar 2026 20:45:13 -0800 Subject: [PATCH 2/8] no asserts --- .../example/app/lib/src/messages.g.dart | 4 - .../pigeon/lib/src/dart/dart_generator.dart | 58 +- .../lib/src/generated/core_tests.gen.dart | 429 ++------------ .../lib/src/generated/enum.gen.dart | 12 +- .../lib/src/generated/message.gen.dart | 14 +- .../lib/src/generated/multiple_arity.gen.dart | 18 +- .../src/generated/non_null_fields.gen.dart | 14 +- .../lib/src/generated/null_fields.gen.dart | 14 +- .../src/generated/nullable_returns.gen.dart | 8 - .../lib/src/generated/primitive.gen.dart | 114 +--- .../src/generated/proxy_api_tests.gen.dart | 557 +++++------------- .../test/test_message.gen.dart | 26 +- 12 files changed, 255 insertions(+), 1013 deletions(-) diff --git a/packages/pigeon/example/app/lib/src/messages.g.dart b/packages/pigeon/example/app/lib/src/messages.g.dart index d1c54f1e0afe..31ba5903ef3c 100644 --- a/packages/pigeon/example/app/lib/src/messages.g.dart +++ b/packages/pigeon/example/app/lib/src/messages.g.dart @@ -255,10 +255,6 @@ abstract class MessageFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod was null.', - ); final List args = message! as List; final String? arg_aString = args[0] as String?; try { diff --git a/packages/pigeon/lib/src/dart/dart_generator.dart b/packages/pigeon/lib/src/dart/dart_generator.dart index f26f44b0cf30..1e3fe5f421ff 100644 --- a/packages/pigeon/lib/src/dart/dart_generator.dart +++ b/packages/pigeon/lib/src/dart/dart_generator.dart @@ -321,10 +321,7 @@ class DartGenerator extends StructuredGenerator { if (field.type.typeArguments.isNotEmpty) { final String castCall = _makeGenericCastCall(field.type); if (castCall.isNotEmpty) { - final castCallPrefix = field.type.isNullable ? '?' : ''; - indent.add( - '($resultAt$nullAssert as $genericType)$castCallPrefix$castCall', - ); + indent.add('($resultAt$nullAssert as $genericType)$castCall'); } else { indent.add('($resultAt as $genericType)'); } @@ -1361,9 +1358,9 @@ _extractReplyValueOrThrow( indent.format('final Object $accessor = $extractCall!;'); } final String returnTypeName = _makeGenericTypeArguments(returnType); - final String genericCastCall = _makeGenericCastCall(returnType); + final String castCall = _makeGenericCastCall(returnType); - if (genericCastCall.isEmpty) { + if (castCall.isEmpty) { final castedAccessor = returnType.baseName == 'Object' ? accessor : '$accessor as $returnTypeName'; @@ -1372,10 +1369,7 @@ _extractReplyValueOrThrow( final nullablyTypedAccessor = returnType.baseName == 'Object' ? accessor : '($accessor as $returnTypeName)'; - final nullHandler = returnType.isNullable ? '?' : ''; - indent.format( - 'return $nullablyTypedAccessor$nullHandler$genericCastCall;', - ); + indent.format('return $nullablyTypedAccessor$castCall;'); } } @@ -1428,50 +1422,31 @@ _extractReplyValueOrThrow( ); indent.addScoped('{', '});', () { final String returnTypeString = addGenericTypes(returnType); - final isAsync = isAsynchronous; const emptyReturnStatement = 'return wrapResponse(empty: true);'; String call; if (parameters.isEmpty) { call = 'api.$name()'; } else { - indent.writeln('assert(message != null,'); - indent.writeln("'Argument for $channelName was null.');"); const argsArray = 'args'; indent.writeln( 'final List $argsArray = message! as List;', ); enumerate(parameters, (int count, NamedType arg) { final String argType = addGenericTypes(arg.type); - // TODO(srawlins): It seems at some point we can stop making this - // local variable unconditionally nullable, with the assert - // statement below it. Instead we can use the nullability of - // `arg.type`. - final String argTypeNullable = addGenericTypes( - arg.type.copyWithNullability(true), - ); final String argName = _getSafeArgumentName(count, arg); - final leftHandSide = 'final $argTypeNullable $argName'; + final leftHandSide = 'final $argType $argName'; + final nullAssert = arg.type.isNullable ? '' : '!'; + final argValue = '$argsArray[$count]$nullAssert'; final String castCall = _makeGenericCastCall(arg.type); if (castCall.isEmpty) { - indent.writeln( - '$leftHandSide = $argsArray[$count] as $argTypeNullable;', - ); + indent.writeln('$leftHandSide = $argValue as $argType;'); } else { final String genericArgType = _makeGenericTypeArguments( - arg.type.copyWithNullability(true), - ); - final valueAsArgType = '$argsArray[$count] as $genericArgType'; - // As `argTypeNullable` is unconditionally nullable, we must use - // `?.` to invoke `cast()`. - indent.writeln('$leftHandSide = ($valueAsArgType)?$castCall;'); - } - - if (!arg.type.isNullable) { - indent.writeln('assert($argName != null,'); - indent.writeln( - " 'Argument for $channelName was null, expected non-null $argType.');", + arg.type, ); + final valueAsArgType = '$argValue as $genericArgType'; + indent.writeln('$leftHandSide = ($valueAsArgType)$castCall;'); } }); final Iterable argNames = indexMap(parameters, ( @@ -1479,20 +1454,20 @@ _extractReplyValueOrThrow( Parameter field, ) { final String name = _getSafeArgumentName(index, field); - return '${field.isNamed ? '${field.name}: ' : ''}$name${field.type.isNullable ? '' : '!'}'; + return '${field.isNamed ? '${field.name}: ' : ''}$name'; }); call = onCreateApiCall(name, parameters, argNames); } indent.writeScoped('try {', '} ', () { if (returnType.isVoid) { - if (isAsync) { + if (isAsynchronous) { indent.writeln('await $call;'); } else { indent.writeln('$call;'); } indent.writeln(emptyReturnStatement); } else { - if (isAsync) { + if (isAsynchronous) { indent.writeln('final $returnTypeString output = await $call;'); } else { indent.writeln('final $returnTypeString output = $call;'); @@ -1553,7 +1528,7 @@ String _makeGenericTypeArguments(TypeDeclaration type) { } /// Returns a `.cast<>()` call for [type]. Returns an empty string if [type] has -/// no type arguments. +/// no type arguments. The call will begin with `?.` if [type] is nullable. String _makeGenericCastCall(TypeDeclaration type) { final List typeArguments = type.typeArguments; if (typeArguments.isEmpty) { @@ -1562,7 +1537,8 @@ String _makeGenericCastCall(TypeDeclaration type) { if (typeArguments.every((e) => e.baseName == 'Object' && e.isNullable)) { return ''; } - return '.cast<${_flattenTypeArguments(type.typeArguments)}>()'; + final nullAwareOperator = type.isNullable ? '?' : ''; + return '$nullAwareOperator.cast<${_flattenTypeArguments(type.typeArguments)}>()'; } /// Returns an argument name that can be used in a context where it is possible to collide. diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index d791a42f1d44..e5fbc554b196 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -4615,18 +4615,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes was null.', - ); final List args = message! as List; - final AllTypes? arg_everything = args[0] as AllTypes?; - assert( - arg_everything != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllTypes was null, expected non-null AllTypes.', - ); + final AllTypes arg_everything = args[0]! as AllTypes; try { - final AllTypes output = api.echoAllTypes(arg_everything!); + final AllTypes output = api.echoAllTypes(arg_everything); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -4648,10 +4640,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypes was null.', - ); final List args = message! as List; final AllNullableTypes? arg_everything = args[0] as AllNullableTypes?; try { @@ -4679,10 +4667,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypes was null.', - ); final List args = message! as List; final bool? arg_aNullableBool = args[0] as bool?; final int? arg_aNullableInt = args[1] as int?; @@ -4714,10 +4698,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAllNullableTypesWithoutRecursion was null.', - ); final List args = message! as List; final AllNullableTypesWithoutRecursion? arg_everything = args[0] as AllNullableTypesWithoutRecursion?; @@ -4745,10 +4725,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.sendMultipleNullableTypesWithoutRecursion was null.', - ); final List args = message! as List; final bool? arg_aNullableBool = args[0] as bool?; final int? arg_aNullableInt = args[1] as int?; @@ -4781,18 +4757,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool was null.', - ); final List args = message! as List; - final bool? arg_aBool = args[0] as bool?; - assert( - arg_aBool != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoBool was null, expected non-null bool.', - ); + final bool arg_aBool = args[0]! as bool; try { - final bool output = api.echoBool(arg_aBool!); + final bool output = api.echoBool(arg_aBool); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -4814,18 +4782,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt was null.', - ); final List args = message! as List; - final int? arg_anInt = args[0] as int?; - assert( - arg_anInt != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoInt was null, expected non-null int.', - ); + final int arg_anInt = args[0]! as int; try { - final int output = api.echoInt(arg_anInt!); + final int output = api.echoInt(arg_anInt); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -4847,18 +4807,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null.', - ); final List args = message! as List; - final double? arg_aDouble = args[0] as double?; - assert( - arg_aDouble != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoDouble was null, expected non-null double.', - ); + final double arg_aDouble = args[0]! as double; try { - final double output = api.echoDouble(arg_aDouble!); + final double output = api.echoDouble(arg_aDouble); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -4880,18 +4832,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null.', - ); final List args = message! as List; - final String? arg_aString = args[0] as String?; - assert( - arg_aString != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoString was null, expected non-null String.', - ); + final String arg_aString = args[0]! as String; try { - final String output = api.echoString(arg_aString!); + final String output = api.echoString(arg_aString); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -4913,18 +4857,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null.', - ); final List args = message! as List; - final Uint8List? arg_list = args[0] as Uint8List?; - assert( - arg_list != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoUint8List was null, expected non-null Uint8List.', - ); + final Uint8List arg_list = args[0]! as Uint8List; try { - final Uint8List output = api.echoUint8List(arg_list!); + final Uint8List output = api.echoUint8List(arg_list); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -4946,18 +4882,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null.', - ); final List args = message! as List; - final List? arg_list = args[0] as List?; - assert( - arg_list != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoList was null, expected non-null List.', - ); + final List arg_list = args[0]! as List; try { - final List output = api.echoList(arg_list!); + final List output = api.echoList(arg_list); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -4979,19 +4907,11 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null.', - ); final List args = message! as List; - final List? arg_enumList = (args[0] as List?) - ?.cast(); - assert( - arg_enumList != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumList was null, expected non-null List.', - ); + final List arg_enumList = (args[0]! as List) + .cast(); try { - final List output = api.echoEnumList(arg_enumList!); + final List output = api.echoEnumList(arg_enumList); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5013,20 +4933,12 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList was null.', - ); final List args = message! as List; - final List? arg_classList = - (args[0] as List?)?.cast(); - assert( - arg_classList != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassList was null, expected non-null List.', - ); + final List arg_classList = + (args[0]! as List).cast(); try { final List output = api.echoClassList( - arg_classList!, + arg_classList, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -5049,19 +4961,11 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList was null.', - ); final List args = message! as List; - final List? arg_enumList = (args[0] as List?) - ?.cast(); - assert( - arg_enumList != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumList was null, expected non-null List.', - ); + final List arg_enumList = (args[0]! as List) + .cast(); try { - final List output = api.echoNonNullEnumList(arg_enumList!); + final List output = api.echoNonNullEnumList(arg_enumList); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5083,20 +4987,12 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList was null.', - ); final List args = message! as List; - final List? arg_classList = - (args[0] as List?)?.cast(); - assert( - arg_classList != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassList was null, expected non-null List.', - ); + final List arg_classList = + (args[0]! as List).cast(); try { final List output = api.echoNonNullClassList( - arg_classList!, + arg_classList, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -5119,19 +5015,11 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null.', - ); final List args = message! as List; - final Map? arg_map = - args[0] as Map?; - assert( - arg_map != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoMap was null, expected non-null Map.', - ); + final Map arg_map = + args[0]! as Map; try { - final Map output = api.echoMap(arg_map!); + final Map output = api.echoMap(arg_map); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5153,20 +5041,12 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap was null.', - ); final List args = message! as List; - final Map? arg_stringMap = - (args[0] as Map?)?.cast(); - assert( - arg_stringMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoStringMap was null, expected non-null Map.', - ); + final Map arg_stringMap = + (args[0]! as Map).cast(); try { final Map output = api.echoStringMap( - arg_stringMap!, + arg_stringMap, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -5189,19 +5069,11 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap was null.', - ); final List args = message! as List; - final Map? arg_intMap = - (args[0] as Map?)?.cast(); - assert( - arg_intMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoIntMap was null, expected non-null Map.', - ); + final Map arg_intMap = (args[0]! as Map) + .cast(); try { - final Map output = api.echoIntMap(arg_intMap!); + final Map output = api.echoIntMap(arg_intMap); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5223,19 +5095,11 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap was null.', - ); final List args = message! as List; - final Map? arg_enumMap = - (args[0] as Map?)?.cast(); - assert( - arg_enumMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnumMap was null, expected non-null Map.', - ); + final Map arg_enumMap = + (args[0]! as Map).cast(); try { - final Map output = api.echoEnumMap(arg_enumMap!); + final Map output = api.echoEnumMap(arg_enumMap); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5257,21 +5121,13 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap was null.', - ); final List args = message! as List; - final Map? arg_classMap = - (args[0] as Map?) - ?.cast(); - assert( - arg_classMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoClassMap was null, expected non-null Map.', - ); + final Map arg_classMap = + (args[0]! as Map) + .cast(); try { final Map output = api.echoClassMap( - arg_classMap!, + arg_classMap, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -5294,20 +5150,12 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap was null.', - ); final List args = message! as List; - final Map? arg_stringMap = - (args[0] as Map?)?.cast(); - assert( - arg_stringMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullStringMap was null, expected non-null Map.', - ); + final Map arg_stringMap = + (args[0]! as Map).cast(); try { final Map output = api.echoNonNullStringMap( - arg_stringMap!, + arg_stringMap, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -5330,19 +5178,11 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap was null.', - ); final List args = message! as List; - final Map? arg_intMap = (args[0] as Map?) - ?.cast(); - assert( - arg_intMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullIntMap was null, expected non-null Map.', - ); + final Map arg_intMap = (args[0]! as Map) + .cast(); try { - final Map output = api.echoNonNullIntMap(arg_intMap!); + final Map output = api.echoNonNullIntMap(arg_intMap); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5364,20 +5204,12 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap was null.', - ); final List args = message! as List; - final Map? arg_enumMap = - (args[0] as Map?)?.cast(); - assert( - arg_enumMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullEnumMap was null, expected non-null Map.', - ); + final Map arg_enumMap = + (args[0]! as Map).cast(); try { final Map output = api.echoNonNullEnumMap( - arg_enumMap!, + arg_enumMap, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -5400,21 +5232,12 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap was null.', - ); final List args = message! as List; - final Map? arg_classMap = - (args[0] as Map?) - ?.cast(); - assert( - arg_classMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNonNullClassMap was null, expected non-null Map.', - ); + final Map arg_classMap = + (args[0]! as Map).cast(); try { final Map output = api.echoNonNullClassMap( - arg_classMap!, + arg_classMap, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -5437,18 +5260,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum was null.', - ); final List args = message! as List; - final AnEnum? arg_anEnum = args[0] as AnEnum?; - assert( - arg_anEnum != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoEnum was null, expected non-null AnEnum.', - ); + final AnEnum arg_anEnum = args[0]! as AnEnum; try { - final AnEnum output = api.echoEnum(arg_anEnum!); + final AnEnum output = api.echoEnum(arg_anEnum); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5470,18 +5285,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAnotherEnum was null.', - ); final List args = message! as List; - final AnotherEnum? arg_anotherEnum = args[0] as AnotherEnum?; - assert( - arg_anotherEnum != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAnotherEnum was null, expected non-null AnotherEnum.', - ); + final AnotherEnum arg_anotherEnum = args[0]! as AnotherEnum; try { - final AnotherEnum output = api.echoAnotherEnum(arg_anotherEnum!); + final AnotherEnum output = api.echoAnotherEnum(arg_anotherEnum); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5503,10 +5310,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableBool was null.', - ); final List args = message! as List; final bool? arg_aBool = args[0] as bool?; try { @@ -5532,10 +5335,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableInt was null.', - ); final List args = message! as List; final int? arg_anInt = args[0] as int?; try { @@ -5561,10 +5360,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableDouble was null.', - ); final List args = message! as List; final double? arg_aDouble = args[0] as double?; try { @@ -5590,10 +5385,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableString was null.', - ); final List args = message! as List; final String? arg_aString = args[0] as String?; try { @@ -5619,10 +5410,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableUint8List was null.', - ); final List args = message! as List; final Uint8List? arg_list = args[0] as Uint8List?; try { @@ -5648,10 +5435,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableList was null.', - ); final List args = message! as List; final List? arg_list = args[0] as List?; try { @@ -5677,10 +5460,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnumList was null.', - ); final List args = message! as List; final List? arg_enumList = (args[0] as List?) ?.cast(); @@ -5709,10 +5488,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableClassList was null.', - ); final List args = message! as List; final List? arg_classList = (args[0] as List?)?.cast(); @@ -5741,10 +5516,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumList was null.', - ); final List args = message! as List; final List? arg_enumList = (args[0] as List?) ?.cast(); @@ -5773,10 +5544,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassList was null.', - ); final List args = message! as List; final List? arg_classList = (args[0] as List?)?.cast(); @@ -5804,10 +5571,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableMap was null.', - ); final List args = message! as List; final Map? arg_map = args[0] as Map?; @@ -5834,10 +5597,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableStringMap was null.', - ); final List args = message! as List; final Map? arg_stringMap = (args[0] as Map?)?.cast(); @@ -5866,10 +5625,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableIntMap was null.', - ); final List args = message! as List; final Map? arg_intMap = (args[0] as Map?)?.cast(); @@ -5896,10 +5651,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnumMap was null.', - ); final List args = message! as List; final Map? arg_enumMap = (args[0] as Map?)?.cast(); @@ -5928,10 +5679,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableClassMap was null.', - ); final List args = message! as List; final Map? arg_classMap = (args[0] as Map?) @@ -5960,10 +5707,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullStringMap was null.', - ); final List args = message! as List; final Map? arg_stringMap = (args[0] as Map?)?.cast(); @@ -5991,10 +5734,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullIntMap was null.', - ); final List args = message! as List; final Map? arg_intMap = (args[0] as Map?) ?.cast(); @@ -6023,10 +5762,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullEnumMap was null.', - ); final List args = message! as List; final Map? arg_enumMap = (args[0] as Map?)?.cast(); @@ -6055,10 +5790,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableNonNullClassMap was null.', - ); final List args = message! as List; final Map? arg_classMap = (args[0] as Map?) @@ -6087,10 +5818,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoNullableEnum was null.', - ); final List args = message! as List; final AnEnum? arg_anEnum = args[0] as AnEnum?; try { @@ -6116,10 +5843,6 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAnotherNullableEnum was null.', - ); final List args = message! as List; final AnotherEnum? arg_anotherEnum = args[0] as AnotherEnum?; try { @@ -6170,18 +5893,10 @@ abstract class FlutterIntegrationCoreApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString was null.', - ); final List args = message! as List; - final String? arg_aString = args[0] as String?; - assert( - arg_aString != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterIntegrationCoreApi.echoAsyncString was null, expected non-null String.', - ); + final String arg_aString = args[0]! as String; try { - final String output = await api.echoAsyncString(arg_aString!); + final String output = await api.echoAsyncString(arg_aString); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -6317,18 +6032,10 @@ abstract class FlutterSmallApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList was null.', - ); final List args = message! as List; - final TestMessage? arg_msg = args[0] as TestMessage?; - assert( - arg_msg != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoWrappedList was null, expected non-null TestMessage.', - ); + final TestMessage arg_msg = args[0]! as TestMessage; try { - final TestMessage output = api.echoWrappedList(arg_msg!); + final TestMessage output = api.echoWrappedList(arg_msg); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -6350,18 +6057,10 @@ abstract class FlutterSmallApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString was null.', - ); final List args = message! as List; - final String? arg_aString = args[0] as String?; - assert( - arg_aString != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.FlutterSmallApi.echoString was null, expected non-null String.', - ); + final String arg_aString = args[0]! as String; try { - final String output = api.echoString(arg_aString!); + final String output = api.echoString(arg_aString); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart index 7a9f815336bd..37462d78212a 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart @@ -219,18 +219,10 @@ abstract class EnumApi2Flutter { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Flutter.echo was null.', - ); final List args = message! as List; - final DataWithEnum? arg_data = args[0] as DataWithEnum?; - assert( - arg_data != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.EnumApi2Flutter.echo was null, expected non-null DataWithEnum.', - ); + final DataWithEnum arg_data = args[0]! as DataWithEnum; try { - final DataWithEnum output = api.echo(arg_data!); + final DataWithEnum output = api.echo(arg_data); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart index 526ffcdfae28..77f0ce5e202a 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart @@ -387,19 +387,11 @@ abstract class MessageFlutterSearchApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageFlutterSearchApi.search was null.', - ); final List args = message! as List; - final MessageSearchRequest? arg_request = - args[0] as MessageSearchRequest?; - assert( - arg_request != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageFlutterSearchApi.search was null, expected non-null MessageSearchRequest.', - ); + final MessageSearchRequest arg_request = + args[0]! as MessageSearchRequest; try { - final MessageSearchReply output = api.search(arg_request!); + final MessageSearchReply output = api.search(arg_request); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart index e460708fbbc8..6881e8f88294 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart @@ -134,23 +134,11 @@ abstract class MultipleArityFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract was null.', - ); final List args = message! as List; - final int? arg_x = args[0] as int?; - assert( - arg_x != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract was null, expected non-null int.', - ); - final int? arg_y = args[1] as int?; - assert( - arg_y != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MultipleArityFlutterApi.subtract was null, expected non-null int.', - ); + final int arg_x = args[0]! as int; + final int arg_y = args[1]! as int; try { - final int output = api.subtract(arg_x!, arg_y!); + final int output = api.subtract(arg_x, arg_y); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart index cd8ba5aec002..ca8ef9e87eb8 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart @@ -308,19 +308,11 @@ abstract class NonNullFieldFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldFlutterApi.search was null.', - ); final List args = message! as List; - final NonNullFieldSearchRequest? arg_request = - args[0] as NonNullFieldSearchRequest?; - assert( - arg_request != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NonNullFieldFlutterApi.search was null, expected non-null NonNullFieldSearchRequest.', - ); + final NonNullFieldSearchRequest arg_request = + args[0]! as NonNullFieldSearchRequest; try { - final NonNullFieldSearchReply output = api.search(arg_request!); + final NonNullFieldSearchReply output = api.search(arg_request); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart index 5a8d60328dd1..0f1a596b957d 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart @@ -265,19 +265,11 @@ abstract class NullFieldsFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullFieldsFlutterApi.search was null.', - ); final List args = message! as List; - final NullFieldsSearchRequest? arg_request = - args[0] as NullFieldsSearchRequest?; - assert( - arg_request != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullFieldsFlutterApi.search was null, expected non-null NullFieldsSearchRequest.', - ); + final NullFieldsSearchRequest arg_request = + args[0]! as NullFieldsSearchRequest; try { - final NullFieldsSearchReply output = api.search(arg_request!); + final NullFieldsSearchReply output = api.search(arg_request); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart index 87580b565103..e8af8c7249a6 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart @@ -210,10 +210,6 @@ abstract class NullableArgFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullableArgFlutterApi.doit was null.', - ); final List args = message! as List; final int? arg_x = args[0] as int?; try { @@ -370,10 +366,6 @@ abstract class NullableCollectionArgFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.NullableCollectionArgFlutterApi.doit was null.', - ); final List args = message! as List; final List? arg_x = (args[0] as List?) ?.cast(); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart index 6fd6d723df02..7fd71cd8ac1a 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart @@ -319,18 +319,10 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt was null.', - ); final List args = message! as List; - final int? arg_value = args[0] as int?; - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt was null, expected non-null int.', - ); + final int arg_value = args[0]! as int; try { - final int output = api.anInt(arg_value!); + final int output = api.anInt(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -352,18 +344,10 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBool was null.', - ); final List args = message! as List; - final bool? arg_value = args[0] as bool?; - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBool was null, expected non-null bool.', - ); + final bool arg_value = args[0]! as bool; try { - final bool output = api.aBool(arg_value!); + final bool output = api.aBool(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -385,18 +369,10 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aString was null.', - ); final List args = message! as List; - final String? arg_value = args[0] as String?; - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aString was null, expected non-null String.', - ); + final String arg_value = args[0]! as String; try { - final String output = api.aString(arg_value!); + final String output = api.aString(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -418,18 +394,10 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aDouble was null.', - ); final List args = message! as List; - final double? arg_value = args[0] as double?; - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aDouble was null, expected non-null double.', - ); + final double arg_value = args[0]! as double; try { - final double output = api.aDouble(arg_value!); + final double output = api.aDouble(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -451,19 +419,11 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aMap was null.', - ); final List args = message! as List; - final Map? arg_value = - args[0] as Map?; - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aMap was null, expected non-null Map.', - ); + final Map arg_value = + args[0]! as Map; try { - final Map output = api.aMap(arg_value!); + final Map output = api.aMap(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -485,18 +445,10 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aList was null.', - ); final List args = message! as List; - final List? arg_value = args[0] as List?; - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aList was null, expected non-null List.', - ); + final List arg_value = args[0]! as List; try { - final List output = api.aList(arg_value!); + final List output = api.aList(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -518,18 +470,10 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt32List was null.', - ); final List args = message! as List; - final Int32List? arg_value = args[0] as Int32List?; - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.anInt32List was null, expected non-null Int32List.', - ); + final Int32List arg_value = args[0]! as Int32List; try { - final Int32List output = api.anInt32List(arg_value!); + final Int32List output = api.anInt32List(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -551,19 +495,11 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBoolList was null.', - ); final List args = message! as List; - final List? arg_value = (args[0] as List?) - ?.cast(); - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aBoolList was null, expected non-null List.', - ); + final List arg_value = (args[0]! as List) + .cast(); try { - final List output = api.aBoolList(arg_value!); + final List output = api.aBoolList(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -585,19 +521,11 @@ abstract class PrimitiveFlutterApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aStringIntMap was null.', - ); final List args = message! as List; - final Map? arg_value = - (args[0] as Map?)?.cast(); - assert( - arg_value != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PrimitiveFlutterApi.aStringIntMap was null, expected non-null Map.', - ); + final Map arg_value = + (args[0]! as Map).cast(); try { - final Map output = api.aStringIntMap(arg_value!); + final Map output = api.aStringIntMap(arg_value); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart index 0b6a81b373e6..86a7bb98f645 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart @@ -614,19 +614,11 @@ class _PigeonInternalInstanceManagerApi { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PigeonInternalInstanceManager.removeStrongReference was null.', - ); final List args = message! as List; - final int? arg_identifier = args[0] as int?; - assert( - arg_identifier != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.PigeonInternalInstanceManager.removeStrongReference was null, expected non-null int.', - ); + final int arg_identifier = args[0]! as int; try { (instanceManager ?? PigeonInstanceManager.instance).remove( - arg_identifier!, + arg_identifier, ); return wrapResponse(empty: true); } on PlatformException catch (e) { @@ -2216,20 +2208,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoop was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoop was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; try { - (flutterNoop ?? arg_pigeon_instance!.flutterNoop)?.call( - arg_pigeon_instance!, + (flutterNoop ?? arg_pigeon_instance.flutterNoop)?.call( + arg_pigeon_instance, ); return wrapResponse(empty: true); } on PlatformException catch (e) { @@ -2253,21 +2237,13 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowError was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowError was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; try { final Object? output = - (flutterThrowError ?? arg_pigeon_instance!.flutterThrowError) - ?.call(arg_pigeon_instance!); + (flutterThrowError ?? arg_pigeon_instance.flutterThrowError) + ?.call(arg_pigeon_instance); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2290,21 +2266,13 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowErrorFromVoid was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterThrowErrorFromVoid was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; try { (flutterThrowErrorFromVoid ?? - arg_pigeon_instance!.flutterThrowErrorFromVoid) - ?.call(arg_pigeon_instance!); + arg_pigeon_instance.flutterThrowErrorFromVoid) + ?.call(arg_pigeon_instance); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2327,27 +2295,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoBool was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoBool was null, expected non-null ProxyApiTestClass.', - ); - final bool? arg_aBool = args[1] as bool?; - assert( - arg_aBool != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoBool was null, expected non-null bool.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final bool arg_aBool = args[1]! as bool; try { final bool output = - (flutterEchoBool ?? arg_pigeon_instance!.flutterEchoBool).call( - arg_pigeon_instance!, - arg_aBool!, + (flutterEchoBool ?? arg_pigeon_instance.flutterEchoBool).call( + arg_pigeon_instance, + arg_aBool, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -2371,27 +2327,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoInt was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoInt was null, expected non-null ProxyApiTestClass.', - ); - final int? arg_anInt = args[1] as int?; - assert( - arg_anInt != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoInt was null, expected non-null int.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final int arg_anInt = args[1]! as int; try { final int output = - (flutterEchoInt ?? arg_pigeon_instance!.flutterEchoInt).call( - arg_pigeon_instance!, - arg_anInt!, + (flutterEchoInt ?? arg_pigeon_instance.flutterEchoInt).call( + arg_pigeon_instance, + arg_anInt, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -2415,26 +2359,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoDouble was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoDouble was null, expected non-null ProxyApiTestClass.', - ); - final double? arg_aDouble = args[1] as double?; - assert( - arg_aDouble != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoDouble was null, expected non-null double.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final double arg_aDouble = args[1]! as double; try { final double output = - (flutterEchoDouble ?? arg_pigeon_instance!.flutterEchoDouble) - .call(arg_pigeon_instance!, arg_aDouble!); + (flutterEchoDouble ?? arg_pigeon_instance.flutterEchoDouble) + .call(arg_pigeon_instance, arg_aDouble); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2457,26 +2389,14 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoString was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoString was null, expected non-null ProxyApiTestClass.', - ); - final String? arg_aString = args[1] as String?; - assert( - arg_aString != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoString was null, expected non-null String.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final String arg_aString = args[1]! as String; try { final String output = - (flutterEchoString ?? arg_pigeon_instance!.flutterEchoString) - .call(arg_pigeon_instance!, arg_aString!); + (flutterEchoString ?? arg_pigeon_instance.flutterEchoString) + .call(arg_pigeon_instance, arg_aString); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2499,27 +2419,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoUint8List was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoUint8List was null, expected non-null ProxyApiTestClass.', - ); - final Uint8List? arg_aList = args[1] as Uint8List?; - assert( - arg_aList != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoUint8List was null, expected non-null Uint8List.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final Uint8List arg_aList = args[1]! as Uint8List; try { final Uint8List output = (flutterEchoUint8List ?? - arg_pigeon_instance!.flutterEchoUint8List) - .call(arg_pigeon_instance!, arg_aList!); + arg_pigeon_instance.flutterEchoUint8List) + .call(arg_pigeon_instance, arg_aList); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2542,27 +2450,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoList was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoList was null, expected non-null ProxyApiTestClass.', - ); - final List? arg_aList = args[1] as List?; - assert( - arg_aList != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoList was null, expected non-null List.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final List arg_aList = args[1]! as List; try { final List output = - (flutterEchoList ?? arg_pigeon_instance!.flutterEchoList).call( - arg_pigeon_instance!, - arg_aList!, + (flutterEchoList ?? arg_pigeon_instance.flutterEchoList).call( + arg_pigeon_instance, + arg_aList, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -2586,28 +2482,16 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiList was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiList was null, expected non-null ProxyApiTestClass.', - ); - final List? arg_aList = - (args[1] as List?)?.cast(); - assert( - arg_aList != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiList was null, expected non-null List.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final List arg_aList = (args[1]! as List) + .cast(); try { final List output = (flutterEchoProxyApiList ?? - arg_pigeon_instance!.flutterEchoProxyApiList) - .call(arg_pigeon_instance!, arg_aList!); + arg_pigeon_instance.flutterEchoProxyApiList) + .call(arg_pigeon_instance, arg_aList); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2630,28 +2514,16 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoMap was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoMap was null, expected non-null ProxyApiTestClass.', - ); - final Map? arg_aMap = - (args[1] as Map?)?.cast(); - assert( - arg_aMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoMap was null, expected non-null Map.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final Map arg_aMap = + (args[1]! as Map).cast(); try { final Map output = - (flutterEchoMap ?? arg_pigeon_instance!.flutterEchoMap).call( - arg_pigeon_instance!, - arg_aMap!, + (flutterEchoMap ?? arg_pigeon_instance.flutterEchoMap).call( + arg_pigeon_instance, + arg_aMap, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -2675,29 +2547,17 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiMap was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiMap was null, expected non-null ProxyApiTestClass.', - ); - final Map? arg_aMap = - (args[1] as Map?) - ?.cast(); - assert( - arg_aMap != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApiMap was null, expected non-null Map.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final Map arg_aMap = + (args[1]! as Map) + .cast(); try { final Map output = (flutterEchoProxyApiMap ?? - arg_pigeon_instance!.flutterEchoProxyApiMap) - .call(arg_pigeon_instance!, arg_aMap!); + arg_pigeon_instance.flutterEchoProxyApiMap) + .call(arg_pigeon_instance, arg_aMap); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2720,27 +2580,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoEnum was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoEnum was null, expected non-null ProxyApiTestClass.', - ); - final ProxyApiTestEnum? arg_anEnum = args[1] as ProxyApiTestEnum?; - assert( - arg_anEnum != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoEnum was null, expected non-null ProxyApiTestEnum.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final ProxyApiTestEnum arg_anEnum = args[1]! as ProxyApiTestEnum; try { final ProxyApiTestEnum output = - (flutterEchoEnum ?? arg_pigeon_instance!.flutterEchoEnum).call( - arg_pigeon_instance!, - arg_anEnum!, + (flutterEchoEnum ?? arg_pigeon_instance.flutterEchoEnum).call( + arg_pigeon_instance, + arg_anEnum, ); return wrapResponse(result: output); } on PlatformException catch (e) { @@ -2764,28 +2612,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApi was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApi was null, expected non-null ProxyApiTestClass.', - ); - final ProxyApiSuperClass? arg_aProxyApi = - args[1] as ProxyApiSuperClass?; - assert( - arg_aProxyApi != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoProxyApi was null, expected non-null ProxyApiSuperClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final ProxyApiSuperClass arg_aProxyApi = + args[1]! as ProxyApiSuperClass; try { final ProxyApiSuperClass output = - (flutterEchoProxyApi ?? - arg_pigeon_instance!.flutterEchoProxyApi) - .call(arg_pigeon_instance!, arg_aProxyApi!); + (flutterEchoProxyApi ?? arg_pigeon_instance.flutterEchoProxyApi) + .call(arg_pigeon_instance, arg_aProxyApi); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2808,23 +2643,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableBool was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableBool was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final bool? arg_aBool = args[1] as bool?; try { final bool? output = (flutterEchoNullableBool ?? - arg_pigeon_instance!.flutterEchoNullableBool) - ?.call(arg_pigeon_instance!, arg_aBool); + arg_pigeon_instance.flutterEchoNullableBool) + ?.call(arg_pigeon_instance, arg_aBool); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2847,23 +2674,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableInt was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableInt was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final int? arg_anInt = args[1] as int?; try { final int? output = (flutterEchoNullableInt ?? - arg_pigeon_instance!.flutterEchoNullableInt) - ?.call(arg_pigeon_instance!, arg_anInt); + arg_pigeon_instance.flutterEchoNullableInt) + ?.call(arg_pigeon_instance, arg_anInt); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2886,23 +2705,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableDouble was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableDouble was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final double? arg_aDouble = args[1] as double?; try { final double? output = (flutterEchoNullableDouble ?? - arg_pigeon_instance!.flutterEchoNullableDouble) - ?.call(arg_pigeon_instance!, arg_aDouble); + arg_pigeon_instance.flutterEchoNullableDouble) + ?.call(arg_pigeon_instance, arg_aDouble); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2925,23 +2736,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableString was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableString was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final String? arg_aString = args[1] as String?; try { final String? output = (flutterEchoNullableString ?? - arg_pigeon_instance!.flutterEchoNullableString) - ?.call(arg_pigeon_instance!, arg_aString); + arg_pigeon_instance.flutterEchoNullableString) + ?.call(arg_pigeon_instance, arg_aString); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -2964,23 +2767,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableUint8List was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableUint8List was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final Uint8List? arg_aList = args[1] as Uint8List?; try { final Uint8List? output = (flutterEchoNullableUint8List ?? - arg_pigeon_instance!.flutterEchoNullableUint8List) - ?.call(arg_pigeon_instance!, arg_aList); + arg_pigeon_instance.flutterEchoNullableUint8List) + ?.call(arg_pigeon_instance, arg_aList); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -3003,23 +2798,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableList was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableList was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final List? arg_aList = args[1] as List?; try { final List? output = (flutterEchoNullableList ?? - arg_pigeon_instance!.flutterEchoNullableList) - ?.call(arg_pigeon_instance!, arg_aList); + arg_pigeon_instance.flutterEchoNullableList) + ?.call(arg_pigeon_instance, arg_aList); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -3042,24 +2829,16 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableMap was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableMap was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final Map? arg_aMap = (args[1] as Map?)?.cast(); try { final Map? output = (flutterEchoNullableMap ?? - arg_pigeon_instance!.flutterEchoNullableMap) - ?.call(arg_pigeon_instance!, arg_aMap); + arg_pigeon_instance.flutterEchoNullableMap) + ?.call(arg_pigeon_instance, arg_aMap); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -3082,23 +2861,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableEnum was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableEnum was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final ProxyApiTestEnum? arg_anEnum = args[1] as ProxyApiTestEnum?; try { final ProxyApiTestEnum? output = (flutterEchoNullableEnum ?? - arg_pigeon_instance!.flutterEchoNullableEnum) - ?.call(arg_pigeon_instance!, arg_anEnum); + arg_pigeon_instance.flutterEchoNullableEnum) + ?.call(arg_pigeon_instance, arg_anEnum); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -3121,24 +2892,16 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableProxyApi was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoNullableProxyApi was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; final ProxyApiSuperClass? arg_aProxyApi = args[1] as ProxyApiSuperClass?; try { final ProxyApiSuperClass? output = (flutterEchoNullableProxyApi ?? - arg_pigeon_instance!.flutterEchoNullableProxyApi) - ?.call(arg_pigeon_instance!, arg_aProxyApi); + arg_pigeon_instance.flutterEchoNullableProxyApi) + ?.call(arg_pigeon_instance, arg_aProxyApi); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -3161,20 +2924,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoopAsync was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterNoopAsync was null, expected non-null ProxyApiTestClass.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; try { - await (flutterNoopAsync ?? arg_pigeon_instance!.flutterNoopAsync) - ?.call(arg_pigeon_instance!); + await (flutterNoopAsync ?? arg_pigeon_instance.flutterNoopAsync) + ?.call(arg_pigeon_instance); return wrapResponse(empty: true); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -3197,27 +2952,15 @@ class ProxyApiTestClass extends ProxyApiSuperClass pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoAsyncString was null.', - ); final List args = message! as List; - final ProxyApiTestClass? arg_pigeon_instance = - args[0] as ProxyApiTestClass?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoAsyncString was null, expected non-null ProxyApiTestClass.', - ); - final String? arg_aString = args[1] as String?; - assert( - arg_aString != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiTestClass.flutterEchoAsyncString was null, expected non-null String.', - ); + final ProxyApiTestClass arg_pigeon_instance = + args[0]! as ProxyApiTestClass; + final String arg_aString = args[1]! as String; try { final String output = await (flutterEchoAsyncString ?? - arg_pigeon_instance!.flutterEchoAsyncString) - .call(arg_pigeon_instance!, arg_aString!); + arg_pigeon_instance.flutterEchoAsyncString) + .call(arg_pigeon_instance, arg_aString); return wrapResponse(result: output); } on PlatformException catch (e) { return wrapResponse(error: e); @@ -5359,16 +5102,8 @@ class ProxyApiSuperClass extends PigeonInternalProxyApiBaseClass { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiSuperClass.pigeon_newInstance was null.', - ); final List args = message! as List; - final int? arg_pigeon_instanceIdentifier = args[0] as int?; - assert( - arg_pigeon_instanceIdentifier != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiSuperClass.pigeon_newInstance was null, expected non-null int.', - ); + final int arg_pigeon_instanceIdentifier = args[0]! as int; try { (pigeon_instanceManager ?? PigeonInstanceManager.instance) .addHostCreatedInstance( @@ -5377,7 +5112,7 @@ class ProxyApiSuperClass extends PigeonInternalProxyApiBaseClass { pigeon_binaryMessenger: pigeon_binaryMessenger, pigeon_instanceManager: pigeon_instanceManager, ), - arg_pigeon_instanceIdentifier!, + arg_pigeon_instanceIdentifier, ); return wrapResponse(empty: true); } on PlatformException catch (e) { @@ -5480,16 +5215,8 @@ class ProxyApiInterface extends PigeonInternalProxyApiBaseClass { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.pigeon_newInstance was null.', - ); final List args = message! as List; - final int? arg_pigeon_instanceIdentifier = args[0] as int?; - assert( - arg_pigeon_instanceIdentifier != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.pigeon_newInstance was null, expected non-null int.', - ); + final int arg_pigeon_instanceIdentifier = args[0]! as int; try { (pigeon_instanceManager ?? PigeonInstanceManager.instance) .addHostCreatedInstance( @@ -5498,7 +5225,7 @@ class ProxyApiInterface extends PigeonInternalProxyApiBaseClass { pigeon_binaryMessenger: pigeon_binaryMessenger, pigeon_instanceManager: pigeon_instanceManager, ), - arg_pigeon_instanceIdentifier!, + arg_pigeon_instanceIdentifier, ); return wrapResponse(empty: true); } on PlatformException catch (e) { @@ -5522,20 +5249,12 @@ class ProxyApiInterface extends PigeonInternalProxyApiBaseClass { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.anInterfaceMethod was null.', - ); final List args = message! as List; - final ProxyApiInterface? arg_pigeon_instance = - args[0] as ProxyApiInterface?; - assert( - arg_pigeon_instance != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ProxyApiInterface.anInterfaceMethod was null, expected non-null ProxyApiInterface.', - ); + final ProxyApiInterface arg_pigeon_instance = + args[0]! as ProxyApiInterface; try { - (anInterfaceMethod ?? arg_pigeon_instance!.anInterfaceMethod)?.call( - arg_pigeon_instance!, + (anInterfaceMethod ?? arg_pigeon_instance.anInterfaceMethod)?.call( + arg_pigeon_instance, ); return wrapResponse(empty: true); } on PlatformException catch (e) { @@ -5641,16 +5360,8 @@ class ClassWithApiRequirement extends PigeonInternalProxyApiBaseClass { pigeonVar_channel.setMessageHandler(null); } else { pigeonVar_channel.setMessageHandler((Object? message) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ClassWithApiRequirement.pigeon_newInstance was null.', - ); final List args = message! as List; - final int? arg_pigeon_instanceIdentifier = args[0] as int?; - assert( - arg_pigeon_instanceIdentifier != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.ClassWithApiRequirement.pigeon_newInstance was null, expected non-null int.', - ); + final int arg_pigeon_instanceIdentifier = args[0]! as int; try { (pigeon_instanceManager ?? PigeonInstanceManager.instance) .addHostCreatedInstance( @@ -5659,7 +5370,7 @@ class ClassWithApiRequirement extends PigeonInternalProxyApiBaseClass { pigeon_binaryMessenger: pigeon_binaryMessenger, pigeon_instanceManager: pigeon_instanceManager, ), - arg_pigeon_instanceIdentifier!, + arg_pigeon_instanceIdentifier, ); return wrapResponse(empty: true); } on PlatformException catch (e) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart index c05c82dac527..443efc77823d 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/test/test_message.gen.dart @@ -124,19 +124,11 @@ abstract class TestHostApi { .setMockDecodedMessageHandler(pigeonVar_channel, ( Object? message, ) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search was null.', - ); final List args = message! as List; - final MessageSearchRequest? arg_request = - args[0] as MessageSearchRequest?; - assert( - arg_request != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search was null, expected non-null MessageSearchRequest.', - ); + final MessageSearchRequest arg_request = + args[0]! as MessageSearchRequest; try { - final MessageSearchReply output = api.search(arg_request!); + final MessageSearchReply output = api.search(arg_request); return [output]; } on PlatformException catch (e) { return wrapResponse(error: e); @@ -187,18 +179,10 @@ abstract class TestNestedApi { .setMockDecodedMessageHandler(pigeonVar_channel, ( Object? message, ) async { - assert( - message != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageNestedApi.search was null.', - ); final List args = message! as List; - final MessageNested? arg_nested = args[0] as MessageNested?; - assert( - arg_nested != null, - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageNestedApi.search was null, expected non-null MessageNested.', - ); + final MessageNested arg_nested = args[0]! as MessageNested; try { - final MessageSearchReply output = api.search(arg_nested!); + final MessageSearchReply output = api.search(arg_nested); return [output]; } on PlatformException catch (e) { return wrapResponse(error: e); From 3bff4876f3ccea7aed9a35f52ea97b9206f574a7 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Sun, 1 Mar 2026 21:12:27 -0800 Subject: [PATCH 3/8] simplify --- packages/pigeon/lib/src/dart/dart_generator.dart | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/pigeon/lib/src/dart/dart_generator.dart b/packages/pigeon/lib/src/dart/dart_generator.dart index 1e3fe5f421ff..b1146c1a6e48 100644 --- a/packages/pigeon/lib/src/dart/dart_generator.dart +++ b/packages/pigeon/lib/src/dart/dart_generator.dart @@ -329,7 +329,6 @@ class DartGenerator extends StructuredGenerator { final castString = field.type.baseName == 'Object' ? '' : ' as $genericType'; - indent.add('$resultAt$nullAssert$castString'); } } @@ -1360,16 +1359,13 @@ _extractReplyValueOrThrow( final String returnTypeName = _makeGenericTypeArguments(returnType); final String castCall = _makeGenericCastCall(returnType); + final castedAccessor = returnType.baseName == 'Object' + ? accessor + : '$accessor as $returnTypeName'; if (castCall.isEmpty) { - final castedAccessor = returnType.baseName == 'Object' - ? accessor - : '$accessor as $returnTypeName'; indent.format('return $castedAccessor;'); } else { - final nullablyTypedAccessor = returnType.baseName == 'Object' - ? accessor - : '($accessor as $returnTypeName)'; - indent.format('return $nullablyTypedAccessor$castCall;'); + indent.format('return ($castedAccessor)$castCall;'); } } From a54c8a7b5fbea341bc201eec2e854e806f5e8b07 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 2 Mar 2026 11:07:06 -0800 Subject: [PATCH 4/8] [pigeon] Improve casting nullability-handling in generated code There are a number of positions where we attempt to cast a nullable expression to a non-nullable type with something like the following `foo as List?)!`. This successfully performs the cast and avoids a lint rule which recommends not casting a nullable expression to a non-nullable type. But it can be done more simply. Here are some examples of the improved code: ```diff - data: (result[3] as Map?)!.cast(), + data: (result[3]! as Map).cast(), - final List args = (message as List?)!; + final List args = message! as List; - stringList: (result[13] as List?)!.cast(), + stringList: (result[13]! as List).cast(), ``` Since we are expecting these values to be non-null, we first null-assert them (`!`), and then cast the expression with `as`. There was previously a helper, `_makeGenericCastCall`, which generated the String representation for a call to `cast`, like `.cast()`, which was called in three places. This change consoldiates the surrounding code to those call sites into a new helper, `_castValue`, which instead returns the complete String of casting a value to a type, possibly null-asserting the value and possibly calling `.cast()`. Combining all of the casting code into one function also allows us to avoid unnecessary parentheses: ```diff - final String? arg_aString = (args[0] as String?); + final String? arg_aString = args[0] as String?; ``` Improving the nullability-handling allows us to remove the `_addGenericTypes` helper, and rename the `addGenericTypesNullable` to just `addGenericTypes`, since the helper should always print an appropriate nullability suffix. One prominent change made to the generated code is the removal of "assert foo is not null" statements. These are redundant with the null-asserts (`!`), although they _might_ offer more information in the assertion message, though I honestly don't think so. The exception thrown by `!` has the relevant information in the stack trace. --- .../example/app/lib/src/messages.g.dart | 18 +- packages/pigeon/lib/src/ast.dart | 12 - .../pigeon/lib/src/dart/dart_generator.dart | 81 +--- .../lib/src/generated/core_tests.gen.dart | 458 +++++++++--------- .../lib/src/generated/enum.gen.dart | 6 +- .../generated/event_channel_tests.gen.dart | 4 +- .../src/generated/flutter_unittests.gen.dart | 24 +- .../lib/src/generated/message.gen.dart | 12 +- .../lib/src/generated/multiple_arity.gen.dart | 6 +- .../src/generated/non_null_fields.gen.dart | 6 +- .../lib/src/generated/null_fields.gen.dart | 6 +- .../src/generated/nullable_returns.gen.dart | 12 +- .../lib/src/generated/primitive.gen.dart | 54 +-- .../src/generated/proxy_api_tests.gen.dart | 204 ++++---- 14 files changed, 430 insertions(+), 473 deletions(-) diff --git a/packages/pigeon/example/app/lib/src/messages.g.dart b/packages/pigeon/example/app/lib/src/messages.g.dart index 31ba5903ef3c..ec73e6eac7cd 100644 --- a/packages/pigeon/example/app/lib/src/messages.g.dart +++ b/packages/pigeon/example/app/lib/src/messages.g.dart @@ -181,12 +181,12 @@ class ExampleHostApi { final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } Future add(int a, int b) async { @@ -202,12 +202,12 @@ class ExampleHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } Future sendMessage(MessageData message) async { @@ -223,12 +223,12 @@ class ExampleHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } } diff --git a/packages/pigeon/lib/src/ast.dart b/packages/pigeon/lib/src/ast.dart index 929af9109285..9c48eac0d0fc 100644 --- a/packages/pigeon/lib/src/ast.dart +++ b/packages/pigeon/lib/src/ast.dart @@ -600,18 +600,6 @@ class TypeDeclaration { ); } - /// Returns a new [TypeDeclaration] with [nullable] as the [isNullable] value. - TypeDeclaration copyWithNullability(bool nullable) { - return TypeDeclaration( - baseName: baseName, - isNullable: nullable, - typeArguments: typeArguments, - associatedClass: associatedClass, - associatedEnum: associatedEnum, - associatedProxyApi: associatedProxyApi, - ); - } - @override String toString() { final typeArgumentsStr = typeArguments.isEmpty diff --git a/packages/pigeon/lib/src/dart/dart_generator.dart b/packages/pigeon/lib/src/dart/dart_generator.dart index b1146c1a6e48..ba7c5158592b 100644 --- a/packages/pigeon/lib/src/dart/dart_generator.dart +++ b/packages/pigeon/lib/src/dart/dart_generator.dart @@ -314,25 +314,6 @@ class DartGenerator extends StructuredGenerator { Class classDefinition, { required String dartPackageName, }) { - void writeValueDecode(NamedType field, int index) { - final resultAt = 'result[$index]'; - final String genericType = _makeGenericTypeArguments(field.type); - final nullAssert = field.type.isNullable ? '' : '!'; - if (field.type.typeArguments.isNotEmpty) { - final String castCall = _makeGenericCastCall(field.type); - if (castCall.isNotEmpty) { - indent.add('($resultAt$nullAssert as $genericType)$castCall'); - } else { - indent.add('($resultAt as $genericType)'); - } - } else { - final castString = field.type.baseName == 'Object' - ? '' - : ' as $genericType'; - indent.add('$resultAt$nullAssert$castString'); - } - } - indent.write('static ${classDefinition.name} decode(Object result) '); indent.addScoped('{', '}', () { indent.writeln('result as List;'); @@ -343,7 +324,7 @@ class DartGenerator extends StructuredGenerator { final NamedType field, ) { indent.write('${field.name}: '); - writeValueDecode(field, index); + indent.add(_castValue('result[$index]', field.type)); indent.addln(','); }); }); @@ -1351,22 +1332,8 @@ _extractReplyValueOrThrow( indent.format('$extractCall;'); } else { const accessor = '${varNamePrefix}replyValue'; - if (returnType.isNullable) { - indent.format('final Object? $accessor = $extractCall;'); - } else { - indent.format('final Object $accessor = $extractCall!;'); - } - final String returnTypeName = _makeGenericTypeArguments(returnType); - final String castCall = _makeGenericCastCall(returnType); - - final castedAccessor = returnType.baseName == 'Object' - ? accessor - : '$accessor as $returnTypeName'; - if (castCall.isEmpty) { - indent.format('return $castedAccessor;'); - } else { - indent.format('return ($castedAccessor)$castCall;'); - } + indent.format('final Object? $accessor = $extractCall;'); + indent.format('return ${_castValue(accessor, returnType)};'); } if (!insideAsyncMethod) { @@ -1430,20 +1397,10 @@ _extractReplyValueOrThrow( enumerate(parameters, (int count, NamedType arg) { final String argType = addGenericTypes(arg.type); final String argName = _getSafeArgumentName(count, arg); - final leftHandSide = 'final $argType $argName'; - final nullAssert = arg.type.isNullable ? '' : '!'; - final argValue = '$argsArray[$count]$nullAssert'; - final String castCall = _makeGenericCastCall(arg.type); - - if (castCall.isEmpty) { - indent.writeln('$leftHandSide = $argValue as $argType;'); - } else { - final String genericArgType = _makeGenericTypeArguments( - arg.type, - ); - final valueAsArgType = '$argValue as $genericArgType'; - indent.writeln('$leftHandSide = ($valueAsArgType)$castCall;'); - } + final argValue = '$argsArray[$count]'; + indent.writeln( + 'final $argType $argName = ${_castValue(argValue, arg.type)};', + ); }); final Iterable argNames = indexMap(parameters, ( int index, @@ -1523,18 +1480,30 @@ String _makeGenericTypeArguments(TypeDeclaration type) { return '$withTypeArguments${type.isNullable ? '?' : ''}'; } -/// Returns a `.cast<>()` call for [type]. Returns an empty string if [type] has -/// no type arguments. The call will begin with `?.` if [type] is nullable. -String _makeGenericCastCall(TypeDeclaration type) { +/// Casts a value to the expected type, considering nullability, and generic +/// types. +String _castValue(String value, TypeDeclaration type) { + final String typeWithTypeArgs = _makeGenericTypeArguments(type); + final nullAssert = type.isNullable ? '' : '!'; + value = '$value$nullAssert'; + if (type.typeArguments.isEmpty && type.baseName == 'Object') { + return value; + } + + final valueWithTypeCast = '$value as $typeWithTypeArgs'; + final List typeArguments = type.typeArguments; if (typeArguments.isEmpty) { - return ''; + return valueWithTypeCast; } if (typeArguments.every((e) => e.baseName == 'Object' && e.isNullable)) { - return ''; + return valueWithTypeCast; } + final nullAwareOperator = type.isNullable ? '?' : ''; - return '$nullAwareOperator.cast<${_flattenTypeArguments(type.typeArguments)}>()'; + final castCall = + '$nullAwareOperator.cast<${_flattenTypeArguments(typeArguments)}>()'; + return '($valueWithTypeCast)$castCall'; } /// Returns an argument name that can be used in a context where it is possible to collide. diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index e5fbc554b196..b28f31a9e483 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -447,7 +447,7 @@ class AllNullableTypes { doubleList: (result[16] as List?)?.cast(), boolList: (result[17] as List?)?.cast(), enumList: (result[18] as List?)?.cast(), - objectList: (result[19] as List?), + objectList: result[19] as List?, listList: (result[20] as List?)?.cast?>(), mapList: (result[21] as List?)?.cast?>(), recursiveClassList: (result[22] as List?) @@ -457,7 +457,7 @@ class AllNullableTypes { ?.cast(), intMap: (result[25] as Map?)?.cast(), enumMap: (result[26] as Map?)?.cast(), - objectMap: (result[27] as Map?), + objectMap: result[27] as Map?, listMap: (result[28] as Map?) ?.cast?>(), mapMap: (result[29] as Map?) @@ -633,7 +633,7 @@ class AllNullableTypesWithoutRecursion { doubleList: (result[15] as List?)?.cast(), boolList: (result[16] as List?)?.cast(), enumList: (result[17] as List?)?.cast(), - objectList: (result[18] as List?), + objectList: result[18] as List?, listList: (result[19] as List?)?.cast?>(), mapList: (result[20] as List?)?.cast?>(), map: result[21] as Map?, @@ -641,7 +641,7 @@ class AllNullableTypesWithoutRecursion { ?.cast(), intMap: (result[23] as Map?)?.cast(), enumMap: (result[24] as Map?)?.cast(), - objectMap: (result[25] as Map?), + objectMap: result[25] as Map?, listMap: (result[26] as Map?) ?.cast?>(), mapMap: (result[27] as Map?) @@ -898,12 +898,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllTypes; + ); + return pigeonVar_replyValue! as AllTypes; } /// Returns an error, to test error handling. @@ -979,12 +979,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } /// Returns passed in double. @@ -1001,12 +1001,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } /// Returns the passed in boolean. @@ -1023,12 +1023,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } /// Returns the passed in string. @@ -1045,12 +1045,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } /// Returns the passed in Uint8List. @@ -1067,12 +1067,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Uint8List; + ); + return pigeonVar_replyValue! as Uint8List; } /// Returns the passed in generic Object. @@ -1089,12 +1089,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue; + ); + return pigeonVar_replyValue!; } /// Returns the passed list, to test serialization and deserialization. @@ -1111,12 +1111,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as List; + ); + return pigeonVar_replyValue! as List; } /// Returns the passed list, to test serialization and deserialization. @@ -1133,12 +1133,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } /// Returns the passed list, to test serialization and deserialization. @@ -1157,12 +1157,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } /// Returns the passed list, to test serialization and deserialization. @@ -1179,12 +1179,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } /// Returns the passed list, to test serialization and deserialization. @@ -1203,12 +1203,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } /// Returns the passed map, to test serialization and deserialization. @@ -1225,12 +1225,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Map; + ); + return pigeonVar_replyValue! as Map; } /// Returns the passed map, to test serialization and deserialization. @@ -1249,12 +1249,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -1272,12 +1272,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map).cast(); + ); + return (pigeonVar_replyValue! as Map).cast(); } /// Returns the passed map, to test serialization and deserialization. @@ -1296,12 +1296,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -1321,12 +1321,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -1346,12 +1346,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -1369,12 +1369,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map).cast(); + ); + return (pigeonVar_replyValue! as Map).cast(); } /// Returns the passed map, to test serialization and deserialization. @@ -1393,12 +1393,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -1418,12 +1418,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -1441,12 +1441,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllClassesWrapper; + ); + return pigeonVar_replyValue! as AllClassesWrapper; } /// Returns the passed enum to test serialization and deserialization. @@ -1463,12 +1463,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AnEnum; + ); + return pigeonVar_replyValue! as AnEnum; } /// Returns the passed enum to test serialization and deserialization. @@ -1485,12 +1485,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AnotherEnum; + ); + return pigeonVar_replyValue! as AnotherEnum; } /// Returns the default string. @@ -1507,12 +1507,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } /// Returns passed in double. @@ -1529,12 +1529,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } /// Returns passed in int. @@ -1551,12 +1551,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } /// Returns the passed object, to test serialization and deserialization. @@ -1648,12 +1648,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllClassesWrapper; + ); + return pigeonVar_replyValue! as AllClassesWrapper; } /// Returns passed in arguments of multiple types. @@ -1674,12 +1674,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllNullableTypes; + ); + return pigeonVar_replyValue! as AllNullableTypes; } /// Returns passed in arguments of multiple types. @@ -1701,12 +1701,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllNullableTypesWithoutRecursion; + ); + return pigeonVar_replyValue! as AllNullableTypesWithoutRecursion; } /// Returns passed in int. @@ -2299,12 +2299,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } /// Returns passed in double asynchronously. @@ -2321,12 +2321,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } /// Returns the passed in boolean asynchronously. @@ -2343,12 +2343,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } /// Returns the passed string asynchronously. @@ -2365,12 +2365,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } /// Returns the passed in Uint8List asynchronously. @@ -2387,12 +2387,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Uint8List; + ); + return pigeonVar_replyValue! as Uint8List; } /// Returns the passed in generic Object asynchronously. @@ -2409,12 +2409,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue; + ); + return pigeonVar_replyValue!; } /// Returns the passed list, to test asynchronous serialization and deserialization. @@ -2431,12 +2431,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as List; + ); + return pigeonVar_replyValue! as List; } /// Returns the passed list, to test asynchronous serialization and deserialization. @@ -2453,12 +2453,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } /// Returns the passed list, to test asynchronous serialization and deserialization. @@ -2477,12 +2477,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -2499,12 +2499,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Map; + ); + return pigeonVar_replyValue! as Map; } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -2523,12 +2523,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -2546,12 +2546,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map).cast(); + ); + return (pigeonVar_replyValue! as Map).cast(); } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -2570,12 +2570,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -2595,12 +2595,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -2618,12 +2618,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AnEnum; + ); + return pigeonVar_replyValue! as AnEnum; } /// Returns the passed enum, to test asynchronous serialization and deserialization. @@ -2640,12 +2640,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AnotherEnum; + ); + return pigeonVar_replyValue! as AnotherEnum; } /// Responds with an error from an async function returning a value. @@ -2721,12 +2721,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllTypes; + ); + return pigeonVar_replyValue! as AllTypes; } /// Returns the passed object, to test serialization and deserialization. @@ -3162,12 +3162,12 @@ class HostIntegrationCoreApi { final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } /// Returns true if the handler is run on a non-main thread, which should be @@ -3183,12 +3183,12 @@ class HostIntegrationCoreApi { final Future pigeonVar_sendFuture = pigeonVar_channel.send(null); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } Future callFlutterNoop() async { @@ -3259,12 +3259,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllTypes; + ); + return pigeonVar_replyValue! as AllTypes; } Future callFlutterEchoAllNullableTypes( @@ -3307,12 +3307,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllNullableTypes; + ); + return pigeonVar_replyValue! as AllNullableTypes; } Future @@ -3357,12 +3357,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AllNullableTypesWithoutRecursion; + ); + return pigeonVar_replyValue! as AllNullableTypesWithoutRecursion; } Future callFlutterEchoBool(bool aBool) async { @@ -3378,12 +3378,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } Future callFlutterEchoInt(int anInt) async { @@ -3399,12 +3399,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } Future callFlutterEchoDouble(double aDouble) async { @@ -3420,12 +3420,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } Future callFlutterEchoString(String aString) async { @@ -3441,12 +3441,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } Future callFlutterEchoUint8List(Uint8List list) async { @@ -3462,12 +3462,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Uint8List; + ); + return pigeonVar_replyValue! as Uint8List; } Future> callFlutterEchoList(List list) async { @@ -3483,12 +3483,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as List; + ); + return pigeonVar_replyValue! as List; } Future> callFlutterEchoEnumList(List enumList) async { @@ -3504,12 +3504,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } Future> callFlutterEchoClassList( @@ -3527,12 +3527,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } Future> callFlutterEchoNonNullEnumList( @@ -3550,12 +3550,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } Future> callFlutterEchoNonNullClassList( @@ -3573,12 +3573,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } Future> callFlutterEchoMap( @@ -3596,12 +3596,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Map; + ); + return pigeonVar_replyValue! as Map; } Future> callFlutterEchoStringMap( @@ -3619,12 +3619,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3641,12 +3641,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map).cast(); + ); + return (pigeonVar_replyValue! as Map).cast(); } Future> callFlutterEchoEnumMap( @@ -3664,12 +3664,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3688,12 +3688,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3712,12 +3712,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3736,12 +3736,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map).cast(); + ); + return (pigeonVar_replyValue! as Map).cast(); } Future> callFlutterEchoNonNullEnumMap( @@ -3759,12 +3759,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3783,12 +3783,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3805,12 +3805,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AnEnum; + ); + return pigeonVar_replyValue! as AnEnum; } Future callFlutterEchoAnotherEnum( @@ -3828,12 +3828,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as AnotherEnum; + ); + return pigeonVar_replyValue! as AnotherEnum; } Future callFlutterEchoNullableBool(bool? aBool) async { @@ -4326,12 +4326,12 @@ class HostIntegrationCoreApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } } @@ -5979,12 +5979,12 @@ class HostSmallApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } Future voidVoid() async { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart index 37462d78212a..d3a9702e0384 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart @@ -185,12 +185,12 @@ class EnumApi2Host { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as DataWithEnum; + ); + return pigeonVar_replyValue! as DataWithEnum; } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart index db3005f7b19e..2e73d4584d38 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart @@ -194,7 +194,7 @@ class EventAllNullableTypes { doubleList: (result[16] as List?)?.cast(), boolList: (result[17] as List?)?.cast(), enumList: (result[18] as List?)?.cast(), - objectList: (result[19] as List?), + objectList: result[19] as List?, listList: (result[20] as List?)?.cast?>(), mapList: (result[21] as List?)?.cast?>(), recursiveClassList: (result[22] as List?) @@ -205,7 +205,7 @@ class EventAllNullableTypes { intMap: (result[25] as Map?)?.cast(), enumMap: (result[26] as Map?) ?.cast(), - objectMap: (result[27] as Map?), + objectMap: result[27] as Map?, listMap: (result[28] as Map?) ?.cast?>(), mapMap: (result[29] as Map?) diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart index 0c470ba7e2f7..5c98a6906222 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart @@ -269,12 +269,12 @@ class Api { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as FlutterSearchReply; + ); + return pigeonVar_replyValue! as FlutterSearchReply; } Future doSearches(FlutterSearchRequests request) async { @@ -290,12 +290,12 @@ class Api { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as FlutterSearchReplies; + ); + return pigeonVar_replyValue! as FlutterSearchReplies; } Future echo(FlutterSearchRequests requests) async { @@ -311,12 +311,12 @@ class Api { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as FlutterSearchRequests; + ); + return pigeonVar_replyValue! as FlutterSearchRequests; } Future anInt(int value) async { @@ -332,11 +332,11 @@ class Api { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart index 77f0ce5e202a..aedcab27322b 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart @@ -310,12 +310,12 @@ class MessageApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as MessageSearchReply; + ); + return pigeonVar_replyValue! as MessageSearchReply; } } @@ -353,12 +353,12 @@ class MessageNestedApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as MessageSearchReply; + ); + return pigeonVar_replyValue! as MessageSearchReply; } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart index 6881e8f88294..0d0a11b311fc 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart @@ -102,12 +102,12 @@ class MultipleArityHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart index ca8ef9e87eb8..19f45b9c3134 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart @@ -276,12 +276,12 @@ class NonNullFieldHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as NonNullFieldSearchReply; + ); + return pigeonVar_replyValue! as NonNullFieldSearchReply; } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart index 0f1a596b957d..2bd62e30f1f1 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart @@ -233,12 +233,12 @@ class NullFieldsHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as NullFieldsSearchReply; + ); + return pigeonVar_replyValue! as NullFieldsSearchReply; } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart index e8af8c7249a6..221585455b33 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart @@ -178,12 +178,12 @@ class NullableArgHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } } @@ -334,12 +334,12 @@ class NullableCollectionArgHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart index 7fd71cd8ac1a..a207a96c1141 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart @@ -102,12 +102,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } Future aBool(bool value) async { @@ -123,12 +123,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } Future aString(String value) async { @@ -144,12 +144,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } Future aDouble(double value) async { @@ -165,12 +165,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } Future> aMap(Map value) async { @@ -186,12 +186,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Map; + ); + return pigeonVar_replyValue! as Map; } Future> aList(List value) async { @@ -207,12 +207,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as List; + ); + return pigeonVar_replyValue! as List; } Future anInt32List(Int32List value) async { @@ -228,12 +228,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Int32List; + ); + return pigeonVar_replyValue! as Int32List; } Future> aBoolList(List value) async { @@ -249,12 +249,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } Future> aStringIntMap(Map value) async { @@ -270,12 +270,12 @@ class PrimitiveHostApi { ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } } diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart index 86a7bb98f645..cb9b70e6d8de 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart @@ -3154,12 +3154,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } /// Returns passed in double. @@ -3179,12 +3179,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } /// Returns the passed in boolean. @@ -3204,12 +3204,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } /// Returns the passed in string. @@ -3229,12 +3229,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } /// Returns the passed in Uint8List. @@ -3254,12 +3254,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Uint8List; + ); + return pigeonVar_replyValue! as Uint8List; } /// Returns the passed in generic Object. @@ -3279,12 +3279,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue; + ); + return pigeonVar_replyValue!; } /// Returns the passed list, to test serialization and deserialization. @@ -3304,12 +3304,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as List; + ); + return pigeonVar_replyValue! as List; } /// Returns the passed list with ProxyApis, to test serialization and @@ -3332,12 +3332,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } /// Returns the passed map, to test serialization and deserialization. @@ -3357,12 +3357,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3386,12 +3386,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3412,12 +3412,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as ProxyApiTestEnum; + ); + return pigeonVar_replyValue! as ProxyApiTestEnum; } /// Returns the passed ProxyApi to test serialization and deserialization. @@ -3437,12 +3437,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as ProxyApiSuperClass; + ); + return pigeonVar_replyValue! as ProxyApiSuperClass; } /// Returns passed in int. @@ -3745,12 +3745,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } /// Returns passed in double asynchronously. @@ -3770,12 +3770,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } /// Returns the passed in boolean asynchronously. @@ -3795,12 +3795,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } /// Returns the passed string asynchronously. @@ -3820,12 +3820,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } /// Returns the passed in Uint8List asynchronously. @@ -3845,12 +3845,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Uint8List; + ); + return pigeonVar_replyValue! as Uint8List; } /// Returns the passed in generic Object asynchronously. @@ -3870,12 +3870,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue; + ); + return pigeonVar_replyValue!; } /// Returns the passed list, to test asynchronous serialization and deserialization. @@ -3895,12 +3895,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as List; + ); + return pigeonVar_replyValue! as List; } /// Returns the passed map, to test asynchronous serialization and deserialization. @@ -3920,12 +3920,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -3946,12 +3946,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as ProxyApiTestEnum; + ); + return pigeonVar_replyValue! as ProxyApiTestEnum; } /// Responds with an error from an async function returning a value. @@ -4312,12 +4312,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } static Future staticAsyncNoop({ @@ -4435,12 +4435,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as bool; + ); + return pigeonVar_replyValue! as bool; } Future callFlutterEchoInt(int anInt) async { @@ -4459,12 +4459,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as int; + ); + return pigeonVar_replyValue! as int; } Future callFlutterEchoDouble(double aDouble) async { @@ -4483,12 +4483,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as double; + ); + return pigeonVar_replyValue! as double; } Future callFlutterEchoString(String aString) async { @@ -4507,12 +4507,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } Future callFlutterEchoUint8List(Uint8List aUint8List) async { @@ -4531,12 +4531,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as Uint8List; + ); + return pigeonVar_replyValue! as Uint8List; } Future> callFlutterEchoList(List aList) async { @@ -4555,12 +4555,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as List; + ); + return pigeonVar_replyValue! as List; } Future> callFlutterEchoProxyApiList( @@ -4581,12 +4581,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as List).cast(); + ); + return (pigeonVar_replyValue! as List).cast(); } Future> callFlutterEchoMap( @@ -4607,12 +4607,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -4634,12 +4634,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return (pigeonVar_replyValue as Map) + ); + return (pigeonVar_replyValue! as Map) .cast(); } @@ -4659,12 +4659,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as ProxyApiTestEnum; + ); + return pigeonVar_replyValue! as ProxyApiTestEnum; } Future callFlutterEchoProxyApi( @@ -4685,12 +4685,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as ProxyApiSuperClass; + ); + return pigeonVar_replyValue! as ProxyApiSuperClass; } Future callFlutterEchoNullableBool(bool? aBool) async { @@ -4959,12 +4959,12 @@ class ProxyApiTestClass extends ProxyApiSuperClass ); final pigeonVar_replyList = await pigeonVar_sendFuture as List?; - final Object pigeonVar_replyValue = _extractReplyValueOrThrow( + final Object? pigeonVar_replyValue = _extractReplyValueOrThrow( pigeonVar_replyList, pigeonVar_channelName, isNullValid: false, - )!; - return pigeonVar_replyValue as String; + ); + return pigeonVar_replyValue! as String; } @override From f7014f0be28c36db4a7e7c8019267d56ec74c3b6 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 2 Mar 2026 13:42:57 -0800 Subject: [PATCH 5/8] changelog --- packages/pigeon/CHANGELOG.md | 4 ++++ packages/pigeon/lib/src/generator_tools.dart | 2 +- packages/pigeon/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 27ebd2090661..b772693a3b54 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,7 @@ +## 26.1.11 + +* [dart] Improves nullability-handling in generated code. + ## 26.1.10 * Dramatically reduces the number of File write operations sent to the operating diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart index 406cf94f1556..f60aef42c071 100644 --- a/packages/pigeon/lib/src/generator_tools.dart +++ b/packages/pigeon/lib/src/generator_tools.dart @@ -15,7 +15,7 @@ import 'generator.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '26.1.10'; +const String pigeonVersion = '26.1.11'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index e0e25734e32e..ef6202d4350a 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 26.1.10 # This must match the version in lib/src/generator_tools.dart +version: 26.1.11 # This must match the version in lib/src/generator_tools.dart environment: sdk: ^3.9.0 From defedce6c3891f394ef16e7e298dce63dfc18ca5 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 2 Mar 2026 14:31:13 -0800 Subject: [PATCH 6/8] tests --- packages/pigeon/test/dart/proxy_api_test.dart | 23 ++++++++----------- packages/pigeon/test/dart_generator_test.dart | 22 +++++++++--------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/packages/pigeon/test/dart/proxy_api_test.dart b/packages/pigeon/test/dart/proxy_api_test.dart index c66a7f850911..e7d5610948a9 100644 --- a/packages/pigeon/test/dart/proxy_api_test.dart +++ b/packages/pigeon/test/dart/proxy_api_test.dart @@ -175,7 +175,7 @@ void main() { expect( collapsedCode, contains( - '(instanceManager ?? PigeonInstanceManager.instance) .remove(arg_identifier!);', + '(instanceManager ?? PigeonInstanceManager.instance) .remove(arg_identifier);', ), ); @@ -1125,35 +1125,30 @@ void main() { ); expect( code, - contains(r'final Api? arg_pigeon_instance = (args[0] as Api?);'), + contains(r'final Api arg_pigeon_instance = args[0]! as Api;'), ); + expect(code, contains(r'final int arg_validType = args[1]! as int;')); expect( code, - contains(r'final int? arg_validType = (args[1] as int?);'), + contains(r'final AnEnum arg_enumType = args[2]! as AnEnum;'), ); expect( code, - contains(r'final AnEnum? arg_enumType = (args[2] as AnEnum?);'), + contains(r'final Api2 arg_proxyApiType = args[3]! as Api2;'), ); expect( code, - contains(r'final Api2? arg_proxyApiType = (args[3] as Api2?);'), + contains(r'final int? arg_nullableValidType = args[4] as int?;'), ); expect( code, - contains(r'final int? arg_nullableValidType = (args[4] as int?);'), - ); - expect( - code, - contains( - r'final AnEnum? arg_nullableEnumType = (args[5] as AnEnum?);', - ), + contains(r'final AnEnum? arg_nullableEnumType = args[5] as AnEnum?;'), ); expect( collapsedCode, contains( - r'(doSomething ?? arg_pigeon_instance!.doSomething)?.call( arg_pigeon_instance!, ' - r'arg_validType!, arg_enumType!, arg_proxyApiType!, ' + r'(doSomething ?? arg_pigeon_instance.doSomething)?.call( arg_pigeon_instance, ' + r'arg_validType, arg_enumType, arg_proxyApiType, ' r'arg_nullableValidType, arg_nullableEnumType, ' r'arg_nullableProxyApiType);', ), diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart index 707673a9857e..75840c1898d0 100644 --- a/packages/pigeon/test/dart_generator_test.dart +++ b/packages/pigeon/test/dart_generator_test.dart @@ -251,11 +251,11 @@ void main() { expect(code, contains('int add(int x, int y)')); expect( code, - contains('final List args = (message as List?)!'), + contains('final List args = message! as List'), ); - expect(code, contains('final int? arg_x = (args[0] as int?)')); - expect(code, contains('final int? arg_y = (args[1] as int?)')); - expect(code, contains('final int output = api.add(arg_x!, arg_y!)')); + expect(code, contains('final int arg_x = args[0]! as int')); + expect(code, contains('final int arg_y = args[1]! as int')); + expect(code, contains('final int output = api.add(arg_x, arg_y)')); }); test('nested class', () { @@ -622,7 +622,7 @@ void main() { expect(code, contains('writeValue(buffer, value.index);')); expect( code, - contains('final EnumClass? arg_enumClass = (args[0] as EnumClass?);'), + contains('final EnumClass arg_enumClass = args[0]! as EnumClass;'), ); expect(code, contains('EnumClass doSomething(EnumClass enumClass);')); }); @@ -958,7 +958,7 @@ void main() { expect(code, contains('Future doSomething(Input input);')); expect( code, - contains('final Output output = await api.doSomething(arg_input!);'), + contains('final Output output = await api.doSomething(arg_input);'), ); }); @@ -1338,7 +1338,7 @@ void main() { expect(code, contains('Future> doit(')); expect( code, - contains('return (pigeonVar_replyValue as List).cast();'), + contains('return (pigeonVar_replyValue! as List).cast();'), ); }); @@ -1390,10 +1390,10 @@ void main() { expect( code, contains( - 'final List? arg_foo = (args[0] as List?)?.cast()', + 'final List arg_foo = (args[0]! as List).cast()', ), ); - expect(code, contains('final List output = api.doit(arg_foo!)')); + expect(code, contains('final List output = api.doit(arg_foo)')); }); test('return nullable host', () { @@ -1727,7 +1727,7 @@ void main() { ); final code = sink.toString(); expect(code, contains('void doit({required int foo});')); - expect(code, contains('api.doit(foo: arg_foo!)')); + expect(code, contains('api.doit(foo: arg_foo)')); }); test('uses output package name for imports', () { @@ -1966,7 +1966,7 @@ name: foobar ); final testCode = sink.toString(); - expect(testCode, contains('final Enum? arg_anEnum = (args[0] as Enum?);')); + expect(testCode, contains('final Enum arg_anEnum = args[0]! as Enum;')); expect( testCode, contains('return value == null ? null : Enum.values[value];'), From 14fcefbcd80521f2964494a438b88ac723d28c52 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 2 Mar 2026 14:40:36 -0800 Subject: [PATCH 7/8] tests --- .../test/generated_dart_test_code_test.dart | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/test/generated_dart_test_code_test.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/test/generated_dart_test_code_test.dart index 8d9431687fc0..2603e0e57f47 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/test/generated_dart_test_code_test.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/test/generated_dart_test_code_test.dart @@ -224,22 +224,15 @@ void main() { ).send([null]), isEmpty, ); - try { - await const BasicMessageChannel( - 'dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search', - StandardMessageCodec(), - ).send([null]) - as List?; - expect(true, isFalse); // should not reach here - } catch (error) { - expect(error, isAssertionError); - expect( - error.toString(), - contains( - 'Argument for dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search was null, expected non-null MessageSearchRequest.', - ), - ); - } + expect( + () async => + await const BasicMessageChannel( + 'dev.flutter.pigeon.pigeon_integration_tests.MessageApi.search', + StandardMessageCodec(), + ).send([null]) + as List?, + throwsA(isA()), + ); expect(mock.log, ['initialize']); }); } From a2671d755dfd422dac0baa8d17e4c104d29a7766 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 2 Mar 2026 14:43:54 -0800 Subject: [PATCH 8/8] typo --- packages/pigeon/lib/src/ast.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pigeon/lib/src/ast.dart b/packages/pigeon/lib/src/ast.dart index 9c48eac0d0fc..b51f66bb67ad 100644 --- a/packages/pigeon/lib/src/ast.dart +++ b/packages/pigeon/lib/src/ast.dart @@ -588,7 +588,7 @@ class TypeDeclaration { ); } - /// Returns a new [TypeDeclaration] with [associatedProxyApi]. + /// Returns a new [TypeDeclaration] with [types] as the [typeArguments] value. TypeDeclaration copyWithTypeArguments(List types) { return TypeDeclaration( baseName: baseName,