Minor adjustments

- Add a missing nullability specifier.
- Use simplified nullability annotations when possible.
- clang-format using project style file.
- Add braces to conditionals to match project style.
- Add new header to umbrella header.

Author: stuartmorgan-g

library/macos/FLEEventChannel.h

@@ -35,7 +35,7 @@ extern NSString const *_Nonnull FLEEndOfEventStream;
 @protocol FLEStreamHandler
 
 /**
- * Sets up an event stream and begin emitting events.
+ * Sets up an event stream and begins emitting events.
  *
  * Invoked when the first listener is registered with the Stream associated to
  * this channel on the Flutter side.
@@ -48,8 +48,8 @@ extern NSString const *_Nonnull FLEEndOfEventStream;
  *     successful events.
  * @return A FLEMethodError instance, if setup fails.
  */
-- (nullable FLEMethodError *)onListenWithArguments:(id _Nullable)arguments
-                                        eventSink:(FLEEventSink)events;
+- (nullable FLEMethodError *)onListenWithArguments:(nullable id)arguments
+                                         eventSink:(FLEEventSink _Nonnull)events;
 
 /**
  * Tears down an event stream.
@@ -64,7 +64,7 @@ extern NSString const *_Nonnull FLEEndOfEventStream;
  * @param arguments Arguments for the stream.
  * @return A FLEMethodError instance, if teardown fails.
  */
-- (nullable FLEMethodError *)onCancelWithArguments:(id _Nullable)arguments;
+- (nullable FLEMethodError *)onCancelWithArguments:(nullable id)arguments;
 
 @end
 

library/macos/FLEEventChannel.m

@@ -17,83 +17,86 @@
 NSString const *FLEEndOfEventStream = @"EndOfEventStream";
 
 @implementation FLEEventChannel {
-    NSString *_name;
-    __weak id<FLEBinaryMessenger> _messenger;
-    id<FLEMethodCodec> _codec;
+  NSString *_name;
+  __weak id<FLEBinaryMessenger> _messenger;
+  id<FLEMethodCodec> _codec;
 }
 
 + (instancetype)eventChannelWithName:(NSString *)name
                      binaryMessenger:(id<FLEBinaryMessenger>)messenger
                                codec:(id<FLEMethodCodec>)codec {
-    return [[[self class] alloc] initWithName:name binaryMessenger:messenger codec:codec];
+  return [[[self class] alloc] initWithName:name binaryMessenger:messenger codec:codec];
 }
 
 - (instancetype)initWithName:(NSString *)name
              binaryMessenger:(id<FLEBinaryMessenger>)messenger
                        codec:(id<FLEMethodCodec>)codec {
-    self = [super init];
-    if (self) {
-        _name = [name copy];
-        _messenger = messenger;
-        _codec = codec;
-    }
-    return self;
+  self = [super init];
+  if (self) {
+    _name = [name copy];
+    _messenger = messenger;
+    _codec = codec;
+  }
+  return self;
 }
 
 - (void)setStreamHandler:(NSObject<FLEStreamHandler> *)handler {
-    if (!handler) {
-        [_messenger setMessageHandlerOnChannel:_name binaryMessageHandler:nil];
-        return;
-    }
+  if (!handler) {
+    [_messenger setMessageHandlerOnChannel:_name binaryMessageHandler:nil];
+    return;
+  }
 
-    id<FLEMethodCodec> codec = _codec;
-    __weak id<FLEBinaryMessenger> messenger =  _messenger;
-    NSString *name = _name;
-    FLEEventSink eventSink = ^(id event) {
-        if (event == FLEEndOfEventStream)
-            [messenger sendOnChannel:name message:nil];
-        else if ([event isKindOfClass:[FLEMethodError class]])
-            [messenger sendOnChannel:name
-                             message:[codec encodeErrorEnvelope:(FLEMethodError *)event]];
-        else
-            [messenger sendOnChannel:name message:[codec encodeSuccessEnvelope:event]];
-    };
+  id<FLEMethodCodec> codec = _codec;
+  __weak id<FLEBinaryMessenger> messenger = _messenger;
+  NSString *name = _name;
+  FLEEventSink eventSink = ^(id event) {
+    if (event == FLEEndOfEventStream) {
+      [messenger sendOnChannel:name message:nil];
+    } else if ([event isKindOfClass:[FLEMethodError class]]) {
+      [messenger sendOnChannel:name message:[codec encodeErrorEnvelope:(FLEMethodError *)event]];
+    } else {
+      [messenger sendOnChannel:name message:[codec encodeSuccessEnvelope:event]];
+    }
+  };
 
-    __block FLEEventSink currentSink = nil;
-    FLEBinaryMessageHandler messageHandler = ^(NSData *message, FLEBinaryReply callback) {
-        FLEMethodCall* call = [codec decodeMethodCall:message];
-        if ([call.methodName isEqual:@"listen"]) {
-            if (currentSink) {
-                FLEMethodError* error = [handler onCancelWithArguments:nil];
-                if (error)
-                    NSLog(@"Failed to cancel existing stream: %@. %@ (%@)", error.code, error.message,
-                          error.details);
-            }
-            currentSink = eventSink;
-            FLEMethodError *error = [handler onListenWithArguments:call.arguments eventSink:currentSink];
-            if (error)
-                callback([codec encodeErrorEnvelope:error]);
-            else
-                callback([codec encodeSuccessEnvelope:nil]);
-        } else if ([call.methodName isEqual:@"cancel"]) {
-            if (!currentSink) {
-                callback(
-                         [codec encodeErrorEnvelope:[[FLEMethodError alloc] initWithCode:@"error"
-                                                                                 message:@"No active stream to cancel"
-                                                                                 details:nil]]);
-                return;
-            }
-            currentSink = nil;
-            FLEMethodError *error = [handler onCancelWithArguments:call.arguments];
-            if (error)
-                callback([codec encodeErrorEnvelope:error]);
-            else
-                callback([codec encodeSuccessEnvelope:nil]);
-        } else {
-            callback(nil);
+  __block FLEEventSink currentSink = nil;
+  FLEBinaryMessageHandler messageHandler = ^(NSData *message, FLEBinaryReply callback) {
+    FLEMethodCall *call = [codec decodeMethodCall:message];
+    if ([call.methodName isEqual:@"listen"]) {
+      if (currentSink) {
+        FLEMethodError *error = [handler onCancelWithArguments:nil];
+        if (error) {
+          NSLog(@"Failed to cancel existing stream: %@. %@ (%@)", error.code, error.message,
+                error.details);
         }
-    };
-    [_messenger setMessageHandlerOnChannel:_name binaryMessageHandler:messageHandler];
+      }
+      currentSink = eventSink;
+      FLEMethodError *error = [handler onListenWithArguments:call.arguments eventSink:currentSink];
+      if (error) {
+        callback([codec encodeErrorEnvelope:error]);
+      } else {
+        callback([codec encodeSuccessEnvelope:nil]);
+      }
+    } else if ([call.methodName isEqual:@"cancel"]) {
+      if (!currentSink) {
+        callback([codec
+            encodeErrorEnvelope:[[FLEMethodError alloc] initWithCode:@"error"
+                                                             message:@"No active stream to cancel"
+                                                             details:nil]]);
+        return;
+      }
+      currentSink = nil;
+      FLEMethodError *error = [handler onCancelWithArguments:call.arguments];
+      if (error) {
+        callback([codec encodeErrorEnvelope:error]);
+      } else {
+        callback([codec encodeSuccessEnvelope:nil]);
+      }
+    } else {
+      callback(nil);
+    }
+  };
+  [_messenger setMessageHandlerOnChannel:_name binaryMessageHandler:messageHandler];
 }
 
 @end

library/macos/FlutterEmbedderMac.h

@@ -14,6 +14,7 @@
 
 #import "FLEBasicMessageChannel.h"
 #import "FLEBinaryMessenger.h"
+#import "FLEEventChannel.h"
 #import "FLEJSONMessageCodec.h"
 #import "FLEJSONMethodCodec.h"
 #import "FLEMessageCodec.h"