@@ -41,46 +41,46 @@ module.exports = {
4141 const OMIT_ITEM = 1 ,
4242 [
4343 mapCallback ,
44- mapThisArg
44+ mapThisArgument
4545 ] = node . arguments ,
4646 [
4747 _ , // eslint-disable-line no-unused-vars
4848 callback ,
49- thisArg
49+ thisArgument
5050 ] = parent . arguments ,
5151 // Get the params names from the callback that has the most params (since the signature is identical).
52- params = callback . params . length > mapCallback . params . length ? callback . params : mapCallback . params ,
53- paramString = params . map ( ( p ) => p . name ) . join ( PARAM_SEPARATOR ) ,
52+ parameters = callback . params . length > mapCallback . params . length ? callback . params : mapCallback . params ,
53+ parameterString = parameters . map ( ( p ) => p . name ) . join ( PARAM_SEPARATOR ) ,
5454 getCallback = ( cbk , targ , ps ) => {
5555 const source = `(${ sourceCode . getText ( cbk ) } )` ;
5656 if ( targ && cbk . type !== ARROW_FUNCTION_EXPRESSION ) {
5757 return `${ source } .call(${ targ . name } ${ PARAM_SEPARATOR } ${ ps } )` ;
5858 }
5959 return `${ source } (${ ps } )` ;
6060 } ,
61- firstCallback = getCallback ( callback , { name : 'this' } , paramString ) ;
61+ firstCallback = getCallback ( callback , { name : 'this' } , parameterString ) ;
6262
6363 // Try to use an arrow function for the wrapping function, fall back to a function expression if a this is specified.
64- let functionStart = `(${ paramString } ) => ` ,
64+ let functionStart = `(${ parameterString } ) => ` ,
6565 functionEnd = "" ,
66- restParamString = '' ;
67- if ( thisArg && callback . type !== ARROW_FUNCTION_EXPRESSION ) {
68- functionStart = `function(${ paramString } ) { return ` ;
66+ restParameterString = '' ;
67+ if ( thisArgument && callback . type !== ARROW_FUNCTION_EXPRESSION ) {
68+ functionStart = `function(${ parameterString } ) { return ` ;
6969 functionEnd = "; }" ;
7070 }
71- if ( params . length > OMIT_ITEM ) {
72- const restParams = params
71+ if ( parameters . length > OMIT_ITEM ) {
72+ const restParameters_ = parameters
7373 . slice ( OMIT_ITEM )
7474 . map ( ( p ) => p . name ) ;
75- restParamString = PARAM_SEPARATOR + restParams . join ( PARAM_SEPARATOR ) ;
75+ restParameterString = PARAM_SEPARATOR + restParameters_ . join ( PARAM_SEPARATOR ) ;
7676 }
7777 // The original map callback from Array.from gets nested as a parameter to the callback from map.
78- const lastCallback = getCallback ( mapCallback , mapThisArg , `${ firstCallback } ${ restParamString } ` ) ,
79- restParams = sourceCode . getText ( ) . slice ( callback . end , parent . end ) ;
78+ const lastCallback = getCallback ( mapCallback , mapThisArgument , `${ firstCallback } ${ restParameterString } ` ) ,
79+ restParameters = sourceCode . getText ( ) . slice ( callback . end , parent . end ) ;
8080 return fixer . replaceTextRange ( [
8181 callback . start ,
8282 node . end
83- ] , `${ functionStart } ${ lastCallback } ${ functionEnd } ${ restParams } ` ) ;
83+ ] , `${ functionStart } ${ lastCallback } ${ functionEnd } ${ restParameters } ` ) ;
8484 }
8585
8686 // Move the map arguments to from.
0 commit comments