Minor refactor to function print (#18671)

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,

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();

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,
   );
 

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(

src/language-js/print/hook.js

@@ -51,7 +51,7 @@ function printHookTypeAnnotation(path, options, print) {
     path,
     options,
     print,
-    /* shouldExpandArgument */ false,
+    /* shouldExpandParameters */ false,
     /* shouldPrintTypeParameters */ true,
   );
 

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,
   );