Merge branch 'main' of github.com:flutter/packages

packages/pigeon/example/app/ios/Runner/Messages.g.swift

@@ -187,7 +187,8 @@ class MessageFlutterApi: MessageFlutterApiProtocol {
     self.binaryMessenger = binaryMessenger
   }
   func flutterMethod(aString aStringArg: String?, completion: @escaping (Result<String, FlutterError>) -> Void) {
-    let channel = FlutterBasicMessageChannel(name: "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod", binaryMessenger: binaryMessenger)
+    let channelName: String = "dev.flutter.pigeon.pigeon_example_package.MessageFlutterApi.flutterMethod"
+    let channel = FlutterBasicMessageChannel(name: channelName, binaryMessenger: binaryMessenger)
     channel.sendMessage([aStringArg] as [Any?]) { response in
       guard let listResponse = response as? [Any?] else {
         completion(.failure(createConnectionError(withChannelName:channelName)))

packages/pigeon/lib/swift_generator.dart

@@ -901,7 +901,7 @@ String _getMethodSignature(Method func) {
       ? 'Void'
       : _nullsafeSwiftTypeForDartType(func.returnType);
 
-  if (func.arguments.isEmpty) {
+  if (func.parameters.isEmpty) {
     return 'func ${func.name}(completion: @escaping (Result<$returnType, FlutterError>) -> Void)';
   } else {
     final Iterable<String> argTypes = func.parameters