Skip to content

Commit 688a78f

Browse files
authored
Merge pull request #1179 from fatfisz/fix-undefined-allow-multiline
Fix "allowMultiline" being undefined in some cases
2 parents e169101 + 17ec3b5 commit 688a78f

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

lib/rules/jsx-curly-spacing.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*/
1111
'use strict';
1212

13+
var has = require('has');
14+
1315
// ------------------------------------------------------------------------------
1416
// Rule Definition
1517
// ------------------------------------------------------------------------------
@@ -52,10 +54,13 @@ module.exports = {
5254

5355
create: function(context) {
5456

57+
var DEFAULT_ALLOW_MULTILINE = true;
58+
5559
var sourceCode = context.getSourceCode();
5660
var spaced = context.options[0] === SPACING.always;
57-
var multiline = context.options[1] ? context.options[1].allowMultiline : true;
58-
var spacing = context.options[1] ? context.options[1].spacing || {} : {};
61+
var config = context.options[1] || {};
62+
var multiline = has(config, 'allowMultiline') ? config.allowMultiline : DEFAULT_ALLOW_MULTILINE;
63+
var spacing = config.spacing || {};
5964
var defaultSpacing = spaced ? SPACING.always : SPACING.never;
6065
var objectLiteralSpacing = spacing.objectLiterals || (spaced ? SPACING.always : SPACING.never);
6166

tests/lib/rules/jsx-curly-spacing.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ ruleTester.run('jsx-curly-spacing', rule, {
8686
code: '<App foo={ bar } />;',
8787
options: ['always', {spacing: {}}],
8888
parserOptions: parserOptions
89+
}, {
90+
code: [
91+
'<App foo={',
92+
'bar',
93+
'} />;'
94+
].join('\n'),
95+
options: ['always', {spacing: {}}],
96+
parserOptions: parserOptions
8997
}, {
9098
code: '<App foo={{ bar: true, baz: true }} />;',
9199
options: ['always', {spacing: {objectLiterals: 'never'}}],

0 commit comments

Comments
 (0)