Get correct indentation

Author: arperry

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

@@ -150,19 +150,26 @@ module.exports = {
      * Get the characters used for indentation on the line to be matched
      * @param {Object} tokens Locations of the opening bracket, closing bracket and last prop
      * @param {String} expectedLocation Expected location for the closing bracket
+     * @param {Number} correctColumn Expected column for the closing bracket
      * @return {String} The characters used for indentation
      */
-    function getIndentation(tokens, expectedLocation) {
+    function getIndentation(tokens, expectedLocation, correctColumn) {
+      var indentation, spaces = [];
       switch (expectedLocation) {
         case 'props-aligned':
-          return /^\s*/.exec(sourceCode.lines[tokens.lastProp.lastLine])[0];
+          indentation = /^\s*/.exec(sourceCode.lines[tokens.lastProp.firstLine - 1])[0];
+          break;
         case 'tag-aligned':
-          return /^\s*/.exec(sourceCode.lines[tokens.opening.line])[0];
         case 'line-aligned':
-          return /^\s*/.exec(sourceCode.lines[tokens.openingStartOfLine.line])[0];
+          indentation = /^\s*/.exec(sourceCode.lines[tokens.opening.line - 1])[0];
         default:
-          return '';
+          indentation = '';
       }
+      if (indentation.length + 1 < correctColumn) {
+        // Non-whitespace characters were included in the column offset
+        spaces = new Array(+correctColumn + 1 - indentation.length);
+      }
+      return indentation + spaces.join(' ');
     }
 
     /**
@@ -264,7 +271,7 @@ module.exports = {
               case 'tag-aligned':
               case 'line-aligned':
                 return fixer.replaceTextRange([cachedLastAttributeEndPos, node.end],
-                  '\n' + getIndentation(tokens, expectedLocation) + closingTag);
+                  '\n' + getIndentation(tokens, expectedLocation, correctColumn) + closingTag);
               default:
                 return true;
             }