Merge pull request #279 from Khan/master

Add 'line-aligned' option for jsx-closing-bracket-location (fixes #243)

Author: yannickcr

docs/rules/jsx-closing-bracket-location.md

@@ -55,6 +55,7 @@ The second form allows you to distinguish between non-empty and self-closing tag
 Enforced location for the closing bracket.
 
 * `tag-aligned`: must be aligned with the opening tag.
+* `line-aligned`: must be aligned with the line containing the opening tag.
 * `after-props`: must be placed right after the last prop.
 * `props-aligned`: must be aligned with the last prop.
 
@@ -67,6 +68,7 @@ The following patterns are considered warnings:
 ```jsx
 // 'jsx-closing-bracket-location': 1
 // 'jsx-closing-bracket-location': [1, 'tag-aligned']
+// 'jsx-closing-bracket-location': [1, 'line-aligned']
 <Hello 
   firstName="John"
   lastName="Smith"
@@ -78,6 +80,37 @@ The following patterns are considered warnings:
   Hello
 </Say>;
 
+// 'jsx-closing-bracket-location': 1
+// 'jsx-closing-bracket-location': [1, 'tag-aligned']
+var x = <Hello
+  firstName="John"
+  lastName="Smith"
+/>;
+
+var x = function() {
+  return <Say
+    firstName="John"
+    lastName="Smith"
+  >
+    Hello
+  </Say>;
+};
+
+// 'jsx-closing-bracket-location': [1, 'line-aligned']
+var x = <Hello
+  firstName="John"
+  lastName="Smith"
+        />;
+
+var x = function() {
+  return <Say
+    firstName="John"
+    lastName="Smith"
+         >
+    Hello
+         </Say>;
+};
+
 // 'jsx-closing-bracket-location': [1, 'after-props']
 <Hello 
   firstName="John"
@@ -108,6 +141,7 @@ The following patterns are not considered warnings:
 ```jsx
 // 'jsx-closing-bracket-location': 1
 // 'jsx-closing-bracket-location': [1, 'tag-aligned']
+// 'jsx-closing-bracket-location': [1, 'line-aligned']
 <Hello
   firstName="John"
   lastName="Smith"
@@ -120,6 +154,37 @@ The following patterns are not considered warnings:
   Hello
 </Say>;
 
+// 'jsx-closing-bracket-location': 1
+// 'jsx-closing-bracket-location': [1, 'tag-aligned']
+var x = <Hello
+  firstName="John"
+  lastName="Smith"
+        />;
+
+var x = function() {
+  return <Say
+    firstName="John"
+    lastName="Smith"
+         >
+    Hello
+         </Say>;
+};
+
+// 'jsx-closing-bracket-location': [1, 'line-aligned']
+var x = <Hello
+  firstName="John"
+  lastName="Smith"
+/>;
+
+var x = function() {
+  return <Say
+    firstName="John"
+    lastName="Smith"
+  >
+    Hello
+  </Say>;
+};
+
 // 'jsx-closing-bracket-location': [1, {selfClosing: 'after-props'}]
 <Hello 
   firstName="John"

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

@@ -14,7 +14,8 @@ module.exports = function(context) {
     'after-props': 'placed after the last prop',
     'after-tag': 'placed after the opening tag',
     'props-aligned': 'aligned with the last prop',
-    'tag-aligned': 'aligned with the opening tag'
+    'tag-aligned': 'aligned with the opening tag',
+    'line-aligned': 'aligned with the line containing the opening tag'
   };
   var DEFAULT_LOCATION = 'tag-aligned';
 
@@ -80,15 +81,19 @@ module.exports = function(context) {
         return tokens.lastProp.column === tokens.closing.column;
       case 'tag-aligned':
         return tokens.opening.column === tokens.closing.column;
+      case 'line-aligned':
+        return tokens.openingStartOfLine.column === tokens.closing.column;
       default:
         return true;
     }
   }
 
   /**
-   * Get the locations of the opening bracket, closing bracket and last prop
+   * Get the locations of the opening bracket, closing bracket, last prop, and
+   * start of opening line.
    * @param {ASTNode} node The node to check
-   * @return {Object} Locations of the opening bracket, closing bracket and last prop
+   * @return {Object} Locations of the opening bracket, closing bracket, last
+   * prop and start of opening line.
    */
   function getTokensLocations(node) {
     var opening = context.getFirstToken(node).loc.start;
@@ -102,12 +107,18 @@ module.exports = function(context) {
         line: context.getLastToken(lastProp).loc.end.line
       };
     }
+    var openingLine = context.getSourceCode().lines[opening.line - 1];
+    var openingStartOfLine = {
+      column: /^\s*/.exec(openingLine)[0].length,
+      line: opening.line
+    };
     return {
       tag: tag,
       opening: opening,
       closing: closing,
       lastProp: lastProp,
-      selfClosing: node.selfClosing
+      selfClosing: node.selfClosing,
+      openingStartOfLine: openingStartOfLine
     };
   }
 
@@ -129,24 +140,24 @@ module.exports = function(context) {
 module.exports.schema = [{
   oneOf: [
     {
-      enum: ['after-props', 'props-aligned', 'tag-aligned']
+      enum: ['after-props', 'props-aligned', 'tag-aligned', 'line-aligned']
     },
     {
       type: 'object',
       properties: {
         location: {
-          enum: ['after-props', 'props-aligned', 'tag-aligned']
+          enum: ['after-props', 'props-aligned', 'tag-aligned', 'line-aligned']
         }
       },
       additionalProperties: false
     }, {
       type: 'object',
       properties: {
         nonEmpty: {
-          enum: ['after-props', 'props-aligned', 'tag-aligned']
+          enum: ['after-props', 'props-aligned', 'tag-aligned', 'line-aligned']
         },
         selfClosing: {
-          enum: ['after-props', 'props-aligned', 'tag-aligned']
+          enum: ['after-props', 'props-aligned', 'tag-aligned', 'line-aligned']
         }
       },
       additionalProperties: false