Skip to content

Commit

Permalink
Fix jsx-curly-spacing: spacing around spread operator
Browse files Browse the repository at this point in the history
  • Loading branch information
@gitim
gitim committed May 22, 2016
1 parent 750f979 commit cdd2b17
Show file tree
Hide file tree
Showing 2 changed files with 326 additions and 13 deletions.
21 changes: 8 additions & 13 deletions lib/rules/jsx-curly-spacing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,14 @@ module.exports = function(context) {
/**
* Determines if spacing in curly braces is valid.
* @param {ASTNode} node The AST node to check.
* @param {Token} first The first token to check (should be the opening brace)
* @param {Token} second The second token to check (should be first after the opening brace)
* @param {Token} penultimate The penultimate token to check (should be last before closing brace)
* @param {Token} last The last token to check (should be closing brace)
* @returns {void}
*/
function validateBraceSpacing(node, first, second, penultimate, last) {
function validateBraceSpacing(node) {
var first = context.getFirstToken(node);
var last = sourceCode.getLastToken(node);
var second = context.getTokenAfter(first);
var penultimate = sourceCode.getTokenBefore(last);

if (spaced) {
if (!sourceCode.isSpaceBetweenTokens(first, second)) {
reportRequiredBeginningSpace(node, first);
Expand Down Expand Up @@ -181,14 +182,8 @@ module.exports = function(context) {
// --------------------------------------------------------------------------

return {
JSXExpressionContainer: function(node) {
var first = context.getFirstToken(node);
var last = sourceCode.getLastToken(node);
var second = context.getTokenAfter(first);
var penultimate = sourceCode.getTokenBefore(last);

validateBraceSpacing(node, first, second, penultimate, last);
}
JSXExpressionContainer: validateBraceSpacing,
JSXSpreadAttribute: validateBraceSpacing
};
};

Expand Down
318 changes: 318 additions & 0 deletions tests/lib/rules/jsx-curly-spacing.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,88 @@ ruleTester.run('jsx-curly-spacing', rule, {
options: ['never'],
parserOptions: parserOptions,
parser: 'babel-eslint'
}, {
code: '<App {...bar} />;',
parserOptions: parserOptions
}, {
code: '<App {...bar} />;',
options: ['never'],
parserOptions: parserOptions
}, {
code: '<App { ...bar } />;',
options: ['always'],
parserOptions: parserOptions
}, {
code: '<App { ...bar } />;',
options: ['always', {allowMultiline: false}],
parserOptions: parserOptions
}, {
code: [
'<App {',
'...bar',
'} />;'
].join('\n'),
options: ['always'],
parserOptions: parserOptions
}, {
code: [
'<App {',
'...bar',
'} />;'
].join('\n'),
options: ['always'],
parserOptions: parserOptions
}, {
code: [
'<App {',
'...bar',
'} />;'
].join('\n'),
options: ['never'],
parserOptions: parserOptions
}, {
code: '<App {...bar/* comment */} />;',
options: ['never'],
parserOptions: parserOptions,
parser: 'babel-eslint'
}, {
code: '<App foo={bar} {...baz} />;',
parserOptions: parserOptions
}, {
code: '<App foo={bar} {...baz} />;',
options: ['never'],
parserOptions: parserOptions
}, {
code: '<App foo={ bar } { ...baz } />;',
options: ['always'],
parserOptions: parserOptions
}, {
code: '<App foo={ bar } { ...baz } />;',
options: ['always', {allowMultiline: false}],
parserOptions: parserOptions
}, {
code: '<App foo={{ bar:baz }} {...baz} />;',
options: ['never'],
parserOptions: parserOptions
}, {
code: '<App foo={ {bar:baz} } { ...baz } />;',
options: ['always'],
parserOptions: parserOptions
}, {
code: [
'<App foo={',
'bar',
'} {',
'...bar',
'}/>;'
].join('\n'),
options: ['always'],
parserOptions: parserOptions
}, {
code: '<App foo={bar/* comment */} {...baz/* comment */} />;',
options: ['never'],
parserOptions: parserOptions,
parser: 'babel-eslint'
}],

invalid: [{
Expand Down Expand Up @@ -185,5 +267,241 @@ ruleTester.run('jsx-curly-spacing', rule, {
message: 'There should be no newline before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App { ...bar } />;',
output: '<App {...bar} />;',
options: ['never'],
errors: [{
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App { ...bar } />;',
output: '<App {...bar} />;',
options: ['never', {allowMultiline: false}],
errors: [{
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App {...bar} />;',
output: '<App { ...bar } />;',
options: ['always'],
errors: [{
message: 'A space is required after \'{\''
}, {
message: 'A space is required before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App {...bar} />;',
output: '<App { ...bar } />;',
options: ['always', {allowMultiline: false}],
errors: [{
message: 'A space is required after \'{\''
}, {
message: 'A space is required before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App { ...bar} />;',
output: '<App { ...bar } />;',
options: ['always'],
errors: [{
message: 'A space is required before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App {...bar } />;',
output: '<App { ...bar } />;',
options: ['always'],
errors: [{
message: 'A space is required after \'{\''
}],
parserOptions: parserOptions
}, {
code: '<App { ...bar} />;',
output: '<App {...bar} />;',
options: ['never'],
errors: [{
message: 'There should be no space after \'{\''
}],
parserOptions: parserOptions
}, {
code: '<App {...bar } />;',
output: '<App {...bar} />;',
options: ['never'],
errors: [{
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: [
'<App {',
'...bar',
'} />;'
].join('\n'),
output: '<App {...bar} />;',
options: ['never', {allowMultiline: false}],
errors: [{
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: [
'<App {',
'...bar',
'} />;'
].join('\n'),
output: '<App { ...bar } />;',
options: ['always', {allowMultiline: false}],
errors: [{
message: 'There should be no newline after \'{\''
}, {
message: 'There should be no newline before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={ bar } { ...baz } />;',
output: '<App foo={bar} {...baz} />;',
options: ['never'],
errors: [{
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}, {
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={ bar } { ...baz } />;',
output: '<App foo={bar} {...baz} />;',
options: ['never', {allowMultiline: false}],
errors: [{
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}, {
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={bar} {...baz} />;',
output: '<App foo={ bar } { ...baz } />;',
options: ['always'],
errors: [{
message: 'A space is required after \'{\''
}, {
message: 'A space is required before \'}\''
}, {
message: 'A space is required after \'{\''
}, {
message: 'A space is required before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={bar} {...baz} />;',
output: '<App foo={ bar } { ...baz } />;',
options: ['always', {allowMultiline: false}],
errors: [{
message: 'A space is required after \'{\''
}, {
message: 'A space is required before \'}\''
}, {
message: 'A space is required after \'{\''
}, {
message: 'A space is required before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={ bar} { ...baz} />;',
output: '<App foo={ bar } { ...baz } />;',
options: ['always'],
errors: [{
message: 'A space is required before \'}\''
}, {
message: 'A space is required before \'}\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={bar } {...baz } />;',
output: '<App foo={ bar } { ...baz } />;',
options: ['always'],
errors: [{
message: 'A space is required after \'{\''
}, {
message: 'A space is required after \'{\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={ bar} { ...baz} />;',
output: '<App foo={bar} {...baz} />;',
options: ['never'],
errors: [{
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space after \'{\''
}],
parserOptions: parserOptions
}, {
code: '<App foo={bar } {...baz } />;',
output: '<App foo={bar} {...baz} />;',
options: ['never'],
errors: [{
message: 'There should be no space before \'}\''
}, {
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: [
'<App foo={',
'bar',
'} {',
'...baz',
'} />;'
].join('\n'),
output: '<App foo={bar} {...baz} />;',
options: ['never', {allowMultiline: false}],
errors: [{
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}, {
message: 'There should be no space after \'{\''
}, {
message: 'There should be no space before \'}\''
}],
parserOptions: parserOptions
}, {
code: [
'<App foo={',
'bar',
'} {',
'...baz',
'} />;'
].join('\n'),
output: '<App foo={ bar } { ...baz } />;',
options: ['always', {allowMultiline: false}],
errors: [{
message: 'There should be no newline after \'{\''
}, {
message: 'There should be no newline before \'}\''
}, {
message: 'There should be no newline after \'{\''
}, {
message: 'There should be no newline before \'}\''
}],
parserOptions: parserOptions
}]
});

0 comments on commit cdd2b17

Please sign in to comment.