From 81e6208e63d457e2c7cbd98aaf43fefc3518ae49 Mon Sep 17 00:00:00 2001
From: Georgii Dolzhykov <thorn.mailbox@gmail.com>
Date: Mon, 15 Feb 2021 19:13:09 +0200
Subject: [PATCH] Allow arg hugging for non-concise arrow functions with return
 type (#10316)

---
 changelog_unreleased/typescript/10316.md      | 21 ++++++++
 src/language-js/print/call-arguments.js       | 12 ++++-
 .../__snapshots__/jsfmt.spec.js.snap          | 51 +++++++++++++++++++
 .../typeparams/print-width-120/issue-7542.ts  | 19 +++++++
 .../typeparams/print-width-120/jsfmt.spec.js  |  1 +
 5 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 changelog_unreleased/typescript/10316.md
 create mode 100644 tests/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap
 create mode 100644 tests/typescript/typeparams/print-width-120/issue-7542.ts
 create mode 100644 tests/typescript/typeparams/print-width-120/jsfmt.spec.js

diff --git a/changelog_unreleased/typescript/10316.md b/changelog_unreleased/typescript/10316.md
new file mode 100644
index 000000000..4ceeae64d
--- /dev/null
+++ b/changelog_unreleased/typescript/10316.md
@@ -0,0 +1,21 @@
+#### Allow hugging arguments that are non-concise arrow functions with return type annotations (#10316 by @thorn0)
+
+<!-- prettier-ignore -->
+```ts
+// Input
+users.map((user: User): User => {
+  return user;
+})
+
+// Prettier stable
+users.map(
+  (user: User): User => {
+    return user;
+  }
+);
+
+// Prettier main
+users.map((user: User): User => {
+  return user;
+})
+```
diff --git a/src/language-js/print/call-arguments.js b/src/language-js/print/call-arguments.js
index 42fc48035..e662860ea 100644
--- a/src/language-js/print/call-arguments.js
+++ b/src/language-js/print/call-arguments.js
@@ -240,7 +240,9 @@ function couldGroupArg(arg) {
       // });
       (!arg.returnType ||
         !arg.returnType.typeAnnotation ||
-        arg.returnType.typeAnnotation.type !== "TSTypeReference") &&
+        arg.returnType.typeAnnotation.type !== "TSTypeReference" ||
+        // https://github.com/prettier/prettier/issues/7542
+        isNonEmptyBlockStatement(arg.body)) &&
       (arg.body.type === "BlockStatement" ||
         arg.body.type === "ArrowFunctionExpression" ||
         arg.body.type === "ObjectExpression" ||
@@ -297,4 +299,12 @@ function isReactHookCallWithDepsArray(args) {
   );
 }
 
+function isNonEmptyBlockStatement(node) {
+  return (
+    node.type === "BlockStatement" &&
+    (node.body.some((node) => node.type !== "EmptyStatement") ||
+      hasComment(node, CommentCheckFlags.Dangling))
+  );
+}
+
 module.exports = printCallArguments;
diff --git a/tests/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap b/tests/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 000000000..666c9bb03
--- /dev/null
+++ b/tests/typescript/typeparams/print-width-120/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,51 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`issue-7542.ts - {"printWidth":120} format 1`] = `
+====================================options=====================================
+parsers: ["typescript"]
+printWidth: 120
+                                                                                                                        | printWidth
+=====================================input======================================
+export const Foo = forwardRef((props: FooProps, ref: Ref<HTMLElement>): JSX.Element => {
+  return <div />;
+});
+
+export const Bar = forwardRef((props: BarProps, ref: Ref<HTMLElement>): JSX.Element | null => {
+  return <div />;
+});
+
+users.map((user: User): User => {
+  return user;
+})
+
+users.map((user: User): User => {
+  ; // comment
+})
+
+users.map((user: User): User => {
+  // comment
+})
+
+=====================================output=====================================
+export const Foo = forwardRef((props: FooProps, ref: Ref<HTMLElement>): JSX.Element => {
+  return <div />;
+});
+
+export const Bar = forwardRef((props: BarProps, ref: Ref<HTMLElement>): JSX.Element | null => {
+  return <div />;
+});
+
+users.map((user: User): User => {
+  return user;
+});
+
+users.map((user: User): User => {
+  // comment
+});
+
+users.map((user: User): User => {
+  // comment
+});
+
+================================================================================
+`;
diff --git a/tests/typescript/typeparams/print-width-120/issue-7542.ts b/tests/typescript/typeparams/print-width-120/issue-7542.ts
new file mode 100644
index 000000000..b34016523
--- /dev/null
+++ b/tests/typescript/typeparams/print-width-120/issue-7542.ts
@@ -0,0 +1,19 @@
+export const Foo = forwardRef((props: FooProps, ref: Ref<HTMLElement>): JSX.Element => {
+  return <div />;
+});
+
+export const Bar = forwardRef((props: BarProps, ref: Ref<HTMLElement>): JSX.Element | null => {
+  return <div />;
+});
+
+users.map((user: User): User => {
+  return user;
+})
+
+users.map((user: User): User => {
+  ; // comment
+})
+
+users.map((user: User): User => {
+  // comment
+})
diff --git a/tests/typescript/typeparams/print-width-120/jsfmt.spec.js b/tests/typescript/typeparams/print-width-120/jsfmt.spec.js
new file mode 100644
index 000000000..fabcb10c9
--- /dev/null
+++ b/tests/typescript/typeparams/print-width-120/jsfmt.spec.js
@@ -0,0 +1 @@
+run_spec(__dirname, ["typescript"], { printWidth: 120 });