Apply clang-format update fixes

Reviewed By: igorsugak Differential Revision: D25861849 fbshipit-source-id: 840dc1061e557717c7f9ffcccbc09c24b96b78e0
cntrump · Jan 10, 2021 · 584dfe9 · 584dfe9
1 parent a38ec3d
commit 584dfe9
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 50 deletions.
diff --git a/YogaKit/YogaKitSample/YogaKitSample/ViewController.m b/YogaKit/YogaKitSample/YogaKitSample/ViewController.m
@@ -28,17 +28,19 @@ - (void)viewDidLoad {
 
   UIView* child2 = [UIView new];
   child2.backgroundColor = [UIColor greenColor];
-  child2.frame = (CGRect){.size = {
-                              .width = 200,
-                              .height = 100,
-                          }};
+  child2.frame = (CGRect){
+      .size = {
+          .width = 200,
+          .height = 100,
+      }};
 
   UIView* child3 = [UIView new];
   child3.backgroundColor = [UIColor yellowColor];
-  child3.frame = (CGRect){.size = {
-                              .width = 100,
-                              .height = 100,
-                          }};
+  child3.frame = (CGRect){
+      .size = {
+          .width = 100,
+          .height = 100,
+      }};
 
   [child2 addSubview:child3];
   [root addSubview:child1];

diff --git a/javascript/sources/Node.cc b/javascript/sources/Node.cc
@@ -23,8 +23,8 @@ static YGSize globalMeasureFunc(
   Node const& node = *reinterpret_cast<Node const*>(YGNodeGetContext(nodeRef));
 
   Size size = node.callMeasureFunc(width, widthMode, height, heightMode);
-  YGSize ygSize = {static_cast<float>(size.width),
-                   static_cast<float>(size.height)};
+  YGSize ygSize = {
+      static_cast<float>(size.width), static_cast<float>(size.height)};
 
   return ygSize;
 }

diff --git a/tests/EventsTest.cpp b/tests/EventsTest.cpp
@@ -303,8 +303,8 @@ EventArgs createArgs(
   };
 
   EventArgs args = createArgs<E>(node, data);
-  args.eventTestDataPtr = {new EventTestData{eventTestData},
-                           deleteEventTestData};
+  args.eventTestDataPtr = {
+      new EventTestData{eventTestData}, deleteEventTestData};
   return args;
 }
 

diff --git a/tests/YGComputedMarginTest.cpp b/tests/YGComputedMarginTest.cpp
@@ -29,12 +29,13 @@ TEST(YogaTest, computed_layout_margin) {
 }
 
 TEST(YogaTest, margin_side_overrides_horizontal_and_vertical) {
-  const std::array<YGEdge, 6> edges = {{YGEdgeTop,
-                                        YGEdgeBottom,
-                                        YGEdgeStart,
-                                        YGEdgeEnd,
-                                        YGEdgeLeft,
-                                        YGEdgeRight}};
+  const std::array<YGEdge, 6> edges = {
+      {YGEdgeTop,
+       YGEdgeBottom,
+       YGEdgeStart,
+       YGEdgeEnd,
+       YGEdgeLeft,
+       YGEdgeRight}};
 
   for (float edgeValue = 0; edgeValue < 2; ++edgeValue) {
     for (const auto& edge : edges) {
@@ -58,12 +59,13 @@ TEST(YogaTest, margin_side_overrides_horizontal_and_vertical) {
 }
 
 TEST(YogaTest, margin_side_overrides_all) {
-  const std::array<YGEdge, 6> edges = {{YGEdgeTop,
-                                        YGEdgeBottom,
-                                        YGEdgeStart,
-                                        YGEdgeEnd,
-                                        YGEdgeLeft,
-                                        YGEdgeRight}};
+  const std::array<YGEdge, 6> edges = {
+      {YGEdgeTop,
+       YGEdgeBottom,
+       YGEdgeStart,
+       YGEdgeEnd,
+       YGEdgeLeft,
+       YGEdgeRight}};
 
   for (float edgeValue = 0; edgeValue < 2; ++edgeValue) {
     for (const auto& edge : edges) {

diff --git a/tests/YGComputedPaddingTest.cpp b/tests/YGComputedPaddingTest.cpp
@@ -29,12 +29,13 @@ TEST(YogaTest, computed_layout_padding) {
 }
 
 TEST(YogaTest, padding_side_overrides_horizontal_and_vertical) {
-  const std::array<YGEdge, 6> edges = {{YGEdgeTop,
-                                        YGEdgeBottom,
-                                        YGEdgeStart,
-                                        YGEdgeEnd,
-                                        YGEdgeLeft,
-                                        YGEdgeRight}};
+  const std::array<YGEdge, 6> edges = {
+      {YGEdgeTop,
+       YGEdgeBottom,
+       YGEdgeStart,
+       YGEdgeEnd,
+       YGEdgeLeft,
+       YGEdgeRight}};
 
   for (float edgeValue = 0; edgeValue < 2; ++edgeValue) {
     for (const auto& edge : edges) {
@@ -58,12 +59,13 @@ TEST(YogaTest, padding_side_overrides_horizontal_and_vertical) {
 }
 
 TEST(YogaTest, padding_side_overrides_all) {
-  const std::array<YGEdge, 6> edges = {{YGEdgeTop,
-                                        YGEdgeBottom,
-                                        YGEdgeStart,
-                                        YGEdgeEnd,
-                                        YGEdgeLeft,
-                                        YGEdgeRight}};
+  const std::array<YGEdge, 6> edges = {
+      {YGEdgeTop,
+       YGEdgeBottom,
+       YGEdgeStart,
+       YGEdgeEnd,
+       YGEdgeLeft,
+       YGEdgeRight}};
 
   for (float edgeValue = 0; edgeValue < 2; ++edgeValue) {
     for (const auto& edge : edges) {

diff --git a/tests/YGTreeMutationTest.cpp b/tests/YGTreeMutationTest.cpp
@@ -29,8 +29,8 @@ TEST(YogaTest, set_children_adds_children_to_parent) {
   const std::vector<YGNodeRef> expectedChildren = {root_child0, root_child1};
   ASSERT_EQ(children, expectedChildren);
 
-  const std::vector<YGNodeRef> owners = {YGNodeGetOwner(root_child0),
-                                         YGNodeGetOwner(root_child1)};
+  const std::vector<YGNodeRef> owners = {
+      YGNodeGetOwner(root_child0), YGNodeGetOwner(root_child1)};
   const std::vector<YGNodeRef> expectedOwners = {root, root};
   ASSERT_EQ(owners, expectedOwners);
 
@@ -49,8 +49,8 @@ TEST(YogaTest, set_children_to_empty_removes_old_children) {
   const std::vector<YGNodeRef> expectedChildren = {};
   ASSERT_EQ(children, expectedChildren);
 
-  const std::vector<YGNodeRef> owners = {YGNodeGetOwner(root_child0),
-                                         YGNodeGetOwner(root_child1)};
+  const std::vector<YGNodeRef> owners = {
+      YGNodeGetOwner(root_child0), YGNodeGetOwner(root_child1)};
   const std::vector<YGNodeRef> expectedOwners = {nullptr, nullptr};
   ASSERT_EQ(owners, expectedOwners);
 
@@ -73,8 +73,8 @@ TEST(YogaTest, set_children_replaces_non_common_children) {
   const std::vector<YGNodeRef> expectedChildren = {root_child2, root_child3};
   ASSERT_EQ(children, expectedChildren);
 
-  const std::vector<YGNodeRef> owners = {YGNodeGetOwner(root_child0),
-                                         YGNodeGetOwner(root_child1)};
+  const std::vector<YGNodeRef> owners = {
+      YGNodeGetOwner(root_child0), YGNodeGetOwner(root_child1)};
   const std::vector<YGNodeRef> expectedOwners = {nullptr, nullptr};
   ASSERT_EQ(owners, expectedOwners);
 
@@ -100,10 +100,11 @@ TEST(YogaTest, set_children_keeps_and_reorders_common_children) {
       root_child2, root_child1, root_child3};
   ASSERT_EQ(children, expectedChildren);
 
-  const std::vector<YGNodeRef> owners = {YGNodeGetOwner(root_child0),
-                                         YGNodeGetOwner(root_child1),
-                                         YGNodeGetOwner(root_child2),
-                                         YGNodeGetOwner(root_child3)};
+  const std::vector<YGNodeRef> owners = {
+      YGNodeGetOwner(root_child0),
+      YGNodeGetOwner(root_child1),
+      YGNodeGetOwner(root_child2),
+      YGNodeGetOwner(root_child3)};
   const std::vector<YGNodeRef> expectedOwners = {nullptr, root, root, root};
   ASSERT_EQ(owners, expectedOwners);
 

diff --git a/yoga/CompactValue.h b/yoga/CompactValue.h
@@ -125,8 +125,8 @@ class YOGA_EXPORT CompactValue {
     data.repr &= ~PERCENT_BIT;
     data.repr += BIAS;
 
-    return YGValue{data.value,
-                   payload_.repr & 0x40000000 ? YGUnitPercent : YGUnitPoint};
+    return YGValue{
+        data.value, payload_.repr & 0x40000000 ? YGUnitPercent : YGUnitPoint};
   }
 
   bool isUndefined() const noexcept {

diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp
@@ -3531,8 +3531,8 @@ static void YGNodelayoutImpl(
                 YGNodeBoundAxisWithinMinAndMax(
                     node,
                     crossAxis,
-                    YGFloatOptional{totalLineCrossDim +
-                                    paddingAndBorderAxisCross},
+                    YGFloatOptional{
+                        totalLineCrossDim + paddingAndBorderAxisCross},
                     crossAxisownerSize)
                     .unwrap()),
             paddingAndBorderAxisCross),