jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CLANGFORMAT the remaining files of xplat/sonar

Browse Source 
Summary:
As per title.
Ran `arc lint -a --take CLANGFORMAT --paths-cmd 'hg files ./'` from xplat/sonar

Reviewed By: zertosh

Differential Revision: D19943131

fbshipit-source-id: c1dc10b27389fd6f54f055803519dac6bf0e7997
This commit is contained in:
Pritesh Nandgaonkar
2020-02-18 05:26:08 -08:00
committed by Facebook Github Bot
parent 7db8d300a8
commit bd388f73e4
11 changed files with 220 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
react-native/react-native-flipper/ios/FlipperModule.m
View File

@@ -9,18 +9,17 @@
#import "FlipperReactNativeJavaScriptPluginManager.h"
@implementation FlipperModule
{
__weak FlipperReactNativeJavaScriptPluginManager *_manager;
@implementation FlipperModule {
__weak FlipperReactNativeJavaScriptPluginManager* _manager;
}
- (instancetype)init
{
return [self initWithManager:[FlipperReactNativeJavaScriptPluginManager sharedInstance]];
- (instancetype)init {
return [self initWithManager:[FlipperReactNativeJavaScriptPluginManager
sharedInstance]];
}
- (instancetype)initWithManager:(FlipperReactNativeJavaScriptPluginManager *)manager
{
- (instancetype)initWithManager:
(FlipperReactNativeJavaScriptPluginManager*)manager {
if (self = [super init]) {
_manager = manager;
}
@@ -29,13 +28,11 @@
RCT_EXPORT_MODULE(Flipper)
+ (BOOL)requiresMainQueueSetup
{
+ (BOOL)requiresMainQueueSetup {
return NO;
}
- (NSArray<NSString *> *)supportedEvents
{
- (NSArray<NSString*>*)supportedEvents {
return @[
@"react-native-flipper-plugin-connect",
@"react-native-flipper-plugin-disconnect",
@@ -43,55 +40,55 @@ RCT_EXPORT_MODULE(Flipper)
];
}
- (void)startObserving
{
- (void)startObserving {
}
- (void)stopObserving
{
- (void)stopObserving {
}
RCT_EXPORT_METHOD(registerPlugin:(NSString *)pluginId
inBackground:(BOOL)inBackground
statusCallback:(RCTResponseSenderBlock)statusCallback)
{
RCT_EXPORT_METHOD(registerPlugin
: (NSString*)pluginId inBackground
: (BOOL)inBackground statusCallback
: (RCTResponseSenderBlock)statusCallback) {
[_manager registerPluginWithModule:self
pluginId:pluginId
inBackground:inBackground
statusCallback:statusCallback];
}
RCT_EXPORT_METHOD(send:(NSString *)pluginId method:(NSString *)method data:(NSString *)data)
{
RCT_EXPORT_METHOD(send
: (NSString*)pluginId method
: (NSString*)method data
: (NSString*)data) {
[_manager sendWithPluginId:pluginId method:method data:data];
}
RCT_EXPORT_METHOD(reportErrorWithMetadata:(NSString *)pluginId
reason:(NSString *)reason
stackTrace:(NSString *)stackTrace)
{
[_manager reportErrorWithMetadata:reason stackTrace:stackTrace pluginId:pluginId];
RCT_EXPORT_METHOD(reportErrorWithMetadata
: (NSString*)pluginId reason
: (NSString*)reason stackTrace
: (NSString*)stackTrace) {
[_manager reportErrorWithMetadata:reason
stackTrace:stackTrace
pluginId:pluginId];
}
RCT_EXPORT_METHOD(reportError:(NSString *)pluginId error:(NSString *)error)
{
RCT_EXPORT_METHOD(reportError : (NSString*)pluginId error : (NSString*)error) {
[_manager reportError:error pluginId:pluginId];
}
RCT_EXPORT_METHOD(subscribe:(NSString *)pluginId method:(NSString *)method)
{
RCT_EXPORT_METHOD(subscribe : (NSString*)pluginId method : (NSString*)method) {
[_manager subscribeWithModule:self pluginId:pluginId method:method];
}
RCT_EXPORT_METHOD(respondSuccess:(NSString *)responderId data:(NSString *)data)
{
RCT_EXPORT_METHOD(respondSuccess
: (NSString*)responderId data
: (NSString*)data) {
[_manager respondSuccessWithResponderId:responderId data:data];
}
RCT_EXPORT_METHOD(respondError:(NSString *)responderId data:(NSString *)data)
{
RCT_EXPORT_METHOD(respondError
: (NSString*)responderId data
: (NSString*)data) {
[_manager respondErrorWithResponderId:responderId data:data];
}

10
react-native/react-native-flipper/ios/FlipperReactNativeJavaScriptPlugin.h
View File

@@ -5,8 +5,8 @@
* LICENSE file in the root directory of this source tree.
*/
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKit/FlipperConnection.h>
#import <FlipperKit/FlipperPlugin.h>
NS_ASSUME_NONNULL_BEGIN
@@ -14,11 +14,11 @@ NS_ASSUME_NONNULL_BEGIN
@interface FlipperReactNativeJavaScriptPlugin : NSObject<FlipperPlugin>
@property (nonatomic, weak) FlipperModule *module;
@property (nonatomic, strong, readonly) id<FlipperConnection> connection;
@property(nonatomic, weak) FlipperModule* module;
@property(nonatomic, strong, readonly) id<FlipperConnection> connection;
- (instancetype)initWithFlipperModule:(FlipperModule *)module
pluginId:(NSString *)pluginId
- (instancetype)initWithFlipperModule:(FlipperModule*)module
pluginId:(NSString*)pluginId
inBackground:(BOOL)inBackground;
- (BOOL)isConnected;

35
react-native/react-native-flipper/ios/FlipperReactNativeJavaScriptPlugin.m
View File

@@ -12,16 +12,14 @@
#import "FlipperModule.h"
@implementation FlipperReactNativeJavaScriptPlugin
{
NSString *_pluginId;
@implementation FlipperReactNativeJavaScriptPlugin {
NSString* _pluginId;
BOOL _inBackground;
}
- (instancetype)initWithFlipperModule:(FlipperModule *)module
pluginId:(NSString *)pluginId
inBackground:(BOOL)inBackground
{
- (instancetype)initWithFlipperModule:(FlipperModule*)module
pluginId:(NSString*)pluginId
inBackground:(BOOL)inBackground {
if (self = [super init]) {
_module = module;
_pluginId = pluginId;
@@ -30,43 +28,36 @@
return self;
}
- (NSString *)identifier
{
- (NSString*)identifier {
return _pluginId;
}
- (BOOL)runInBackground
{
- (BOOL)runInBackground {
return _inBackground;
}
- (void)didConnect:(id<FlipperConnection>)connection
{
- (void)didConnect:(id<FlipperConnection>)connection {
_connection = connection;
[self fireOnConnect];
}
- (void)didDisconnect
{
- (void)didDisconnect {
_connection = nil;
[_module sendEventWithName:@"react-native-flipper-plugin-disconnect"
body:[self pluginParams]];
}
- (BOOL)isConnected
{
- (BOOL)isConnected {
return _connection != nil;
}
- (void)fireOnConnect
{
- (void)fireOnConnect {
[_module sendEventWithName:@"react-native-flipper-plugin-connect"
body:[self pluginParams]];
}
- (id)pluginParams
{
return @{@"plugin": _pluginId};
- (id)pluginParams {
return @{@"plugin" : _pluginId};
}
@end

27
react-native/react-native-flipper/ios/FlipperReactNativeJavaScriptPluginManager.h
View File

@@ -17,26 +17,29 @@ NS_ASSUME_NONNULL_BEGIN
+ (instancetype)sharedInstance;
- (void)registerPluginWithModule:(FlipperModule *)module
pluginId:(NSString *)pluginId
- (void)registerPluginWithModule:(FlipperModule*)module
pluginId:(NSString*)pluginId
inBackground:(BOOL)inBackground
statusCallback:(RCTResponseSenderBlock)statusCallback;
- (void)sendWithPluginId:(NSString *)pluginId method:(NSString *)method data:(NSString *)data;
- (void)sendWithPluginId:(NSString*)pluginId
method:(NSString*)method
data:(NSString*)data;
- (void)reportErrorWithMetadata:(NSString *)reason
stackTrace:(NSString *)stackTrace
pluginId:(NSString *)pluginId;
- (void)reportErrorWithMetadata:(NSString*)reason
stackTrace:(NSString*)stackTrace
pluginId:(NSString*)pluginId;
- (void)reportError:(NSString *)error pluginId:(NSString *)pluginId;
- (void)reportError:(NSString*)error pluginId:(NSString*)pluginId;
- (void)subscribeWithModule:(FlipperModule *)module
pluginId:(NSString *)pluginId
method:(NSString *)method;
- (void)subscribeWithModule:(FlipperModule*)module
pluginId:(NSString*)pluginId
method:(NSString*)method;
- (void)respondSuccessWithResponderId:(NSString *)responderId data:(NSString *)data;
- (void)respondSuccessWithResponderId:(NSString*)responderId
data:(NSString*)data;
- (void)respondErrorWithResponderId:(NSString *)responderId data:(NSString *)data;
- (void)respondErrorWithResponderId:(NSString*)responderId data:(NSString*)data;
@end

137
react-native/react-native-flipper/ios/FlipperReactNativeJavaScriptPluginManager.m
View File

@@ -5,34 +5,30 @@
* LICENSE file in the root directory of this source tree.
*/
#import "FlipperReactNativeJavaScriptPluginManager.h"
#import <FlipperKit/FlipperPlugin.h>
#import <FlipperKit/FlipperClient.h>
#import <FlipperKit/FlipperPlugin.h>
#import <React/RCTUtils.h>
#import "FlipperModule.h"
#import "FlipperReactNativeJavaScriptPlugin.h"
static uint32_t FlipperResponderKeyGenerator = 0;
@implementation FlipperReactNativeJavaScriptPluginManager
{
__weak FlipperClient *_flipperClient;
NSMutableDictionary<NSString *, id<FlipperResponder>> *_responders;
@implementation FlipperReactNativeJavaScriptPluginManager {
__weak FlipperClient* _flipperClient;
NSMutableDictionary<NSString*, id<FlipperResponder>>* _responders;
}
+ (instancetype)sharedInstance
{
static FlipperReactNativeJavaScriptPluginManager *sharedInstance = nil;
+ (instancetype)sharedInstance {
static FlipperReactNativeJavaScriptPluginManager* sharedInstance = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
sharedInstance = [self new];
sharedInstance = [self new];
});
return sharedInstance;
}
- (instancetype)init
{
- (instancetype)init {
if (self = [super init]) {
_flipperClient = [FlipperClient sharedClient];
_responders = [NSMutableDictionary new];
@@ -40,18 +36,18 @@ static uint32_t FlipperResponderKeyGenerator = 0;
return self;
}
- (void)registerPluginWithModule:(FlipperModule *)module
pluginId:(NSString *)pluginId
- (void)registerPluginWithModule:(FlipperModule*)module
pluginId:(NSString*)pluginId
inBackground:(BOOL)inBackground
statusCallback:(RCTResponseSenderBlock)statusCallback
{
statusCallback:(RCTResponseSenderBlock)statusCallback {
if (_flipperClient == nil) {
// Flipper is not available in this build
statusCallback(@[@"noflipper"]);
statusCallback(@[ @"noflipper" ]);
return;
}
FlipperReactNativeJavaScriptPlugin *existingPlugin = [self jsPluginWithIdentifier:pluginId];
FlipperReactNativeJavaScriptPlugin* existingPlugin =
[self jsPluginWithIdentifier:pluginId];
if (existingPlugin != nil) {
existingPlugin.module = module;
@@ -59,86 +55,95 @@ static uint32_t FlipperResponderKeyGenerator = 0;
[existingPlugin fireOnConnect];
}
statusCallback(@[@"ok"]);
statusCallback(@[ @"ok" ]);
return;
}
FlipperReactNativeJavaScriptPlugin *newPlugin =
[[FlipperReactNativeJavaScriptPlugin alloc] initWithFlipperModule:module
pluginId:pluginId
inBackground:inBackground];
FlipperReactNativeJavaScriptPlugin* newPlugin =
[[FlipperReactNativeJavaScriptPlugin alloc]
initWithFlipperModule:module
pluginId:pluginId
inBackground:inBackground];
[_flipperClient addPlugin:newPlugin];
statusCallback(@[@"ok"]);
statusCallback(@[ @"ok" ]);
}
- (void)sendWithPluginId:(NSString *)pluginId method:(NSString *)method data:(NSString *)data
{
[[self jsPluginWithIdentifier:pluginId].connection send:method
withParams:RCTJSONParse(data, NULL)];
- (void)sendWithPluginId:(NSString*)pluginId
method:(NSString*)method
data:(NSString*)data {
[[self jsPluginWithIdentifier:pluginId].connection
send:method
withParams:RCTJSONParse(data, NULL)];
}
- (void)reportErrorWithMetadata:(NSString *)reason
stackTrace:(NSString *)stackTrace
pluginId:(NSString *)pluginId
{
[[self jsPluginWithIdentifier:pluginId].connection errorWithMessage:reason stackTrace:stackTrace];
- (void)reportErrorWithMetadata:(NSString*)reason
stackTrace:(NSString*)stackTrace
pluginId:(NSString*)pluginId {
[[self jsPluginWithIdentifier:pluginId].connection
errorWithMessage:reason
stackTrace:stackTrace];
}
- (void)reportError:(NSString *)error pluginId:(NSString *)pluginId
{
- (void)reportError:(NSString*)error pluginId:(NSString*)pluginId {
// Stacktrace
NSMutableArray<NSString *> *callstack = NSThread.callStackSymbols.mutableCopy;
NSMutableString *callstackString = callstack.firstObject.mutableCopy;
NSMutableArray<NSString*>* callstack = NSThread.callStackSymbols.mutableCopy;
NSMutableString* callstackString = callstack.firstObject.mutableCopy;
[callstack removeObject:callstack.firstObject];
for (NSString *stack in callstack) {
for (NSString* stack in callstack) {
[callstackString appendFormat:@"\n %@", stack];
}
[[self jsPluginWithIdentifier:pluginId].connection errorWithMessage:error stackTrace:callstackString];
[[self jsPluginWithIdentifier:pluginId].connection
errorWithMessage:error
stackTrace:callstackString];
}
- (void)subscribeWithModule:(FlipperModule *)module
pluginId:(NSString *)pluginId
method:(NSString *)method
{
- (void)subscribeWithModule:(FlipperModule*)module
pluginId:(NSString*)pluginId
method:(NSString*)method {
__weak __typeof(self) weakSelf = self;
[[self jsPluginWithIdentifier: pluginId].connection receive:method withBlock:^(NSDictionary * params, id<FlipperResponder> responder) {
__typeof(self) strongSelf = weakSelf;
[[self jsPluginWithIdentifier:pluginId].connection
receive:method
withBlock:^(NSDictionary* params, id<FlipperResponder> responder) {
__typeof(self) strongSelf = weakSelf;
NSMutableDictionary *body = [NSMutableDictionary dictionaryWithDictionary:@{
@"plugin": pluginId,
@"method": method,
@"params": RCTJSONStringify(params, NULL),
}];
NSMutableDictionary* body =
[NSMutableDictionary dictionaryWithDictionary:@{
@"plugin" : pluginId,
@"method" : method,
@"params" : RCTJSONStringify(params, NULL),
}];
if (responder != nil) {
NSString *responderId = [NSString stringWithFormat:@"%d", FlipperResponderKeyGenerator++];
strongSelf->_responders[responderId] = responder;
body[@"responderId"] = responderId;
}
if (responder != nil) {
NSString* responderId =
[NSString stringWithFormat:@"%d", FlipperResponderKeyGenerator++];
strongSelf->_responders[responderId] = responder;
body[@"responderId"] = responderId;
}
[module sendEventWithName:@"react-native-flipper-receive-event" body:body];
}];
[module sendEventWithName:@"react-native-flipper-receive-event"
body:body];
}];
}
- (void)respondSuccessWithResponderId:(NSString *)responderId data:(NSString *)data
{
- (void)respondSuccessWithResponderId:(NSString*)responderId
data:(NSString*)data {
id<FlipperResponder> responder = _responders[responderId];
[responder success:RCTJSONParse(data, NULL)];
[_responders removeObjectForKey:responderId];
}
- (void)respondErrorWithResponderId:(NSString *)responderId data:(NSString *)data
{
- (void)respondErrorWithResponderId:(NSString*)responderId
data:(NSString*)data {
id<FlipperResponder> responder = _responders[responderId];
[responder error:RCTJSONParse(data, NULL)];
[_responders removeObjectForKey:responderId];
}
- (FlipperReactNativeJavaScriptPlugin *)jsPluginWithIdentifier:(NSString *)pluginId
{
return (FlipperReactNativeJavaScriptPlugin *)[_flipperClient pluginWithIdentifier:pluginId];
- (FlipperReactNativeJavaScriptPlugin*)jsPluginWithIdentifier:
(NSString*)pluginId {
return (FlipperReactNativeJavaScriptPlugin*)[_flipperClient
pluginWithIdentifier:pluginId];
}
@end