Merge pull request #18 from xjamundx/standard

Fixes for standard style
standard · Mar 2, 2017 · ace8bf0 · ace8bf0
2 parents c80916a + 9bcb245
commit ace8bf0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,8 @@
   "dependencies": {},
   "devDependencies": {
     "eslint": "^3.0.1",
-    "mocha": "^2.2.5"
+    "mocha": "^2.2.5",
+    "standard": "*"
   },
   "homepage": "https://github.com/xjamundx/eslint-plugin-standard#readme",
   "keywords": [

diff --git a/rules/array-bracket-even-spacing.js b/rules/array-bracket-even-spacing.js
@@ -138,15 +138,15 @@ module.exports = {
       var last = context.getLastToken(node)
 
       var openingBracketMustBeSpaced =
-      options.objectsInArraysException && second.value === '{' ||
-      options.arraysInArraysException && second.value === '[' ||
-      options.singleElementException && node.elements.length === 1
+      (options.objectsInArraysException && second.value === '{') ||
+      (options.arraysInArraysException && second.value === '[') ||
+      (options.singleElementException && node.elements.length === 1)
         ? !options.spaced : options.spaced
 
       var closingBracketMustBeSpaced =
-      options.objectsInArraysException && penultimate.value === '}' ||
-      options.arraysInArraysException && penultimate.value === ']' ||
-      options.singleElementException && node.elements.length === 1
+      (options.objectsInArraysException && penultimate.value === '}') ||
+      (options.arraysInArraysException && penultimate.value === ']') ||
+      (options.singleElementException && node.elements.length === 1)
         ? !options.spaced : options.spaced
 
       // we only care about evenly spaced things

diff --git a/rules/object-curly-even-spacing.js b/rules/object-curly-even-spacing.js
@@ -132,8 +132,8 @@ module.exports = {
      */
     function validateBraceSpacing (node, first, second, penultimate, last) {
       var closingCurlyBraceMustBeSpaced =
-      options.arraysInObjectsException && penultimate.value === ']' ||
-      options.objectsInObjectsException && penultimate.value === '}'
+      (options.arraysInObjectsException && penultimate.value === ']') ||
+      (options.objectsInObjectsException && penultimate.value === '}')
         ? !options.spaced : options.spaced
 
       // we only care about evenly spaced things