refactor: extract printSingleLambdaInvocation method to regroup common logic

Author: clementdessoude

packages/prettier-plugin-java/src/printers/classes.ts

@@ -91,7 +91,7 @@ import {
 } from "java-parser";
 import { Doc } from "prettier";
 import { isAnnotationCstNode, isTypeArgumentsCstNode } from "../types/utils";
-import { printArgumentListWithBraces } from "../utils/printArgumentListWithBraces";
+import { printArgumentListWithBraces } from "../utils";
 
 const { line, softline, hardline } = builders;
 

packages/prettier-plugin-java/src/printers/expressions.ts

@@ -53,11 +53,11 @@ import { Doc } from "prettier";
 import { builders } from "prettier/doc";
 import { BaseCstPrettierPrinter } from "../base-cst-printer";
 import { isAnnotationCstNode } from "../types/utils";
+import { isArgumentListSingleLambda } from "../utils/expressions-utils";
 import {
-  isArgumentListSingleLambda,
-  isSingleArgumentLambdaExpressionWithBlock
-} from "../utils/expressions-utils";
-import { printArgumentListWithBraces } from "../utils/printArgumentListWithBraces";
+  printSingleLambdaInvocation,
+  printArgumentListWithBraces
+} from "../utils";
 import { printTokenWithComments } from "./comments/format-comments";
 import { handleCommentsBinaryExpression } from "./comments/handle-comments";
 import { concat, dedent, group, indent } from "./prettier-builder";
@@ -684,24 +684,18 @@ export class ExpressionsPrettierVisitor extends BaseCstPrettierPrinter {
   }
 
   methodInvocationSuffix(ctx: MethodInvocationSuffixCtx, params: any) {
-    const lambdaParametersGroupId = Symbol("lambdaParameters");
-    const argumentList = this.visit(ctx.argumentList, {
-      lambdaParametersGroupId,
-      isInsideMethodInvocationSuffix: true
-    });
-
     const isSingleLambda = isArgumentListSingleLambda(ctx.argumentList);
     if (isSingleLambda) {
-      const rBrace = isSingleArgumentLambdaExpressionWithBlock(ctx.argumentList)
-        ? ifBreak(
-            indent(concat([softline, ctx.RBrace[0]])),
-            printTokenWithComments(ctx.RBrace[0]),
-            { groupId: lambdaParametersGroupId }
-          )
-        : indent(concat([softline, ctx.RBrace[0]]));
-      return dedent(putIntoBraces(argumentList, "", ctx.LBrace[0], rBrace));
+      return printSingleLambdaInvocation.call(
+        this,
+        ctx.argumentList,
+        ctx.RBrace[0],
+        ctx.LBrace[0]
+      );
     }
 
+    const argumentList = this.visit(ctx.argumentList);
+
     if (params && params.shouldDedent) {
       return dedent(
         putIntoBraces(argumentList, softline, ctx.LBrace[0], ctx.RBrace[0])

packages/prettier-plugin-java/src/utils/index.ts

@@ -0,0 +1,2 @@
+export { default as printArgumentListWithBraces } from "./printArgumentListWithBraces";
+export { default as printSingleLambdaInvocation } from "./printSingleLambdaInvocation";

packages/prettier-plugin-java/src/utils/printArgumentListWithBraces.ts

@@ -1,39 +1,28 @@
 import { ArgumentListCstNode, IToken } from "java-parser";
 import { builders } from "prettier/doc";
-import {
-  isArgumentListSingleLambda,
-  isSingleArgumentLambdaExpressionWithBlock
-} from "./expressions-utils";
-import { printTokenWithComments } from "../printers/comments/format-comments";
-import { concat, dedent, indent } from "../printers/prettier-builder";
+import { isArgumentListSingleLambda } from "./expressions-utils";
 import { putIntoBraces } from "../printers/printer-utils";
+import printSingleLambdaInvocation from "./printSingleLambdaInvocation";
 
-const { softline, ifBreak } = builders;
+const { softline } = builders;
 
-export function printArgumentListWithBraces(
+export default function printArgumentListWithBraces(
   argumentListCtx: ArgumentListCstNode[] | undefined,
   rBrace: IToken,
   lBrace: IToken
 ) {
-  const lambdaParametersGroupId = Symbol("lambdaParameters");
-  const argumentList = this.visit(argumentListCtx, {
-    lambdaParametersGroupId,
-    isInsideMethodInvocationSuffix: true
-  });
   const isSingleLambda = isArgumentListSingleLambda(argumentListCtx);
-
   if (isSingleLambda) {
-    const formattedRBrace = isSingleArgumentLambdaExpressionWithBlock(
-      argumentListCtx
-    )
-      ? ifBreak(
-          indent(concat([softline, rBrace])),
-          printTokenWithComments(rBrace),
-          { groupId: lambdaParametersGroupId }
-        )
-      : indent(concat([softline, rBrace]));
-    return dedent(putIntoBraces(argumentList, "", lBrace, formattedRBrace));
+    return printSingleLambdaInvocation.call(
+      this,
+      argumentListCtx,
+      rBrace,
+      lBrace
+    );
   }
 
+  const argumentList = this.visit(argumentListCtx, {
+    isInsideMethodInvocationSuffix: true
+  });
   return putIntoBraces(argumentList, softline, lBrace, rBrace);
 }

packages/prettier-plugin-java/src/utils/printSingleLambdaInvocation.ts

@@ -0,0 +1,31 @@
+import { ArgumentListCstNode, IToken } from "java-parser";
+import { builders } from "prettier/doc";
+import { isSingleArgumentLambdaExpressionWithBlock } from "./expressions-utils";
+import { printTokenWithComments } from "../printers/comments/format-comments";
+import { concat, dedent, indent } from "../printers/prettier-builder";
+import { putIntoBraces } from "../printers/printer-utils";
+
+const { softline, ifBreak } = builders;
+
+export default function printSingleLambdaInvocation(
+  argumentListCtx: ArgumentListCstNode[] | undefined,
+  rBrace: IToken,
+  lBrace: IToken
+) {
+  const lambdaParametersGroupId = Symbol("lambdaParameters");
+  const argumentList = this.visit(argumentListCtx, {
+    lambdaParametersGroupId,
+    isInsideMethodInvocationSuffix: true
+  });
+
+  const formattedRBrace = isSingleArgumentLambdaExpressionWithBlock(
+    argumentListCtx
+  )
+    ? ifBreak(
+        indent(concat([softline, rBrace])),
+        printTokenWithComments(rBrace),
+        { groupId: lambdaParametersGroupId }
+      )
+    : indent(concat([softline, rBrace]));
+  return dedent(putIntoBraces(argumentList, "", lBrace, formattedRBrace));
+}