[pigeon] Simplify localizedDescription of PigeonError in Swift

flutter · Apr 25, 2024 · c2beea1 · c2beea1
1 parent d8968d7
commit c2beea1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/packages/pigeon/example/app/ios/Runner/Messages.g.swift b/packages/pigeon/example/app/ios/Runner/Messages.g.swift
@@ -27,16 +27,8 @@ class PigeonError: Swift.Error {
   }
 
   var localizedDescription: String {
-    let detailsDescription: String
-    if let convertibleObject = details as? CustomStringConvertible {
-      detailsDescription = convertibleObject.description
-    } else if let _ = details {
-      detailsDescription = "<non-convertible object>"
-    } else {
-      detailsDescription = "<nil>"
-    }
     return
-      "PigeonError(code: \(code), message: \(message ?? "<nil>"), details: \(detailsDescription)"
+      "PigeonError(code: \(code), message: \(message ?? "<nil>"), details: \(details ?? "<nil>")"
   }
 }
 

diff --git a/packages/pigeon/lib/swift_generator.dart b/packages/pigeon/lib/swift_generator.dart
@@ -928,23 +928,11 @@ private func nilOrValue<T>(_ value: Any?) -> T? {
       indent.newln();
       indent.writeln('var localizedDescription: String {');
       indent.nest(1, () {
-        indent.writeln('let detailsDescription: String');
-        indent.writeln(
-            'if let convertibleObject = details as? CustomStringConvertible {');
-        indent.nest(1, () {
-          indent.writeln('detailsDescription = convertibleObject.description');
-        });
-        indent.writeln('} else if let _ = details {');
+        indent.writeln('return');
         indent.nest(1, () {
-          indent.writeln('detailsDescription = "<non-convertible object>"');
-        });
-        indent.writeln('} else {');
-        indent.nest(1, () {
-          indent.writeln('detailsDescription = "<nil>"');
+          indent.writeln(
+              r'"PigeonError(code: \(code), message: \(message ?? "<nil>"), details: \(details ?? "<nil>")"');
         });
-        indent.writeln('}');
-        indent.writeln(
-            r'return "PigeonError(code: \(code), message: \(message ?? "<nil>"), details: \(detailsDescription)"');
       });
       indent.write('}');
     });