@@ -11,7 +11,7 @@ const variableUtil = require('../util/variable');
1111const testReactVersion = require ( '../util/version' ) . testReactVersion ;
1212const docsUrl = require ( '../util/docsUrl' ) ;
1313const report = require ( '../util/report' ) ;
14- const getSourceCode = require ( '../util/eslint' ) . getSourceCode ;
14+ const getText = require ( '../util/eslint' ) . getText ;
1515
1616// ------------------------------------------------------------------------------
1717// Rule Definition
@@ -66,36 +66,34 @@ module.exports = {
6666 }
6767
6868 function getFixerToLong ( jsxFragment ) {
69- const sourceCode = getSourceCode ( context ) ;
7069 if ( ! jsxFragment . closingFragment || ! jsxFragment . openingFragment ) {
7170 // the old TS parser crashes here
7271 // TODO: FIXME: can we fake these two descriptors?
7372 return null ;
7473 }
7574 return function fix ( fixer ) {
76- let source = sourceCode . getText ( ) ;
75+ let source = getText ( context ) ;
7776 source = replaceNode ( source , jsxFragment . closingFragment , closeFragLong ) ;
7877 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 ;
8180 const range = jsxFragment . range ;
8281 return fixer . replaceTextRange ( range , source . slice ( range [ 0 ] , range [ 1 ] + lengthDiff ) ) ;
8382 } ;
8483 }
8584
8685 function getFixerToShort ( jsxElement ) {
87- const sourceCode = getSourceCode ( context ) ;
8886 return function fix ( fixer ) {
89- let source = sourceCode . getText ( ) ;
87+ let source = getText ( context ) ;
9088 let lengthDiff ;
9189 if ( jsxElement . closingElement ) {
9290 source = replaceNode ( source , jsxElement . closingElement , closeFragShort ) ;
9391 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 ;
9694 } else {
9795 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
9997 - closeFragShort . length ;
10098 }
10199
0 commit comments