diff --git a/src/language-js/print/arrow-function.js b/src/language-js/print/arrow-function.js index 37866a396..414db24d6 100644 --- a/src/language-js/print/arrow-function.js +++ b/src/language-js/print/arrow-function.js @@ -179,9 +179,9 @@ function printArrowFunctionSignature(path, options, print, args) { if (shouldPrintParamsWithoutParens(path, options)) { parts.push(print(["params", 0])); } else { - const shouldExpandArgument = args.expandLastArg || args.expandFirstArg; + const shouldExpandParameters = args.expandLastArg || args.expandFirstArg; let returnTypeDoc = printReturnType(path, print); - if (shouldExpandArgument) { + if (shouldExpandParameters) { if (willBreak(returnTypeDoc)) { throw new ArgExpansionBailout(); } @@ -193,7 +193,7 @@ function printArrowFunctionSignature(path, options, print, args) { path, options, print, - shouldExpandArgument, + shouldExpandParameters, /* shouldPrintTypeParameters */ true, ), returnTypeDoc, diff --git a/src/language-js/print/function-parameters.js b/src/language-js/print/function-parameters.js index 1cf445ad8..b328698d5 100644 --- a/src/language-js/print/function-parameters.js +++ b/src/language-js/print/function-parameters.js @@ -63,7 +63,7 @@ function printFunctionParameters( path, options, print, - shouldExpandArgument, + shouldExpandParameters, shouldPrintTypeParameters, ) { const functionNode = path.node; @@ -119,7 +119,7 @@ function printFunctionParameters( // } b, // ) ) => { // }) - if (shouldExpandArgument && !isDecoratedFunction(path)) { + if (shouldExpandParameters && !isDecoratedFunction(path)) { if (willBreak(typeParametersDoc) || willBreak(printed)) { // Removing lines in this case leads to broken or ugly output throw new ArgExpansionBailout(); diff --git a/src/language-js/print/function-type.js b/src/language-js/print/function-type.js index b9d698904..649c9d8d5 100644 --- a/src/language-js/print/function-type.js +++ b/src/language-js/print/function-type.js @@ -39,7 +39,7 @@ function printFunctionType(path, options, print) { path, options, print, - /* shouldExpandArgument */ false, + /* shouldExpandParameters */ false, /* shouldPrintTypeParameters */ true, ); diff --git a/src/language-js/print/function.js b/src/language-js/print/function.js index 49f93db18..e419d67e8 100644 --- a/src/language-js/print/function.js +++ b/src/language-js/print/function.js @@ -46,12 +46,8 @@ function printFunction(path, options, print, args) { const { node } = path; - let shouldExpandArgument = false; - if ( - (node.type === "FunctionDeclaration" || - node.type === "FunctionExpression") && - args?.expandLastArg - ) { + let shouldExpandParameters = false; + if (node.type === "FunctionExpression" && args?.expandLastArg) { const { parent } = path; if ( isCallExpression(parent) && @@ -60,7 +56,7 @@ function printFunction(path, options, print, args) { (param) => param.type === "Identifier" && !param.typeAnnotation, )) ) { - shouldExpandArgument = true; + shouldExpandParameters = true; } } @@ -68,7 +64,7 @@ function printFunction(path, options, print, args) { path, options, print, - shouldExpandArgument, + shouldExpandParameters, ); const returnTypeDoc = printReturnType(path, print); const shouldGroupParameters = shouldGroupFunctionParameters( diff --git a/src/language-js/print/hook.js b/src/language-js/print/hook.js index ba81917d6..2a902052a 100644 --- a/src/language-js/print/hook.js +++ b/src/language-js/print/hook.js @@ -51,7 +51,7 @@ function printHookTypeAnnotation(path, options, print) { path, options, print, - /* shouldExpandArgument */ false, + /* shouldExpandParameters */ false, /* shouldPrintTypeParameters */ true, ); diff --git a/src/language-js/print/method-signature.js b/src/language-js/print/method-signature.js index 91edc7aa6..20d38eb39 100644 --- a/src/language-js/print/method-signature.js +++ b/src/language-js/print/method-signature.js @@ -30,7 +30,7 @@ function printMethodSignature(path, options, print) { path, options, print, - /* shouldExpandArgument */ false, + /* shouldExpandParameters */ false, /* shouldPrintTypeParameters */ true, );