From 886a596a34bf4b2fdb8da3de1a39d62cd2630705 Mon Sep 17 00:00:00 2001 From: Liam Appelbe Date: Wed, 13 Nov 2024 14:03:57 +1100 Subject: [PATCH] Fix last bit of log spam --- pkgs/ffigen/lib/src/code_generator/objc_methods.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/ffigen/lib/src/code_generator/objc_methods.dart b/pkgs/ffigen/lib/src/code_generator/objc_methods.dart index c8ad658eef..d776a0843d 100644 --- a/pkgs/ffigen/lib/src/code_generator/objc_methods.dart +++ b/pkgs/ffigen/lib/src/code_generator/objc_methods.dart @@ -57,6 +57,14 @@ mixin ObjCMethods { return oldMethod; } + // If one of the methods is optional, and the other is required, keep the + // required one. + if (newMethod.isOptional && !oldMethod.isOptional) { + return oldMethod; + } else if (!newMethod.isOptional && oldMethod.isOptional) { + return newMethod; + } + // Check the duplicate is the same method. if (!newMethod.sameAs(oldMethod)) { _logger.severe('Duplicate methods with different signatures: '