@@ -41,46 +41,46 @@ module.exports = {
41
41
const OMIT_ITEM = 1 ,
42
42
[
43
43
mapCallback ,
44
- mapThisArg
44
+ mapThisArgument
45
45
] = node . arguments ,
46
46
[
47
47
_ , // eslint-disable-line no-unused-vars
48
48
callback ,
49
- thisArg
49
+ thisArgument
50
50
] = parent . arguments ,
51
51
// 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 ) ,
54
54
getCallback = ( cbk , targ , ps ) => {
55
55
const source = `(${ sourceCode . getText ( cbk ) } )` ;
56
56
if ( targ && cbk . type !== ARROW_FUNCTION_EXPRESSION ) {
57
57
return `${ source } .call(${ targ . name } ${ PARAM_SEPARATOR } ${ ps } )` ;
58
58
}
59
59
return `${ source } (${ ps } )` ;
60
60
} ,
61
- firstCallback = getCallback ( callback , { name : 'this' } , paramString ) ;
61
+ firstCallback = getCallback ( callback , { name : 'this' } , parameterString ) ;
62
62
63
63
// 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 } ) => ` ,
65
65
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 ` ;
69
69
functionEnd = "; }" ;
70
70
}
71
- if ( params . length > OMIT_ITEM ) {
72
- const restParams = params
71
+ if ( parameters . length > OMIT_ITEM ) {
72
+ const restParameters_ = parameters
73
73
. slice ( OMIT_ITEM )
74
74
. map ( ( p ) => p . name ) ;
75
- restParamString = PARAM_SEPARATOR + restParams . join ( PARAM_SEPARATOR ) ;
75
+ restParameterString = PARAM_SEPARATOR + restParameters_ . join ( PARAM_SEPARATOR ) ;
76
76
}
77
77
// 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 ) ;
80
80
return fixer . replaceTextRange ( [
81
81
callback . start ,
82
82
node . end
83
- ] , `${ functionStart } ${ lastCallback } ${ functionEnd } ${ restParams } ` ) ;
83
+ ] , `${ functionStart } ${ lastCallback } ${ functionEnd } ${ restParameters } ` ) ;
84
84
}
85
85
86
86
// Move the map arguments to from.
0 commit comments