@@ -25,7 +25,6 @@ module.exports = {
25
25
26
26
create : function ( context ) {
27
27
var configuration = context . options [ 0 ] ;
28
- var extraColumnStart = 0 ;
29
28
var indentType = 'space' ;
30
29
var indentSize = 2 ;
31
30
var sourceCode = context . getSourceCode ( ) ;
@@ -40,27 +39,14 @@ module.exports = {
40
39
}
41
40
}
42
41
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 ] ;
57
44
var regExp ;
58
45
if ( indentType === 'space' ) {
59
- regExp = new RegExp ( '^[ ' + skip + ' ]+') ;
46
+ regExp = new RegExp ( '^[ ]+' ) ;
60
47
} else {
61
- regExp = new RegExp ( '^[\t' + skip + ']+' ) ;
48
+ regExp = new RegExp ( '^[\t' + ']+' ) ;
62
49
}
63
-
64
50
var indent = regExp . exec ( src ) ;
65
51
return indent ? indent [ 0 ] . length : 0 ;
66
52
}
@@ -82,8 +68,7 @@ module.exports = {
82
68
node : decl ,
83
69
message : 'Property should be placed on a new line' ,
84
70
fix : function ( fixer ) {
85
- var nodeIndent = getNodeIndent ( node , false , false ) ;
86
- var neededIndent = nodeIndent + indentSize ;
71
+ var neededIndent = getNodeIndent ( node ) + indentSize ;
87
72
var insert = '\n' + Array ( neededIndent + 1 ) . join ( indentType === 'space' ? ' ' : '\t' ) ;
88
73
return fixer . replaceTextRange ( [ node . name . end , decl . start ] , insert ) ;
89
74
}
0 commit comments