issue(123867): replaced Dispatch to MainActor.run

flutter · Dec 23, 2024 · 71ba017 · 71ba017
1 parent 1b22130
commit 71ba017
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/pigeon/example/app/ios/Runner/Messages.g.swift b/packages/pigeon/example/app/ios/Runner/Messages.g.swift
@@ -29,7 +29,7 @@ final class PigeonError: Error {
   var localizedDescription: String {
     return
       "PigeonError(code: \(code), message: \(message ?? "<nil>"), details: \(details ?? "<nil>")"
-  }
+      }
 }
 
 private func wrapResult(_ result: Any?) -> [Any?] {
@@ -234,11 +234,11 @@ class ExampleHostApiSetup {
         Task {
           do {
             let result = try await api.sendMessageModernAsync(message: messageArg)
-            DispatchQueue.main.async {
+            await MainActor.run() {
               reply(wrapResult(result))
             }
           } catch {
-            DispatchQueue.main.async {
+            await MainActor.run() {
               reply(wrapError(error))
             }
           }

diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart
@@ -1613,10 +1613,10 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
             indent.writeln('Task {');
             indent.inc();
           }
-          void wrapDispatchMain(void Function() body) {
+          void wrapMainActorRun(void Function() body) {
             if (asynchronousType.isModern) {
               return indent.writeScoped(
-                'DispatchQueue.main.async {',
+                'await MainActor.run() {',
                 '}',
                 body,
               );
@@ -1629,16 +1629,16 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
           indent.addScoped('{', '}', () {
             if (returnType.isVoid) {
               indent.writeln(call);
-              wrapDispatchMain(() => indent.writeln('reply(wrapResult(nil))'));
+              wrapMainActorRun(() => indent.writeln('reply(wrapResult(nil))'));
             } else {
               indent.writeln('let result = $call');
-              wrapDispatchMain(
+              wrapMainActorRun(
                 () => indent.writeln('reply(wrapResult(result))'),
               );
             }
           }, addTrailingNewline: false);
           indent.addScoped(' catch {', '}', () {
-            wrapDispatchMain(() => indent.writeln('reply(wrapError(error))'));
+            wrapMainActorRun(() => indent.writeln('reply(wrapError(error))'));
           });
         }
       });