From 6589b645186c7cd486c092eeb279befe7a3ae038 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Wed, 26 Feb 2020 21:26:48 -0800 Subject: [PATCH] Codemod: Clang-format for all files in `React/Fabric` directory Summary: We are moving towards 100%-prettified files. That's another step when we apply Clang Format for `React/Fabric`. Changelog: [Internal] Reviewed By: mdvacca Differential Revision: D20112417 fbshipit-source-id: 020d818e5cb8e2f509c5276738c8f252f6817a56 --- ...CTMountingTransactionObserverCoordinator.h | 5 +- React/Fabric/RCTConversions.h | 152 ++++++++++++------ React/Fabric/RCTSurfaceRegistry.mm | 2 +- 3 files changed, 106 insertions(+), 53 deletions(-) diff --git a/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h b/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h index 8c6bdefd843..512febedf16 100644 --- a/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h +++ b/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h @@ -16,8 +16,9 @@ class RCTMountingTransactionObserverCoordinator final { public: /* - * Registers (and unregisters) specified `componentViewDescriptor` in the registry of views that need to be notified. - * Does nothing if a particular `componentViewDescriptor` does not listen the events. + * Registers (and unregisters) specified `componentViewDescriptor` in the + * registry of views that need to be notified. Does nothing if a particular + * `componentViewDescriptor` does not listen the events. */ void registerViewComponentDescriptor( RCTComponentViewDescriptor const &componentViewDescriptor, diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h index 2d738071672..1491a6eb541 100644 --- a/React/Fabric/RCTConversions.h +++ b/React/Fabric/RCTConversions.h @@ -15,102 +15,154 @@ NS_ASSUME_NONNULL_BEGIN -inline NSString *RCTNSStringFromString(const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) { +inline NSString *RCTNSStringFromString( + const std::string &string, + const NSStringEncoding &encoding = NSUTF8StringEncoding) +{ return [NSString stringWithCString:string.c_str() encoding:encoding]; } -inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty(const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) { +inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty( + const std::string &string, + const NSStringEncoding &encoding = NSUTF8StringEncoding) +{ return string.empty() ? nil : RCTNSStringFromString(string, encoding); } -inline std::string RCTStringFromNSString(NSString *string, const NSStringEncoding &encoding = NSUTF8StringEncoding) { +inline std::string RCTStringFromNSString(NSString *string, const NSStringEncoding &encoding = NSUTF8StringEncoding) +{ return [string cStringUsingEncoding:encoding]; } -inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor) { +inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor) +{ return sharedColor ? [UIColor colorWithCGColor:sharedColor.get()] : nil; } -inline CF_RETURNS_NOT_RETAINED CGColorRef RCTCGColorRefUnretainedFromSharedColor(const facebook::react::SharedColor &sharedColor) { +inline CF_RETURNS_NOT_RETAINED CGColorRef +RCTCGColorRefUnretainedFromSharedColor(const facebook::react::SharedColor &sharedColor) +{ return sharedColor ? sharedColor.get() : nil; } -inline CF_RETURNS_RETAINED CGColorRef RCTCGColorRefFromSharedColor(const facebook::react::SharedColor &sharedColor) { +inline CF_RETURNS_RETAINED CGColorRef RCTCGColorRefFromSharedColor(const facebook::react::SharedColor &sharedColor) +{ return sharedColor ? CGColorCreateCopy(sharedColor.get()) : nil; } -inline CGPoint RCTCGPointFromPoint(const facebook::react::Point &point) { +inline CGPoint RCTCGPointFromPoint(const facebook::react::Point &point) +{ return {point.x, point.y}; } -inline CGSize RCTCGSizeFromSize(const facebook::react::Size &size) { +inline CGSize RCTCGSizeFromSize(const facebook::react::Size &size) +{ return {size.width, size.height}; } -inline CGRect RCTCGRectFromRect(const facebook::react::Rect &rect) { +inline CGRect RCTCGRectFromRect(const facebook::react::Rect &rect) +{ return {RCTCGPointFromPoint(rect.origin), RCTCGSizeFromSize(rect.size)}; } -inline UIEdgeInsets RCTUIEdgeInsetsFromEdgeInsets(const facebook::react::EdgeInsets &edgeInsets) { +inline UIEdgeInsets RCTUIEdgeInsetsFromEdgeInsets(const facebook::react::EdgeInsets &edgeInsets) +{ return {edgeInsets.top, edgeInsets.left, edgeInsets.bottom, edgeInsets.right}; } -inline UIAccessibilityTraits RCTUIAccessibilityTraitsFromAccessibilityTraits(facebook::react::AccessibilityTraits accessibilityTraits) { +inline UIAccessibilityTraits RCTUIAccessibilityTraitsFromAccessibilityTraits( + facebook::react::AccessibilityTraits accessibilityTraits) +{ using AccessibilityTraits = facebook::react::AccessibilityTraits; UIAccessibilityTraits result = UIAccessibilityTraitNone; - if ((accessibilityTraits & AccessibilityTraits::Button) != AccessibilityTraits::None) { result |= UIAccessibilityTraitButton; } - if ((accessibilityTraits & AccessibilityTraits::Link) != AccessibilityTraits::None) { result |= UIAccessibilityTraitLink; } - if ((accessibilityTraits & AccessibilityTraits::Image) != AccessibilityTraits::None) { result |= UIAccessibilityTraitImage; } - if ((accessibilityTraits & AccessibilityTraits::Selected) != AccessibilityTraits::None) { result |= UIAccessibilityTraitSelected; } - if ((accessibilityTraits & AccessibilityTraits::PlaysSound) != AccessibilityTraits::None) { result |= UIAccessibilityTraitPlaysSound; } - if ((accessibilityTraits & AccessibilityTraits::KeyboardKey) != AccessibilityTraits::None) { result |= UIAccessibilityTraitKeyboardKey; } - if ((accessibilityTraits & AccessibilityTraits::StaticText) != AccessibilityTraits::None) { result |= UIAccessibilityTraitStaticText; } - if ((accessibilityTraits & AccessibilityTraits::SummaryElement) != AccessibilityTraits::None) { result |= UIAccessibilityTraitSummaryElement; } - if ((accessibilityTraits & AccessibilityTraits::NotEnabled) != AccessibilityTraits::None) { result |= UIAccessibilityTraitNotEnabled; } - if ((accessibilityTraits & AccessibilityTraits::UpdatesFrequently) != AccessibilityTraits::None) { result |= UIAccessibilityTraitUpdatesFrequently; } - if ((accessibilityTraits & AccessibilityTraits::SearchField) != AccessibilityTraits::None) { result |= UIAccessibilityTraitSearchField; } - if ((accessibilityTraits & AccessibilityTraits::StartsMediaSession) != AccessibilityTraits::None) { result |= UIAccessibilityTraitStartsMediaSession; } - if ((accessibilityTraits & AccessibilityTraits::Adjustable) != AccessibilityTraits::None) { result |= UIAccessibilityTraitAdjustable; } - if ((accessibilityTraits & AccessibilityTraits::AllowsDirectInteraction) != AccessibilityTraits::None) { result |= UIAccessibilityTraitAllowsDirectInteraction; } - if ((accessibilityTraits & AccessibilityTraits::CausesPageTurn) != AccessibilityTraits::None) { result |= UIAccessibilityTraitCausesPageTurn; } - if ((accessibilityTraits & AccessibilityTraits::Header) != AccessibilityTraits::None) { result |= UIAccessibilityTraitHeader; } + if ((accessibilityTraits & AccessibilityTraits::Button) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitButton; + } + if ((accessibilityTraits & AccessibilityTraits::Link) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitLink; + } + if ((accessibilityTraits & AccessibilityTraits::Image) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitImage; + } + if ((accessibilityTraits & AccessibilityTraits::Selected) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitSelected; + } + if ((accessibilityTraits & AccessibilityTraits::PlaysSound) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitPlaysSound; + } + if ((accessibilityTraits & AccessibilityTraits::KeyboardKey) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitKeyboardKey; + } + if ((accessibilityTraits & AccessibilityTraits::StaticText) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitStaticText; + } + if ((accessibilityTraits & AccessibilityTraits::SummaryElement) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitSummaryElement; + } + if ((accessibilityTraits & AccessibilityTraits::NotEnabled) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitNotEnabled; + } + if ((accessibilityTraits & AccessibilityTraits::UpdatesFrequently) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitUpdatesFrequently; + } + if ((accessibilityTraits & AccessibilityTraits::SearchField) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitSearchField; + } + if ((accessibilityTraits & AccessibilityTraits::StartsMediaSession) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitStartsMediaSession; + } + if ((accessibilityTraits & AccessibilityTraits::Adjustable) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitAdjustable; + } + if ((accessibilityTraits & AccessibilityTraits::AllowsDirectInteraction) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitAllowsDirectInteraction; + } + if ((accessibilityTraits & AccessibilityTraits::CausesPageTurn) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitCausesPageTurn; + } + if ((accessibilityTraits & AccessibilityTraits::Header) != AccessibilityTraits::None) { + result |= UIAccessibilityTraitHeader; + } return result; }; -inline CATransform3D RCTCATransform3DFromTransformMatrix(const facebook::react::Transform &transformMatrix) { - return { - (CGFloat)transformMatrix.matrix[0], - (CGFloat)transformMatrix.matrix[1], - (CGFloat)transformMatrix.matrix[2], - (CGFloat)transformMatrix.matrix[3], - (CGFloat)transformMatrix.matrix[4], - (CGFloat)transformMatrix.matrix[5], - (CGFloat)transformMatrix.matrix[6], - (CGFloat)transformMatrix.matrix[7], - (CGFloat)transformMatrix.matrix[8], - (CGFloat)transformMatrix.matrix[9], - (CGFloat)transformMatrix.matrix[10], - (CGFloat)transformMatrix.matrix[11], - (CGFloat)transformMatrix.matrix[12], - (CGFloat)transformMatrix.matrix[13], - (CGFloat)transformMatrix.matrix[14], - (CGFloat)transformMatrix.matrix[15] - }; +inline CATransform3D RCTCATransform3DFromTransformMatrix(const facebook::react::Transform &transformMatrix) +{ + return {(CGFloat)transformMatrix.matrix[0], + (CGFloat)transformMatrix.matrix[1], + (CGFloat)transformMatrix.matrix[2], + (CGFloat)transformMatrix.matrix[3], + (CGFloat)transformMatrix.matrix[4], + (CGFloat)transformMatrix.matrix[5], + (CGFloat)transformMatrix.matrix[6], + (CGFloat)transformMatrix.matrix[7], + (CGFloat)transformMatrix.matrix[8], + (CGFloat)transformMatrix.matrix[9], + (CGFloat)transformMatrix.matrix[10], + (CGFloat)transformMatrix.matrix[11], + (CGFloat)transformMatrix.matrix[12], + (CGFloat)transformMatrix.matrix[13], + (CGFloat)transformMatrix.matrix[14], + (CGFloat)transformMatrix.matrix[15]}; } -inline facebook::react::Point RCTPointFromCGPoint(const CGPoint &point) { +inline facebook::react::Point RCTPointFromCGPoint(const CGPoint &point) +{ return {point.x, point.y}; } -inline facebook::react::Size RCTSizeFromCGSize(const CGSize &size) { +inline facebook::react::Size RCTSizeFromCGSize(const CGSize &size) +{ return {size.width, size.height}; } -inline facebook::react::Rect RCTRectFromCGRect(const CGRect &rect) { +inline facebook::react::Rect RCTRectFromCGRect(const CGRect &rect) +{ return {RCTPointFromCGPoint(rect.origin), RCTSizeFromCGSize(rect.size)}; } -inline facebook::react::EdgeInsets RCTEdgeInsetsFromUIEdgeInsets(const UIEdgeInsets &edgeInsets) { +inline facebook::react::EdgeInsets RCTEdgeInsetsFromUIEdgeInsets(const UIEdgeInsets &edgeInsets) +{ return {edgeInsets.left, edgeInsets.top, edgeInsets.right, edgeInsets.bottom}; } diff --git a/React/Fabric/RCTSurfaceRegistry.mm b/React/Fabric/RCTSurfaceRegistry.mm index f4e1313f15e..25487f3d74b 100644 --- a/React/Fabric/RCTSurfaceRegistry.mm +++ b/React/Fabric/RCTSurfaceRegistry.mm @@ -7,9 +7,9 @@ #import "RCTSurfaceRegistry.h" +#import #import #import -#import #import