Move the first option into the config object

Use the "spaces" name.
jsx-eslint · Jun 11, 2017 · 0f0ab21 · 0f0ab21
1 parent 8e547ea
commit 0f0ab21
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 80 deletions.
diff --git a/lib/rules/jsx-curly-spacing.js b/lib/rules/jsx-curly-spacing.js
@@ -32,10 +32,11 @@ module.exports = {
     fixable: 'code',
 
     schema: [{
-      enum: SPACING_VALUES
-    }, {
       type: 'object',
       properties: {
+        spaces: {
+          enum: SPACING_VALUES
+        },
         allowMultiline: {
           type: 'boolean'
         },
@@ -47,8 +48,7 @@ module.exports = {
             }
           }
         }
-      },
-      additionalProperties: false
+      }
     }]
   },
 
@@ -58,8 +58,8 @@ module.exports = {
     var DEFAULT_ALLOW_MULTILINE = true;
 
     var sourceCode = context.getSourceCode();
-    var baseSpacing = context.options[0] || DEFAULT_SPACING;
-    var config = context.options[1] || {};
+    var config = context.options[0] || {};
+    var baseSpacing = config.spaces || DEFAULT_SPACING;
     var multiline = has(config, 'allowMultiline') ? config.allowMultiline : DEFAULT_ALLOW_MULTILINE;
     var spacingConfig = config.spacing || {};
     var objectLiteralSpacing = spacingConfig.objectLiterals || baseSpacing;