@@ -11,7 +11,7 @@ const variableUtil = require('../util/variable');
11
11
const testReactVersion = require ( '../util/version' ) . testReactVersion ;
12
12
const docsUrl = require ( '../util/docsUrl' ) ;
13
13
const report = require ( '../util/report' ) ;
14
- const getSourceCode = require ( '../util/eslint' ) . getSourceCode ;
14
+ const getText = require ( '../util/eslint' ) . getText ;
15
15
16
16
// ------------------------------------------------------------------------------
17
17
// Rule Definition
@@ -66,36 +66,34 @@ module.exports = {
66
66
}
67
67
68
68
function getFixerToLong ( jsxFragment ) {
69
- const sourceCode = getSourceCode ( context ) ;
70
69
if ( ! jsxFragment . closingFragment || ! jsxFragment . openingFragment ) {
71
70
// the old TS parser crashes here
72
71
// TODO: FIXME: can we fake these two descriptors?
73
72
return null ;
74
73
}
75
74
return function fix ( fixer ) {
76
- let source = sourceCode . getText ( ) ;
75
+ let source = getText ( context ) ;
77
76
source = replaceNode ( source , jsxFragment . closingFragment , closeFragLong ) ;
78
77
source = replaceNode ( source , jsxFragment . openingFragment , openFragLong ) ;
79
- const lengthDiff = openFragLong . length - sourceCode . getText ( jsxFragment . openingFragment ) . length
80
- + closeFragLong . length - sourceCode . getText ( jsxFragment . closingFragment ) . length ;
78
+ const lengthDiff = openFragLong . length - getText ( context , jsxFragment . openingFragment ) . length
79
+ + closeFragLong . length - getText ( context , jsxFragment . closingFragment ) . length ;
81
80
const range = jsxFragment . range ;
82
81
return fixer . replaceTextRange ( range , source . slice ( range [ 0 ] , range [ 1 ] + lengthDiff ) ) ;
83
82
} ;
84
83
}
85
84
86
85
function getFixerToShort ( jsxElement ) {
87
- const sourceCode = getSourceCode ( context ) ;
88
86
return function fix ( fixer ) {
89
- let source = sourceCode . getText ( ) ;
87
+ let source = getText ( context ) ;
90
88
let lengthDiff ;
91
89
if ( jsxElement . closingElement ) {
92
90
source = replaceNode ( source , jsxElement . closingElement , closeFragShort ) ;
93
91
source = replaceNode ( source , jsxElement . openingElement , openFragShort ) ;
94
- lengthDiff = sourceCode . getText ( jsxElement . openingElement ) . length - openFragShort . length
95
- + sourceCode . getText ( jsxElement . closingElement ) . length - closeFragShort . length ;
92
+ lengthDiff = getText ( context , jsxElement . openingElement ) . length - openFragShort . length
93
+ + getText ( context , jsxElement . closingElement ) . length - closeFragShort . length ;
96
94
} else {
97
95
source = replaceNode ( source , jsxElement . openingElement , `${ openFragShort } ${ closeFragShort } ` ) ;
98
- lengthDiff = sourceCode . getText ( jsxElement . openingElement ) . length - openFragShort . length
96
+ lengthDiff = getText ( context , jsxElement . openingElement ) . length - openFragShort . length
99
97
- closeFragShort . length ;
100
98
}
101
99
0 commit comments