Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use object shorthand for properties #34

Merged
merged 1 commit into from May 17, 2020
Merged

Use object shorthand for properties #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions rules/array-bracket-even-spacing.js
View file
Open in desktop
Expand Up @@ -35,8 +35,8 @@ module.exports = {
}

var options = {
either: either,
spaced: spaced,
either,
spaced,
singleElementException: isOptionSet('singleValue'),
objectsInArraysException: isOptionSet('objectsInArrays'),
arraysInArraysException: isOptionSet('arraysInArrays')
Expand Down
4 changes: 2 additions & 2 deletions rules/object-curly-even-spacing.js
View file
Open in desktop
Expand Up @@ -35,8 +35,8 @@ module.exports = {
}

var options = {
spaced: spaced,
either: either,
spaced,
either,
arraysInObjectsException: isOptionSet('arraysInObjects'),
objectsInObjectsException: isOptionSet('objectsInObjects')
}
Expand Down
70 changes: 35 additions & 35 deletions tests/array-bracket-even-spacing.js
View file
Open in desktop
Expand Up @@ -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'] },
Expand Down Expand Up @@ -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'] },
Expand All @@ -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 }] },
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
36 changes: 18 additions & 18 deletions tests/computed-property-even-spacing.js
View file
Open in desktop
Expand Up @@ -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'] },
Expand All @@ -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'] },
Expand All @@ -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 }

],

Expand Down Expand Up @@ -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 '['",
Expand All @@ -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 '['",
Expand All @@ -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 ']'",
Expand All @@ -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 '['",
Expand All @@ -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 ']'",
Expand All @@ -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 '['",
Expand All @@ -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 '['",
Expand Down