Addressing review comments

packages/pigeon/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 19.0.0
 
-* **Breaking Change** [swift] Do not use `FlutterError` on the generated code.
+* **Breaking Change** [swift] Removes `FlutterError` in favor of `PigeonError`.
 
 ## 18.0.1
 

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

@@ -19,20 +19,20 @@ private func wrapResult(_ result: Any?) -> [Any?] {
 }
 
 private func wrapError(_ error: Any) -> [Any?] {
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
   if let pigeonError = error as? PigeonError {
     return [
       pigeonError.code,
       pigeonError.message,
       pigeonError.details,
     ]
   }
+  if let flutterError = error as? FlutterError {
+    return [
+      flutterError.code,
+      flutterError.message,
+      flutterError.details,
+    ]
+  }
   return [
     "\(error)",
     "\(type(of: error))",

packages/pigeon/lib/swift_generator.dart

@@ -625,15 +625,6 @@ class SwiftGenerator extends StructuredGenerator<SwiftOptions> {
     indent.newln();
     indent.write('private func wrapError(_ error: Any) -> [Any?] ');
     indent.addScoped('{', '}', () {
-      indent.write('if let flutterError = error as? FlutterError ');
-      indent.addScoped('{', '}', () {
-        indent.write('return ');
-        indent.addScoped('[', ']', () {
-          indent.writeln('flutterError.code,');
-          indent.writeln('flutterError.message,');
-          indent.writeln('flutterError.details,');
-        });
-      });
       indent.write(
           'if let pigeonError = error as? ${_getErrorClassName(generatorOptions)} ');
       indent.addScoped('{', '}', () {
@@ -644,6 +635,15 @@ class SwiftGenerator extends StructuredGenerator<SwiftOptions> {
           indent.writeln('pigeonError.details,');
         });
       });
+      indent.write('if let flutterError = error as? FlutterError ');
+      indent.addScoped('{', '}', () {
+        indent.write('return ');
+        indent.addScoped('[', ']', () {
+          indent.writeln('flutterError.code,');
+          indent.writeln('flutterError.message,');
+          indent.writeln('flutterError.details,');
+        });
+      });
       indent.write('return ');
       indent.addScoped('[', ']', () {
         indent.writeln(r'"\(error)",');

packages/pigeon/platform_tests/test_plugin/ios/Classes/CoreTests.gen.swift

@@ -20,20 +20,20 @@ private func wrapResult(_ result: Any?) -> [Any?] {
 }
 
 private func wrapError(_ error: Any) -> [Any?] {
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
   if let pigeonError = error as? PigeonError {
     return [
       pigeonError.code,
       pigeonError.message,
       pigeonError.details,
     ]
   }
+  if let flutterError = error as? FlutterError {
+    return [
+      flutterError.code,
+      flutterError.message,
+      flutterError.details,
+    ]
+  }
   return [
     "\(error)",
     "\(type(of: error))",

packages/pigeon/platform_tests/test_plugin/macos/Classes/CoreTests.gen.swift

@@ -20,20 +20,20 @@ private func wrapResult(_ result: Any?) -> [Any?] {
 }
 
 private func wrapError(_ error: Any) -> [Any?] {
-  if let flutterError = error as? FlutterError {
-    return [
-      flutterError.code,
-      flutterError.message,
-      flutterError.details,
-    ]
-  }
   if let pigeonError = error as? PigeonError {
     return [
       pigeonError.code,
       pigeonError.message,
       pigeonError.details,
     ]
   }
+  if let flutterError = error as? FlutterError {
+    return [
+      flutterError.code,
+      flutterError.message,
+      flutterError.details,
+    ]
+  }
   return [
     "\(error)",
     "\(type(of: error))",