Merge pull request #34 from standard/object-shorthand

standard · May 17, 2020 · ddbab93 · ddbab93
2 parents cf5608a + 6cee02b
commit ddbab93
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 114 deletions.
diff --git a/rules/array-bracket-even-spacing.js b/rules/array-bracket-even-spacing.js
@@ -35,8 +35,8 @@ module.exports = {
     }
 
     var options = {
-      either: either,
-      spaced: spaced,
+      either,
+      spaced,
       singleElementException: isOptionSet('singleValue'),
       objectsInArraysException: isOptionSet('objectsInArrays'),
       arraysInArraysException: isOptionSet('arraysInArrays')

diff --git a/rules/object-curly-even-spacing.js b/rules/object-curly-even-spacing.js
@@ -35,8 +35,8 @@ module.exports = {
     }
 
     var options = {
-      spaced: spaced,
-      either: either,
+      spaced,
+      either,
       arraysInObjectsException: isOptionSet('arraysInObjects'),
       objectsInObjectsException: isOptionSet('objectsInObjects')
     }

diff --git a/tests/array-bracket-even-spacing.js b/tests/array-bracket-even-spacing.js
@@ -29,10 +29,10 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     { code: 'var x = [\na,b,c\n]', options: ['either'] },
     { code: 'var x = [\n\ta,b,c\n]', options: ['either'] },
     { code: 'var foo = [];', options: ['either'] },
-    { code: 'var [x] = y', options: ['either'], parserOptions: parserOptions },
-    { code: 'var [ x ] = y', options: ['either'], parserOptions: parserOptions },
-    { code: 'var [\nx\n] = y', options: ['either'], parserOptions: parserOptions },
-    { code: 'var [\n\tx\n] = y', options: ['either'], parserOptions: parserOptions },
+    { code: 'var [x] = y', options: ['either'], parserOptions },
+    { code: 'var [ x ] = y', options: ['either'], parserOptions },
+    { code: 'var [\nx\n] = y', options: ['either'], parserOptions },
+    { code: 'var [\n\tx\n] = y', options: ['either'], parserOptions },
 
     { code: 'var foo = obj[ 1 ]', options: ['always'] },
     { code: "var foo = obj[ 'foo' ];", options: ['always'] },
@@ -83,16 +83,16 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     { code: "this.db.mappings.insert([\n { alias: 'a', url: 'http://www.amazon.de' },\n { alias: 'g', url: 'http://www.google.de' }\n], function() {});", options: ['always', { singleValue: false, objectsInArrays: true, arraysInArrays: true }] },
 
     // always - destructuring assignment
-    { code: 'var [ x, y ] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [ x,y ] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [ x, y\n] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [\nx, y ] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [\nx,,,\n] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [ ,x, ] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [\nx, ...y\n] = z', parserOptions: parserOptions, options: ['always'] },
-    { code: 'var [\nx, ...y ] = z', parserOptions: parserOptions, options: ['always'] },
+    { code: 'var [ x, y ] = z', parserOptions, options: ['always'] },
+    { code: 'var [ x,y ] = z', parserOptions, options: ['always'] },
+    { code: 'var [ x, y\n] = z', parserOptions, options: ['always'] },
+    { code: 'var [\nx, y ] = z', parserOptions, options: ['always'] },
+    { code: 'var [\nx, y\n] = z', parserOptions, options: ['always'] },
+    { code: 'var [\nx, y\n] = z', parserOptions, options: ['always'] },
+    { code: 'var [\nx,,,\n] = z', parserOptions, options: ['always'] },
+    { code: 'var [ ,x, ] = z', parserOptions, options: ['always'] },
+    { code: 'var [\nx, ...y\n] = z', parserOptions, options: ['always'] },
+    { code: 'var [\nx, ...y ] = z', parserOptions, options: ['always'] },
 
     // never
     { code: 'obj[foo]', options: ['never'] },
@@ -113,16 +113,16 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     { code: 'var arr = [\n1,\n2,\n3,\n4];', options: ['never'] },
 
     // never - destructuring assignment
-    { code: 'var [x, y] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [x,y] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [x, y\n] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [\nx, y] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [\nx,,,\n] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [,x,] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [\nx, ...y\n] = z', parserOptions: parserOptions, options: ['never'] },
-    { code: 'var [\nx, ...y] = z', parserOptions: parserOptions, options: ['never'] },
+    { code: 'var [x, y] = z', parserOptions, options: ['never'] },
+    { code: 'var [x,y] = z', parserOptions, options: ['never'] },
+    { code: 'var [x, y\n] = z', parserOptions, options: ['never'] },
+    { code: 'var [\nx, y] = z', parserOptions, options: ['never'] },
+    { code: 'var [\nx, y\n] = z', parserOptions, options: ['never'] },
+    { code: 'var [\nx, y\n] = z', parserOptions, options: ['never'] },
+    { code: 'var [\nx,,,\n] = z', parserOptions, options: ['never'] },
+    { code: 'var [,x,] = z', parserOptions, options: ['never'] },
+    { code: 'var [\nx, ...y\n] = z', parserOptions, options: ['never'] },
+    { code: 'var [\nx, ...y] = z', parserOptions, options: ['never'] },
 
     // never - singleValue
     { code: "var foo = [ 'foo' ]", options: ['never', { singleValue: true }] },
@@ -168,7 +168,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [ x] = y',
       options: ['either'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: 'Expected consistent spacing',
@@ -182,7 +182,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [ x,y,z] = y',
       options: ['either'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: 'Expected consistent spacing',
@@ -196,7 +196,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [ x  ] = y',
       options: ['either'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: 'Expected consistent spacing',
@@ -209,7 +209,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var x = [ x, y]',
       options: ['either'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: 'Expected consistent spacing',
@@ -222,7 +222,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var x = [  x, y  ]',
       options: ['either'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: 'Expected consistent spacing',
@@ -394,7 +394,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [x,y] = y',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [{
         message: "A space is required after '['",
         type: 'ArrayPattern',
@@ -409,7 +409,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [x,y ] = y',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [{
         message: "A space is required after '['",
         type: 'ArrayPattern',
@@ -419,7 +419,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [,,,x,,] = y',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [{
         message: "A space is required after '['",
         type: 'ArrayPattern',
@@ -434,7 +434,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [ ,,,x,,] = y',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [{
         message: "A space is required before ']'",
         type: 'ArrayPattern',
@@ -444,7 +444,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [...horse] = y',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [{
         message: "A space is required after '['",
         type: 'ArrayPattern',
@@ -459,7 +459,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
     {
       code: 'var [...horse ] = y',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [{
         message: "A space is required after '['",
         type: 'ArrayPattern',

diff --git a/tests/computed-property-even-spacing.js b/tests/computed-property-even-spacing.js
@@ -31,7 +31,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     // default - never
     { code: 'obj[foo]' },
     { code: "obj['foo']" },
-    { code: 'var x = {[b]: a}', parserOptions: parserOptions },
+    { code: 'var x = {[b]: a}', parserOptions },
 
     // always
     { code: 'obj[ foo ]', options: ['always'] },
@@ -48,10 +48,10 @@ ruleTester.run('computed-property-even-spacing', rule, {
     { code: 'var foo = obj[ [1, 1] ];', options: ['always'] },
 
     // always - objectLiteralComputedProperties
-    { code: 'var x = {[ "a" ]: a}', options: ['always'], parserOptions: parserOptions },
-    { code: 'var y = {[ x ]: a}', options: ['always'], parserOptions: parserOptions },
-    { code: 'var x = {[ "a" ]() {}}', options: ['always'], parserOptions: parserOptions },
-    { code: 'var y = {[ x ]() {}}', options: ['always'], parserOptions: parserOptions },
+    { code: 'var x = {[ "a" ]: a}', options: ['always'], parserOptions },
+    { code: 'var y = {[ x ]: a}', options: ['always'], parserOptions },
+    { code: 'var x = {[ "a" ]() {}}', options: ['always'], parserOptions },
+    { code: 'var y = {[ x ]() {}}', options: ['always'], parserOptions },
 
     // always - unrelated cases
     { code: 'var foo = {};', options: ['always'] },
@@ -74,19 +74,19 @@ ruleTester.run('computed-property-even-spacing', rule, {
     { code: 'var foo = obj[[ 1, 1 ]];', options: ['never'] },
 
     // never - objectLiteralComputedProperties
-    { code: 'var x = {["a"]: a}', options: ['never'], parserOptions: parserOptions },
-    { code: 'var y = {[x]: a}', options: ['never'], parserOptions: parserOptions },
-    { code: 'var x = {["a"]() {}}', options: ['never'], parserOptions: parserOptions },
-    { code: 'var y = {[x]() {}}', options: ['never'], parserOptions: parserOptions },
+    { code: 'var x = {["a"]: a}', options: ['never'], parserOptions },
+    { code: 'var y = {[x]: a}', options: ['never'], parserOptions },
+    { code: 'var x = {["a"]() {}}', options: ['never'], parserOptions },
+    { code: 'var y = {[x]() {}}', options: ['never'], parserOptions },
 
     // never - unrelated cases
     { code: 'var foo = {};', options: ['never'] },
     { code: 'var foo = [];', options: ['never'] },
     { code: 'bar[ foo ]', options: ['even'] },
 
     // even - unrelated cases
-    { code: 'const { a, ...b } = obj', options: ['even'], parserOptions: parserOptions },
-    { code: 'func(a, { ...b })', options: ['even'], parserOptions: parserOptions }
+    { code: 'const { a, ...b } = obj', options: ['even'], parserOptions },
+    { code: 'func(a, { ...b })', options: ['even'], parserOptions }
 
   ],
 
@@ -227,7 +227,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     {
       code: 'var x = {[a]: b}',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: "A space is required after '['",
@@ -244,7 +244,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     {
       code: 'var x = {[a ]: b}',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: "A space is required after '['",
@@ -256,7 +256,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     {
       code: 'var x = {[ a]: b}',
       options: ['always'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: "A space is required before ']'",
@@ -270,7 +270,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     {
       code: 'var x = {[ a ]: b}',
       options: ['never'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: "There should be no space after '['",
@@ -287,7 +287,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     {
       code: 'var x = {[a ]: b}',
       options: ['never'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: "There should be no space before ']'",
@@ -299,7 +299,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     {
       code: 'var x = {[ a]: b}',
       options: ['never'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: "There should be no space after '['",
@@ -311,7 +311,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
     {
       code: 'var x = {[ a\n]: b}',
       options: ['never'],
-      parserOptions: parserOptions,
+      parserOptions,
       errors: [
         {
           message: "There should be no space after '['",