Skip to content

Commit ddbab93

Browse files
ferossfeross
authored
Merge pull request #34 from standard/object-shorthand
2 parents cf5608a + 6cee02b commit ddbab93

File tree

5 files changed

+114
-114
lines changed

5 files changed

+114
-114
lines changed

‎rules/array-bracket-even-spacing.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ module.exports = {
3535
}
3636

3737
var options = {
38-
either: either,
39-
spaced: spaced,
38+
either,
39+
spaced,
4040
singleElementException: isOptionSet('singleValue'),
4141
objectsInArraysException: isOptionSet('objectsInArrays'),
4242
arraysInArraysException: isOptionSet('arraysInArrays')

‎rules/object-curly-even-spacing.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ module.exports = {
3535
}
3636

3737
var options = {
38-
spaced: spaced,
39-
either: either,
38+
spaced,
39+
either,
4040
arraysInObjectsException: isOptionSet('arraysInObjects'),
4141
objectsInObjectsException: isOptionSet('objectsInObjects')
4242
}

‎tests/array-bracket-even-spacing.js

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ ruleTester.run('array-bracket-even-spacing', rule, {
2929
{ code: 'var x = [\na,b,c\n]', options: ['either'] },
3030
{ code: 'var x = [\n\ta,b,c\n]', options: ['either'] },
3131
{ code: 'var foo = [];', options: ['either'] },
32-
{ code: 'var [x] = y', options: ['either'], parserOptions: parserOptions },
33-
{ code: 'var [ x ] = y', options: ['either'], parserOptions: parserOptions },
34-
{ code: 'var [\nx\n] = y', options: ['either'], parserOptions: parserOptions },
35-
{ code: 'var [\n\tx\n] = y', options: ['either'], parserOptions: parserOptions },
32+
{ code: 'var [x] = y', options: ['either'], parserOptions },
33+
{ code: 'var [ x ] = y', options: ['either'], parserOptions },
34+
{ code: 'var [\nx\n] = y', options: ['either'], parserOptions },
35+
{ code: 'var [\n\tx\n] = y', options: ['either'], parserOptions },
3636

3737
{ code: 'var foo = obj[ 1 ]', options: ['always'] },
3838
{ code: "var foo = obj[ 'foo' ];", options: ['always'] },
@@ -83,16 +83,16 @@ ruleTester.run('array-bracket-even-spacing', rule, {
8383
{ 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 }] },
8484

8585
// always - destructuring assignment
86-
{ code: 'var [ x, y ] = z', parserOptions: parserOptions, options: ['always'] },
87-
{ code: 'var [ x,y ] = z', parserOptions: parserOptions, options: ['always'] },
88-
{ code: 'var [ x, y\n] = z', parserOptions: parserOptions, options: ['always'] },
89-
{ code: 'var [\nx, y ] = z', parserOptions: parserOptions, options: ['always'] },
90-
{ code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['always'] },
91-
{ code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['always'] },
92-
{ code: 'var [\nx,,,\n] = z', parserOptions: parserOptions, options: ['always'] },
93-
{ code: 'var [ ,x, ] = z', parserOptions: parserOptions, options: ['always'] },
94-
{ code: 'var [\nx, ...y\n] = z', parserOptions: parserOptions, options: ['always'] },
95-
{ code: 'var [\nx, ...y ] = z', parserOptions: parserOptions, options: ['always'] },
86+
{ code: 'var [ x, y ] = z', parserOptions, options: ['always'] },
87+
{ code: 'var [ x,y ] = z', parserOptions, options: ['always'] },
88+
{ code: 'var [ x, y\n] = z', parserOptions, options: ['always'] },
89+
{ code: 'var [\nx, y ] = z', parserOptions, options: ['always'] },
90+
{ code: 'var [\nx, y\n] = z', parserOptions, options: ['always'] },
91+
{ code: 'var [\nx, y\n] = z', parserOptions, options: ['always'] },
92+
{ code: 'var [\nx,,,\n] = z', parserOptions, options: ['always'] },
93+
{ code: 'var [ ,x, ] = z', parserOptions, options: ['always'] },
94+
{ code: 'var [\nx, ...y\n] = z', parserOptions, options: ['always'] },
95+
{ code: 'var [\nx, ...y ] = z', parserOptions, options: ['always'] },
9696

9797
// never
9898
{ code: 'obj[foo]', options: ['never'] },
@@ -113,16 +113,16 @@ ruleTester.run('array-bracket-even-spacing', rule, {
113113
{ code: 'var arr = [\n1,\n2,\n3,\n4];', options: ['never'] },
114114

115115
// never - destructuring assignment
116-
{ code: 'var [x, y] = z', parserOptions: parserOptions, options: ['never'] },
117-
{ code: 'var [x,y] = z', parserOptions: parserOptions, options: ['never'] },
118-
{ code: 'var [x, y\n] = z', parserOptions: parserOptions, options: ['never'] },
119-
{ code: 'var [\nx, y] = z', parserOptions: parserOptions, options: ['never'] },
120-
{ code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['never'] },
121-
{ code: 'var [\nx, y\n] = z', parserOptions: parserOptions, options: ['never'] },
122-
{ code: 'var [\nx,,,\n] = z', parserOptions: parserOptions, options: ['never'] },
123-
{ code: 'var [,x,] = z', parserOptions: parserOptions, options: ['never'] },
124-
{ code: 'var [\nx, ...y\n] = z', parserOptions: parserOptions, options: ['never'] },
125-
{ code: 'var [\nx, ...y] = z', parserOptions: parserOptions, options: ['never'] },
116+
{ code: 'var [x, y] = z', parserOptions, options: ['never'] },
117+
{ code: 'var [x,y] = z', parserOptions, options: ['never'] },
118+
{ code: 'var [x, y\n] = z', parserOptions, options: ['never'] },
119+
{ code: 'var [\nx, y] = z', parserOptions, options: ['never'] },
120+
{ code: 'var [\nx, y\n] = z', parserOptions, options: ['never'] },
121+
{ code: 'var [\nx, y\n] = z', parserOptions, options: ['never'] },
122+
{ code: 'var [\nx,,,\n] = z', parserOptions, options: ['never'] },
123+
{ code: 'var [,x,] = z', parserOptions, options: ['never'] },
124+
{ code: 'var [\nx, ...y\n] = z', parserOptions, options: ['never'] },
125+
{ code: 'var [\nx, ...y] = z', parserOptions, options: ['never'] },
126126

127127
// never - singleValue
128128
{ code: "var foo = [ 'foo' ]", options: ['never', { singleValue: true }] },
@@ -168,7 +168,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
168168
{
169169
code: 'var [ x] = y',
170170
options: ['either'],
171-
parserOptions: parserOptions,
171+
parserOptions,
172172
errors: [
173173
{
174174
message: 'Expected consistent spacing',
@@ -182,7 +182,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
182182
{
183183
code: 'var [ x,y,z] = y',
184184
options: ['either'],
185-
parserOptions: parserOptions,
185+
parserOptions,
186186
errors: [
187187
{
188188
message: 'Expected consistent spacing',
@@ -196,7 +196,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
196196
{
197197
code: 'var [ x ] = y',
198198
options: ['either'],
199-
parserOptions: parserOptions,
199+
parserOptions,
200200
errors: [
201201
{
202202
message: 'Expected consistent spacing',
@@ -209,7 +209,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
209209
{
210210
code: 'var x = [ x, y]',
211211
options: ['either'],
212-
parserOptions: parserOptions,
212+
parserOptions,
213213
errors: [
214214
{
215215
message: 'Expected consistent spacing',
@@ -222,7 +222,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
222222
{
223223
code: 'var x = [ x, y ]',
224224
options: ['either'],
225-
parserOptions: parserOptions,
225+
parserOptions,
226226
errors: [
227227
{
228228
message: 'Expected consistent spacing',
@@ -394,7 +394,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
394394
{
395395
code: 'var [x,y] = y',
396396
options: ['always'],
397-
parserOptions: parserOptions,
397+
parserOptions,
398398
errors: [{
399399
message: "A space is required after '['",
400400
type: 'ArrayPattern',
@@ -409,7 +409,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
409409
{
410410
code: 'var [x,y ] = y',
411411
options: ['always'],
412-
parserOptions: parserOptions,
412+
parserOptions,
413413
errors: [{
414414
message: "A space is required after '['",
415415
type: 'ArrayPattern',
@@ -419,7 +419,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
419419
{
420420
code: 'var [,,,x,,] = y',
421421
options: ['always'],
422-
parserOptions: parserOptions,
422+
parserOptions,
423423
errors: [{
424424
message: "A space is required after '['",
425425
type: 'ArrayPattern',
@@ -434,7 +434,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
434434
{
435435
code: 'var [ ,,,x,,] = y',
436436
options: ['always'],
437-
parserOptions: parserOptions,
437+
parserOptions,
438438
errors: [{
439439
message: "A space is required before ']'",
440440
type: 'ArrayPattern',
@@ -444,7 +444,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
444444
{
445445
code: 'var [...horse] = y',
446446
options: ['always'],
447-
parserOptions: parserOptions,
447+
parserOptions,
448448
errors: [{
449449
message: "A space is required after '['",
450450
type: 'ArrayPattern',
@@ -459,7 +459,7 @@ ruleTester.run('array-bracket-even-spacing', rule, {
459459
{
460460
code: 'var [...horse ] = y',
461461
options: ['always'],
462-
parserOptions: parserOptions,
462+
parserOptions,
463463
errors: [{
464464
message: "A space is required after '['",
465465
type: 'ArrayPattern',

‎tests/computed-property-even-spacing.js

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
3131
// default - never
3232
{ code: 'obj[foo]' },
3333
{ code: "obj['foo']" },
34-
{ code: 'var x = {[b]: a}', parserOptions: parserOptions },
34+
{ code: 'var x = {[b]: a}', parserOptions },
3535

3636
// always
3737
{ code: 'obj[ foo ]', options: ['always'] },
@@ -48,10 +48,10 @@ ruleTester.run('computed-property-even-spacing', rule, {
4848
{ code: 'var foo = obj[ [1, 1] ];', options: ['always'] },
4949

5050
// always - objectLiteralComputedProperties
51-
{ code: 'var x = {[ "a" ]: a}', options: ['always'], parserOptions: parserOptions },
52-
{ code: 'var y = {[ x ]: a}', options: ['always'], parserOptions: parserOptions },
53-
{ code: 'var x = {[ "a" ]() {}}', options: ['always'], parserOptions: parserOptions },
54-
{ code: 'var y = {[ x ]() {}}', options: ['always'], parserOptions: parserOptions },
51+
{ code: 'var x = {[ "a" ]: a}', options: ['always'], parserOptions },
52+
{ code: 'var y = {[ x ]: a}', options: ['always'], parserOptions },
53+
{ code: 'var x = {[ "a" ]() {}}', options: ['always'], parserOptions },
54+
{ code: 'var y = {[ x ]() {}}', options: ['always'], parserOptions },
5555

5656
// always - unrelated cases
5757
{ code: 'var foo = {};', options: ['always'] },
@@ -74,19 +74,19 @@ ruleTester.run('computed-property-even-spacing', rule, {
7474
{ code: 'var foo = obj[[ 1, 1 ]];', options: ['never'] },
7575

7676
// never - objectLiteralComputedProperties
77-
{ code: 'var x = {["a"]: a}', options: ['never'], parserOptions: parserOptions },
78-
{ code: 'var y = {[x]: a}', options: ['never'], parserOptions: parserOptions },
79-
{ code: 'var x = {["a"]() {}}', options: ['never'], parserOptions: parserOptions },
80-
{ code: 'var y = {[x]() {}}', options: ['never'], parserOptions: parserOptions },
77+
{ code: 'var x = {["a"]: a}', options: ['never'], parserOptions },
78+
{ code: 'var y = {[x]: a}', options: ['never'], parserOptions },
79+
{ code: 'var x = {["a"]() {}}', options: ['never'], parserOptions },
80+
{ code: 'var y = {[x]() {}}', options: ['never'], parserOptions },
8181

8282
// never - unrelated cases
8383
{ code: 'var foo = {};', options: ['never'] },
8484
{ code: 'var foo = [];', options: ['never'] },
8585
{ code: 'bar[ foo ]', options: ['even'] },
8686

8787
// even - unrelated cases
88-
{ code: 'const { a, ...b } = obj', options: ['even'], parserOptions: parserOptions },
89-
{ code: 'func(a, { ...b })', options: ['even'], parserOptions: parserOptions }
88+
{ code: 'const { a, ...b } = obj', options: ['even'], parserOptions },
89+
{ code: 'func(a, { ...b })', options: ['even'], parserOptions }
9090

9191
],
9292

@@ -227,7 +227,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
227227
{
228228
code: 'var x = {[a]: b}',
229229
options: ['always'],
230-
parserOptions: parserOptions,
230+
parserOptions,
231231
errors: [
232232
{
233233
message: "A space is required after '['",
@@ -244,7 +244,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
244244
{
245245
code: 'var x = {[a ]: b}',
246246
options: ['always'],
247-
parserOptions: parserOptions,
247+
parserOptions,
248248
errors: [
249249
{
250250
message: "A space is required after '['",
@@ -256,7 +256,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
256256
{
257257
code: 'var x = {[ a]: b}',
258258
options: ['always'],
259-
parserOptions: parserOptions,
259+
parserOptions,
260260
errors: [
261261
{
262262
message: "A space is required before ']'",
@@ -270,7 +270,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
270270
{
271271
code: 'var x = {[ a ]: b}',
272272
options: ['never'],
273-
parserOptions: parserOptions,
273+
parserOptions,
274274
errors: [
275275
{
276276
message: "There should be no space after '['",
@@ -287,7 +287,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
287287
{
288288
code: 'var x = {[a ]: b}',
289289
options: ['never'],
290-
parserOptions: parserOptions,
290+
parserOptions,
291291
errors: [
292292
{
293293
message: "There should be no space before ']'",
@@ -299,7 +299,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
299299
{
300300
code: 'var x = {[ a]: b}',
301301
options: ['never'],
302-
parserOptions: parserOptions,
302+
parserOptions,
303303
errors: [
304304
{
305305
message: "There should be no space after '['",
@@ -311,7 +311,7 @@ ruleTester.run('computed-property-even-spacing', rule, {
311311
{
312312
code: 'var x = {[ a\n]: b}',
313313
options: ['never'],
314-
parserOptions: parserOptions,
314+
parserOptions,
315315
errors: [
316316
{
317317
message: "There should be no space after '['",

0 commit comments

Comments
 (0)