From 39172f6413d26612b2d62d63391218dfbe31c864 Mon Sep 17 00:00:00 2001 From: Andres Suarez Date: Thu, 20 May 2021 21:22:47 -0700 Subject: [PATCH] Apply clang-format Reviewed By: igorsugak Differential Revision: D28477074 fbshipit-source-id: f15dfc45b9fb30c661ebe2899cd882676d0fdf2a --- .../FLEXNetworkLib/FLEXNetworkObserver.mm | 60 ++++++++++++------- .../Flipper/FlipperConnectionManagerImpl.cpp | 8 +-- 2 files changed, 41 insertions(+), 27 deletions(-) diff --git a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm index 838e52910..1c5b28182 100644 --- a/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm +++ b/iOS/Plugins/FlipperKitNetworkPlugin/SKIOSNetworkPlugin/FLEXNetworkLib/FLEXNetworkObserver.mm @@ -430,8 +430,8 @@ typedef void (^NSURLSessionAsyncCompletion)( SEL selector = @selector(sendSynchronousRequest:returningResponse:error:); SEL swizzledSelector = [FLEXUtility swizzledSelectorForSelector:selector]; - NSData* (^syncSwizzleBlock)( - Class, NSURLRequest*, NSURLResponse**, NSError**) = + NSData* ( + ^syncSwizzleBlock)(Class, NSURLRequest*, NSURLResponse**, NSError**) = ^NSData*( Class slf, NSURLRequest* request, @@ -449,8 +449,9 @@ typedef void (^NSURLSessionAsyncCompletion)( forRequestID:requestID]; NSError* temporaryError = nil; NSURLResponse* temporaryResponse = nil; - data = ((id(*)(id, SEL, id, NSURLResponse**, NSError**))objc_msgSend)( - slf, swizzledSelector, request, &temporaryResponse, &temporaryError); + data = + ((id(*)(id, SEL, id, NSURLResponse**, NSError**)) + objc_msgSend)(slf, swizzledSelector, request, &temporaryResponse, &temporaryError); [[FLEXNetworkRecorder defaultRecorder] recordResponseReceivedWithRequestID:requestID response:temporaryResponse]; @@ -511,8 +512,8 @@ typedef void (^NSURLSessionAsyncCompletion)( className = [[NSURLSession sharedSession] class]; } - NSURLSessionTask* (^asyncDataOrDownloadSwizzleBlock)( - Class, id, NSURLSessionAsyncCompletion) = + NSURLSessionTask* ( + ^asyncDataOrDownloadSwizzleBlock)(Class, id, NSURLSessionAsyncCompletion) = ^NSURLSessionTask*( Class slf, id argument, NSURLSessionAsyncCompletion completion) { NSURLSessionTask* task = nil; @@ -528,12 +529,16 @@ typedef void (^NSURLSessionAsyncCompletion)( [self asyncCompletionWrapperForRequestID:requestID mechanism:mechanism completion:completion]; - task = ((id(*)(id, SEL, id, id))objc_msgSend)( - slf, swizzledSelector, argument, completionWrapper); + task = ((id(*)( + id, + SEL, + id, + id))objc_msgSend)(slf, swizzledSelector, argument, completionWrapper); [self setRequestID:requestID forConnectionOrTask:task]; } else { - task = ((id(*)(id, SEL, id, id))objc_msgSend)( - slf, swizzledSelector, argument, completion); + task = + ((id(*)(id, SEL, id, id)) + objc_msgSend)(slf, swizzledSelector, argument, completion); } return task; }; @@ -574,8 +579,8 @@ typedef void (^NSURLSessionAsyncCompletion)( className = [[NSURLSession sharedSession] class]; } - NSURLSessionUploadTask* (^asyncUploadTaskSwizzleBlock)( - Class, NSURLRequest*, id, NSURLSessionAsyncCompletion) = + NSURLSessionUploadTask* ( + ^asyncUploadTaskSwizzleBlock)(Class, NSURLRequest*, id, NSURLSessionAsyncCompletion) = ^NSURLSessionUploadTask*( Class slf, NSURLRequest* request, @@ -590,12 +595,20 @@ typedef void (^NSURLSessionAsyncCompletion)( [self asyncCompletionWrapperForRequestID:requestID mechanism:mechanism completion:completion]; - task = ((id(*)(id, SEL, id, id, id))objc_msgSend)( - slf, swizzledSelector, request, argument, completionWrapper); + task = ((id(*)( + id, + SEL, + id, + id, + id))objc_msgSend)(slf, swizzledSelector, request, argument, completionWrapper); [self setRequestID:requestID forConnectionOrTask:task]; } else { - task = ((id(*)(id, SEL, id, id, id))objc_msgSend)( - slf, swizzledSelector, request, argument, completion); + task = ((id(*)( + id, + SEL, + id, + id, + id))objc_msgSend)(slf, swizzledSelector, request, argument, completion); } return task; }; @@ -665,11 +678,8 @@ typedef void (^NSURLSessionAsyncCompletion)( struct objc_method_description methodDescription = protocol_getMethodDescription(protocol, selector, NO, YES); - typedef NSURLRequest* (^NSURLConnectionWillSendRequestBlock)( - id slf, - NSURLConnection* connection, - NSURLRequest* request, - NSURLResponse* response); + typedef NSURLRequest* ( + ^NSURLConnectionWillSendRequestBlock)(id slf, NSURLConnection* connection, NSURLRequest* request, NSURLResponse* response); NSURLConnectionWillSendRequestBlock undefinedBlock = ^NSURLRequest*( id slf, @@ -695,8 +705,12 @@ typedef void (^NSURLSessionAsyncCompletion)( undefinedBlock(slf, connection, request, response); } originalImplementationBlock:^{ - returnValue = ((id(*)(id, SEL, id, id, id))objc_msgSend)( - slf, swizzledSelector, connection, request, response); + returnValue = ((id(*)( + id, + SEL, + id, + id, + id))objc_msgSend)(slf, swizzledSelector, connection, request, response); }]; return returnValue; }; diff --git a/xplat/Flipper/FlipperConnectionManagerImpl.cpp b/xplat/Flipper/FlipperConnectionManagerImpl.cpp index 83fb2631a..4e470615e 100644 --- a/xplat/Flipper/FlipperConnectionManagerImpl.cpp +++ b/xplat/Flipper/FlipperConnectionManagerImpl.cpp @@ -362,10 +362,10 @@ void FlipperConnectionManagerImpl::requestSignedCertFromFlipper() { int medium = certProvider_ != nullptr ? certProvider_->getCertificateExchangeMedium() : FlipperCertificateExchangeMedium::FS_ACCESS; - folly::dynamic message = - folly::dynamic::object("method", "signCertificate")("csr", csr.c_str())( - "destination", contextStore_->getCertificateDirectoryPath().c_str())( - "medium", medium); + folly::dynamic message = folly::dynamic::object("method", "signCertificate")( + "csr", csr.c_str())( + "destination", + contextStore_->getCertificateDirectoryPath().c_str())("medium", medium); auto gettingCert = flipperState_->start("Getting cert from desktop"); flipperEventBase_->add([this, message, gettingCert]() {