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

9
PortForwardingMacApp/main.m
View File

@@ -16,16 +16,17 @@ static BOOL prefix(const char *pre, const char *str) {
return strncmp(pre, str, strlen(pre)) == 0;
}
int main(int argc, char *argv[])
{
int main(int argc, char* argv[]) {
long connectionsPort = 8081;
long multiplexPort = 8025;
for (int i = 1; i < argc; ++i) {
if (prefix(kPortForwardParamPrefix, argv[i])) {
connectionsPort = strtol(argv[i] + strlen(kPortForwardParamPrefix), NULL, 10);
connectionsPort =
strtol(argv[i] + strlen(kPortForwardParamPrefix), NULL, 10);
} else if (prefix(kMultiplexChannelPortParamPrefix, argv[i])) {
multiplexPort = strtol(argv[i] + strlen(kMultiplexChannelPortParamPrefix), NULL, 10);
multiplexPort =
strtol(argv[i] + strlen(kMultiplexChannelPortParamPrefix), NULL, 10);
}
}

2
libs/jni-hack/real/jni.h
View File

@@ -12,6 +12,8 @@
* Everything here is expected to be VM-neutral.
*/
// clang-format off
#ifndef JNI_H_
#define JNI_H_

42
react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample/AppDelegate.m
View File

@@ -14,24 +14,29 @@
#if DEBUG
#import <FlipperKit/FlipperClient.h>
#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
#endif
@implementation AppDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
- (BOOL)application:(UIApplication*)application
didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
[AppDelegate initializeFlipper:application];
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge
RCTBridge* bridge = [[RCTBridge alloc] initWithDelegate:self
launchOptions:launchOptions];
RCTRootView* rootView =
[[RCTRootView alloc] initWithBridge:bridge
moduleName:@"ReactNativeFlipperExample"
initialProperties:nil];
rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f
green:1.0f
blue:1.0f
alpha:1];
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
UIViewController* rootViewController = [UIViewController new];
@@ -41,24 +46,29 @@
return YES;
}
- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
{
- (NSURL*)sourceURLForBridge:(RCTBridge*)bridge {
#if DEBUG
return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
return
[[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index"
fallbackResource:nil];
#else
return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
return [[NSBundle mainBundle] URLForResource:@"main"
withExtension:@"jsbundle"];
#endif
}
+ (void) initializeFlipper:(UIApplication *)application
{
+ (void)initializeFlipper:(UIApplication*)application {
#if DEBUG
FlipperClient* client = [FlipperClient sharedClient];
SKDescriptorMapper *layoutDescriptorMapper = [[SKDescriptorMapper alloc] initWithDefaults];
[client addPlugin: [[FlipperKitLayoutPlugin alloc] initWithRootNode: application withDescriptorMapper: layoutDescriptorMapper]];
SKDescriptorMapper* layoutDescriptorMapper =
[[SKDescriptorMapper alloc] initWithDefaults];
[client addPlugin:[[FlipperKitLayoutPlugin alloc]
initWithRootNode:application
withDescriptorMapper:layoutDescriptorMapper]];
[client addPlugin:[[FKUserDefaultsPlugin alloc] initWithSuiteName:nil]];
[client addPlugin:[FlipperKitReactPlugin new]];
[client addPlugin: [[FlipperKitNetworkPlugin alloc] initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
[client addPlugin:[[FlipperKitNetworkPlugin alloc]
initWithNetworkAdapter:[SKIOSNetworkAdapter new]]];
[client start];
#endif
}

3
react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExample/main.m
View File

@@ -11,6 +11,7 @@
int main(int argc, char* argv[]) {
@autoreleasepool {
return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
return UIApplicationMain(
argc, argv, nil, NSStringFromClass([AppDelegate class]));
}
}

35
react-native/ReactNativeFlipperExample/ios/ReactNativeFlipperExampleTests/ReactNativeFlipperExampleTests.m
View File

@@ -20,8 +20,7 @@
@implementation ReactNativeFlipperExampleTests
- (BOOL)findSubviewInView:(UIView *)view matching:(BOOL(^)(UIView *view))test
{
- (BOOL)findSubviewInView:(UIView*)view matching:(BOOL (^)(UIView* view))test {
if (test(view)) {
return YES;
}
@@ -33,15 +32,20 @@
return NO;
}
- (void)testRendersWelcomeScreen
{
UIViewController *vc = [[[RCTSharedApplication() delegate] window] rootViewController];
- (void)testRendersWelcomeScreen {
UIViewController* vc =
[[[RCTSharedApplication() delegate] window] rootViewController];
NSDate* date = [NSDate dateWithTimeIntervalSinceNow:TIMEOUT_SECONDS];
BOOL foundElement = NO;
__block NSString* redboxError = nil;
#ifdef DEBUG
RCTSetLogFunction(^(RCTLogLevel level, RCTLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
RCTSetLogFunction(
^(RCTLogLevel level,
RCTLogSource source,
NSString* fileName,
NSNumber* lineNumber,
NSString* message) {
if (level >= RCTLogLevelError) {
redboxError = message;
}
@@ -49,11 +53,15 @@
#endif
while ([date timeIntervalSinceNow] > 0 && !foundElement && !redboxError) {
[[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
[[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
[[NSRunLoop mainRunLoop] runMode:NSDefaultRunLoopMode
beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
[[NSRunLoop mainRunLoop] runMode:NSRunLoopCommonModes
beforeDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
foundElement = [self findSubviewInView:vc.view matching:^BOOL(UIView *view) {
if ([view.accessibilityLabel isEqualToString:TEXT_TO_LOOK_FOR]) {
foundElement = [self findSubviewInView:vc.view
matching:^BOOL(UIView* view) {
if ([view.accessibilityLabel
isEqualToString:TEXT_TO_LOOK_FOR]) {
return YES;
}
return NO;
@@ -65,8 +73,11 @@
#endif
XCTAssertNil(redboxError, @"RedBox error: %@", redboxError);
XCTAssertTrue(foundElement, @"Couldn't find element with text '%@' in %d seconds", TEXT_TO_LOOK_FOR, TIMEOUT_SECONDS);
XCTAssertTrue(
foundElement,
@"Couldn't find element with text '%@' in %d seconds",
TEXT_TO_LOOK_FOR,
TIMEOUT_SECONDS);
}
@end

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

@@ -9,18 +9,17 @@
#import "FlipperReactNativeJavaScriptPluginManager.h"
@implementation FlipperModule
{
@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];
}

2
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

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

@@ -12,16 +12,14 @@
#import "FlipperModule.h"
@implementation FlipperReactNativeJavaScriptPlugin
{
@implementation FlipperReactNativeJavaScriptPlugin {
NSString* _pluginId;
BOOL _inBackground;
}
- (instancetype)initWithFlipperModule:(FlipperModule*)module
pluginId:(NSString*)pluginId
inBackground:(BOOL)inBackground
{
inBackground:(BOOL)inBackground {
if (self = [super init]) {
_module = module;
_pluginId = pluginId;
@@ -30,42 +28,35 @@
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
{
- (id)pluginParams {
return @{@"plugin" : _pluginId};
}

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

@@ -22,7 +22,9 @@ NS_ASSUME_NONNULL_BEGIN
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
@@ -34,7 +36,8 @@ NS_ASSUME_NONNULL_BEGIN
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;

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

@@ -5,24 +5,21 @@
* 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
{
@implementation FlipperReactNativeJavaScriptPluginManager {
__weak FlipperClient* _flipperClient;
NSMutableDictionary<NSString*, id<FlipperResponder>>* _responders;
}
+ (instancetype)sharedInstance
{
+ (instancetype)sharedInstance {
static FlipperReactNativeJavaScriptPluginManager* sharedInstance = nil;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
@@ -31,8 +28,7 @@ static uint32_t FlipperResponderKeyGenerator = 0;
return sharedInstance;
}
- (instancetype)init
{
- (instancetype)init {
if (self = [super init]) {
_flipperClient = [FlipperClient sharedClient];
_responders = [NSMutableDictionary new];
@@ -43,15 +39,15 @@ static uint32_t FlipperResponderKeyGenerator = 0;
- (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" ]);
return;
}
FlipperReactNativeJavaScriptPlugin *existingPlugin = [self jsPluginWithIdentifier:pluginId];
FlipperReactNativeJavaScriptPlugin* existingPlugin =
[self jsPluginWithIdentifier:pluginId];
if (existingPlugin != nil) {
existingPlugin.module = module;
@@ -64,29 +60,31 @@ static uint32_t FlipperResponderKeyGenerator = 0;
}
FlipperReactNativeJavaScriptPlugin* newPlugin =
[[FlipperReactNativeJavaScriptPlugin alloc] initWithFlipperModule:module
[[FlipperReactNativeJavaScriptPlugin alloc]
initWithFlipperModule:module
pluginId:pluginId
inBackground:inBackground];
[_flipperClient addPlugin:newPlugin];
statusCallback(@[ @"ok" ]);
}
- (void)sendWithPluginId:(NSString *)pluginId method:(NSString *)method data:(NSString *)data
{
[[self jsPluginWithIdentifier:pluginId].connection send:method
- (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];
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;
@@ -95,50 +93,57 @@ static uint32_t FlipperResponderKeyGenerator = 0;
[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
{
method:(NSString*)method {
__weak __typeof(self) weakSelf = self;
[[self jsPluginWithIdentifier: pluginId].connection receive:method withBlock:^(NSDictionary * params, id<FlipperResponder> responder) {
[[self jsPluginWithIdentifier:pluginId].connection
receive:method
withBlock:^(NSDictionary* params, id<FlipperResponder> responder) {
__typeof(self) strongSelf = weakSelf;
NSMutableDictionary *body = [NSMutableDictionary dictionaryWithDictionary:@{
NSMutableDictionary* body =
[NSMutableDictionary dictionaryWithDictionary:@{
@"plugin" : pluginId,
@"method" : method,
@"params" : RCTJSONStringify(params, NULL),
}];
if (responder != nil) {
NSString *responderId = [NSString stringWithFormat:@"%d", FlipperResponderKeyGenerator++];
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