Skip to content

Commit f15b117

Browse files
committed
Simplify getNodeIndent
cut out unused vars based on feedback
1 parent 9834e7a commit f15b117

File tree

1 file changed

+5
-20
lines changed

1 file changed

+5
-20
lines changed

lib/rules/jsx-first-prop-new-line.js

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module.exports = {
2525

2626
create: function (context) {
2727
var configuration = context.options[0];
28-
var extraColumnStart = 0;
2928
var indentType = 'space';
3029
var indentSize = 2;
3130
var sourceCode = context.getSourceCode();
@@ -40,27 +39,14 @@ module.exports = {
4039
}
4140
}
4241

43-
function getNodeIndent(node, byLastLine, excludeCommas) {
44-
byLastLine = byLastLine || false;
45-
excludeCommas = excludeCommas || false;
46-
47-
var src = sourceCode.getText(node, node.loc.start.column + extraColumnStart);
48-
var lines = src.split('\n');
49-
if (byLastLine) {
50-
src = lines[lines.length - 1];
51-
} else {
52-
src = lines[0];
53-
}
54-
55-
var skip = excludeCommas ? ',' : '';
56-
42+
function getNodeIndent(node) {
43+
var src = sourceCode.getText(node, node.loc.start.column).split('\n')[0];
5744
var regExp;
5845
if (indentType === 'space') {
59-
regExp = new RegExp('^[ ' + skip + ']+');
46+
regExp = new RegExp('^[ ]+');
6047
} else {
61-
regExp = new RegExp('^[\t' + skip + ']+');
48+
regExp = new RegExp('^[\t' + ']+');
6249
}
63-
6450
var indent = regExp.exec(src);
6551
return indent ? indent[0].length : 0;
6652
}
@@ -82,8 +68,7 @@ module.exports = {
8268
node: decl,
8369
message: 'Property should be placed on a new line',
8470
fix: function(fixer) {
85-
var nodeIndent = getNodeIndent(node, false, false);
86-
var neededIndent = nodeIndent + indentSize;
71+
var neededIndent = getNodeIndent(node) + indentSize;
8772
var insert = '\n' + Array(neededIndent + 1).join(indentType === 'space' ? ' ' : '\t');
8873
return fixer.replaceTextRange([node.name.end, decl.start], insert);
8974
}

0 commit comments

Comments
 (0)