Fix jsx-closing-bracket-location for multi-line prop (fixes #889)

Author: yannickcr

lib/rules/jsx-closing-bracket-location.js

@@ -95,7 +95,7 @@ module.exports = {
       if (typeof tokens.lastProp === 'undefined') {
         location = 'after-tag';
       // Is always after the last prop if this one is on the same line as the opening bracket
-      } else if (tokens.opening.line === tokens.lastProp.firstLine) {
+      } else if (tokens.opening.line === tokens.lastProp.lastLine) {
         location = 'after-props';
       // Else use configuration dependent on selfClosing property
       } else {

tests/lib/rules/jsx-closing-bracket-location.js

@@ -197,24 +197,27 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
   }, {
     code: [
       '<App foo={function() {',
-      '  console.log(\'bar\');',
-      '}}/>'
+      '       console.log(\'bar\');',
+      '     }}',
+      '     />'
     ].join('\n'),
     options: [{location: 'props-aligned'}],
     parserOptions: parserOptions
   }, {
     code: [
       '<App foo={function() {',
       '  console.log(\'bar\');',
-      '}}/>'
+      '}}',
+      '/>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
     parserOptions: parserOptions
   }, {
     code: [
       '<App foo={function() {',
       '  console.log(\'bar\');',
-      '}}/>'
+      '}}',
+      '/>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
     parserOptions: parserOptions
@@ -383,6 +386,18 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       selfClosing: false
     }],
     parserOptions: parserOptions
+  }, {
+    code: [
+      '<div className={[',
+      '  "some",',
+      '  "stuff",',
+      '  2 ]}',
+      '>',
+      '  Some text',
+      '</div>'
+    ].join('\n'),
+    options: [{location: 'tag-aligned'}],
+    parserOptions: parserOptions
   }],
 
   invalid: [{
@@ -919,5 +934,30 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     options: [{location: 'line-aligned'}],
     parserOptions: parserOptions,
     errors: [MESSAGE_AFTER_TAG]
+  }, {
+    code: [
+      '<div className={[',
+      '  "some",',
+      '  "stuff",',
+      '  2 ]}>',
+      '  Some text',
+      '</div>'
+    ].join('\n'),
+    output: [
+      '<div className={[',
+      '  "some",',
+      '  "stuff",',
+      '  2 ]}',
+      '>',
+      '  Some text',
+      '</div>'
+    ].join('\n'),
+    options: [{location: 'tag-aligned'}],
+    parserOptions: parserOptions,
+    errors: [{
+      message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
+      line: 4,
+      column: 7
+    }]
   }]
 });