[macOS] Use FLEMethodError on color panel plugin bad arguments

Author: franciscojma86

plugins/color_panel/macos/FLEColorPanelPlugin.mm

@@ -24,15 +24,15 @@ @implementation FLEColorPanelPlugin {
 }
 
 + (void)registerWithRegistrar:(id<FLEPluginRegistrar>)registrar {
-  FLEMethodChannel* channel = [FLEMethodChannel
-                                   methodChannelWithName:@(plugins_color_panel::kChannelName)
-                                   binaryMessenger:registrar.messenger
-                               codec:[FLEJSONMethodCodec sharedInstance]];
-  FLEColorPanelPlugin* instance = [[FLEColorPanelPlugin alloc] initWithChannel:channel];
+  FLEMethodChannel *channel =
+      [FLEMethodChannel methodChannelWithName:@(plugins_color_panel::kChannelName)
+                              binaryMessenger:registrar.messenger
+                                        codec:[FLEJSONMethodCodec sharedInstance]];
+  FLEColorPanelPlugin *instance = [[FLEColorPanelPlugin alloc] initWithChannel:channel];
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
-- (instancetype)initWithChannel:(FLEMethodChannel*)channel {
+- (instancetype)initWithChannel:(FLEMethodChannel *)channel {
   self = [super init];
   if (self) {
     _channel = channel;
@@ -45,26 +45,30 @@ - (instancetype)initWithChannel:(FLEMethodChannel*)channel {
  * panel channel.
  */
 - (void)handleMethodCall:(FLEMethodCall *)call result:(FLEMethodResult)result {
-  BOOL handled = YES;
+  BOOL methodImplemented = YES;
   if ([call.methodName isEqualToString:@(plugins_color_panel::kShowColorPanelMethod)]) {
     if ([call.arguments isKindOfClass:[NSDictionary class]]) {
       BOOL showAlpha =
           [[call.arguments valueForKey:@(plugins_color_panel::kColorPanelShowAlpha)] boolValue];
       [self showColorPanelWithAlpha:showAlpha];
     } else {
-      NSLog(@"Malformed call for %@. Expected an NSDictionary but got %@",
-            @(plugins_color_panel::kShowColorPanelMethod),
-            NSStringFromClass([call.arguments class]));
-      handled = NO;
+      NSString *errorString =
+          [NSString stringWithFormat:@"Malformed call for %@. Expected an NSDictionary but got %@",
+                                     @(plugins_color_panel::kShowColorPanelMethod),
+                                     NSStringFromClass([call.arguments class])];
+      result([[FLEMethodError alloc] initWithCode:@"error"
+                                          message:@"Bad arguments"
+                                          details:errorString]);
+      return;
     }
   } else if ([call.methodName isEqualToString:@(plugins_color_panel::kHideColorPanelMethod)]) {
     [self hideColorPanel];
   } else {
-    handled = NO;
+    methodImplemented = NO;
   }
   // Send an immediate empty success message for handled messages, since the actual color data
   // will be provided in follow-up messages.
-  result(handled ? nil : FLEMethodNotImplemented);
+  result(methodImplemented ? nil : FLEMethodNotImplemented);
 }
 
 /**
@@ -114,7 +118,7 @@ - (void)selectedColorDidChange {
   NSColor *color = [NSColorPanel sharedColorPanel].color;
   NSDictionary *colorDictionary = [self dictionaryWithColor:color];
   [_channel invokeMethod:@(plugins_color_panel::kColorSelectedCallbackMethod)
-                  arguments:colorDictionary];
+               arguments:colorDictionary];
 }
 
 /**
@@ -138,8 +142,7 @@ - (NSDictionary *)dictionaryWithColor:(NSColor *)color {
 
 - (void)windowWillClose:(NSNotification *)notification {
   [self removeColorPanelConnections];
-  [_channel invokeMethod:@(plugins_color_panel::kClosedCallbackMethod)
-                  arguments:nil];
+  [_channel invokeMethod:@(plugins_color_panel::kClosedCallbackMethod) arguments:nil];
 }
 
 @end