Fix shorthands with multiple digits

Author: jacobp100

src/grammar.ne

@@ -131,19 +131,19 @@ border
      } }) %}
 
 margin
-  -> number (_ number):* {% combineClockwiseShorthand('margin') %}
+  -> number (__ number):* {% combineClockwiseShorthand('margin') %}
 
 padding
-  -> number (_ number):* {% combineClockwiseShorthand('padding') %}
+  -> number (__ number):* {% combineClockwiseShorthand('padding') %}
 
 borderWidth
-  -> number (_ number):* {% combineClockwiseShorthand('border', undefined, 'Width') %}
+  -> number (__ number):* {% combineClockwiseShorthand('border', undefined, 'Width') %}
 
 borderColor
-  -> color (_ color):* {% combineClockwiseShorthand('border', undefined, 'Color') %}
+  -> color (__ color):* {% combineClockwiseShorthand('border', undefined, 'Color') %}
 
 borderRadius
-  -> number (_ number):* {%
+  -> number (__ number):* {%
        combineClockwiseShorthand('border', ['TopLeft', 'TopRight', 'BottomRight', 'BottomLeft'], 'Radius')
      %}
 
@@ -157,7 +157,7 @@ flexFlow
      } }) %}
 
 flex
-  -> number (_ number):* {% (d, location, reject) => {
+  -> number (__ number):* {% (d, location, reject) => {
        const values = combineHeadTail(d);
        if (values.length > 3) return reject;
        const [flexGrow, flexShrink = 1, flexBasis = 0] = values;

src/index.test.js

@@ -148,20 +148,20 @@ it('transforms border shorthand missing color & style', () => runTest([
 ], { borderWidth: 2, borderColor: 'black', borderStyle: 'solid' }));
 
 it('transforms margin shorthands using 4 values', () => runTest([
-  ['margin', '1 2 3 4'],
-], { marginTop: 1, marginRight: 2, marginBottom: 3, marginLeft: 4 }));
+  ['margin', '10 20 30 40'],
+], { marginTop: 10, marginRight: 20, marginBottom: 30, marginLeft: 40 }));
 
 it('transforms margin shorthands using 3 values', () => runTest([
-  ['margin', '1 2 3'],
-], { marginTop: 1, marginRight: 2, marginBottom: 3, marginLeft: 2 }));
+  ['margin', '10 20 30'],
+], { marginTop: 10, marginRight: 20, marginBottom: 30, marginLeft: 20 }));
 
 it('transforms margin shorthands using 2 values', () => runTest([
-  ['margin', '1 2'],
-], { marginTop: 1, marginRight: 2, marginBottom: 1, marginLeft: 2 }));
+  ['margin', '10 20'],
+], { marginTop: 10, marginRight: 20, marginBottom: 10, marginLeft: 20 }));
 
 it('transforms margin shorthands using 1 value', () => runTest([
-  ['margin', '1'],
-], { marginTop: 1, marginRight: 1, marginBottom: 1, marginLeft: 1 }));
+  ['margin', '10'],
+], { marginTop: 10, marginRight: 10, marginBottom: 10, marginLeft: 10 }));
 
 it('shorthand with 1 value should override previous values', () => runTest([
   ['margin-top', '2'],