Fix assertion preventing YGNodeLayoutGet* with YGEdgeEnd

Summary: Expected to be able to call `YGNodeLayoutGetMargin(node, YGEdgeEnd)`, but instead, the program aborts with `"Cannot get layout properties of multi-edge shorthands"`. This bug seems to incorrectly prevent properties from YGEdgeEnd for all Layout properties. Closes facebook/yoga#632 Differential Revision: D6408060 Pulled By: emilsjolander fbshipit-source-id: 4ab3b2ffb2f1bb6fd3a27f780caf0123abcdb230
bowerman0 · Dec 5, 2017 · 33becbd · 33becbd
1 parent e92932b
commit 33becbd
Showing 1 changed file with 24 additions and 23 deletions.
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -657,29 +657,30 @@ static inline const YGValue *YGNodeResolveFlexBasisPtr(const YGNodeRef node) {
     return node->layout.instanceName;                          \
   }
 
-#define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName)        \
-  type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge) {        \
-    YGAssertWithNode(node,                                                     \
-                     edge < YGEdgeEnd,                                         \
-                     "Cannot get layout properties of multi-edge shorthands"); \
-                                                                               \
-    if (edge == YGEdgeLeft) {                                                  \
-      if (node->layout.direction == YGDirectionRTL) {                          \
-        return node->layout.instanceName[YGEdgeEnd];                           \
-      } else {                                                                 \
-        return node->layout.instanceName[YGEdgeStart];                         \
-      }                                                                        \
-    }                                                                          \
-                                                                               \
-    if (edge == YGEdgeRight) {                                                 \
-      if (node->layout.direction == YGDirectionRTL) {                          \
-        return node->layout.instanceName[YGEdgeStart];                         \
-      } else {                                                                 \
-        return node->layout.instanceName[YGEdgeEnd];                           \
-      }                                                                        \
-    }                                                                          \
-                                                                               \
-    return node->layout.instanceName[edge];                                    \
+#define YG_NODE_LAYOUT_RESOLVED_PROPERTY_IMPL(type, name, instanceName) \
+  type YGNodeLayoutGet##name(const YGNodeRef node, const YGEdge edge) { \
+    YGAssertWithNode(                                                   \
+        node,                                                           \
+        edge <= YGEdgeEnd,                                              \
+        "Cannot get layout properties of multi-edge shorthands");       \
+                                                                        \
+    if (edge == YGEdgeLeft) {                                           \
+      if (node->layout.direction == YGDirectionRTL) {                   \
+        return node->layout.instanceName[YGEdgeEnd];                    \
+      } else {                                                          \
+        return node->layout.instanceName[YGEdgeStart];                  \
+      }                                                                 \
+    }                                                                   \
+                                                                        \
+    if (edge == YGEdgeRight) {                                          \
+      if (node->layout.direction == YGDirectionRTL) {                   \
+        return node->layout.instanceName[YGEdgeStart];                  \
+      } else {                                                          \
+        return node->layout.instanceName[YGEdgeEnd];                    \
+      }                                                                 \
+    }                                                                   \
+                                                                        \
+    return node->layout.instanceName[edge];                             \
   }
 
 YG_NODE_PROPERTY_IMPL(void *, Context, context, context);