From 54b7655daba78bf766e5cfc3ef16c957bf4bbc2c Mon Sep 17 00:00:00 2001
From: Yang Su <676185+yangsu@users.noreply.github.com>
Date: Tue, 7 May 2019 03:30:07 -0700
Subject: [PATCH] Improved multiline closure comment detection (#6070)

---
 CHANGELOG.unreleased.md                       | 35 +++++++++++++++++++
 src/language-js/needs-parens.js               | 11 ++++--
 .../__snapshots__/jsfmt.spec.js.snap          | 16 +++++++++
 .../closure-compiler-type-cast.js             |  8 +++++
 4 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 40ef23defba1..f1d5aeb9e11d 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -151,4 +151,39 @@ Examples:
     {{/if}}
     e
   {{/if}}
+
+* JavaScript: Improved multiline closure compiler typecast comment detection ([#6070] by [@yangsu])
+
+  Previously, multiline closure compiler typecast comments with lines that
+  start with \* weren't flagged correctly and the subsequent parenthesis were
+  stripped. Prettier master fixes this issue.
+
+  <!-- prettier-ignore --\>
+  ```js
+  // Input
+  const style =/**
+   * @type {{
+   *   width: number,
+   * }}
+  */({
+    width,
+  });
+  
+  // Output (Prettier stable)
+  const style =/**
+   * @type {{
+   *   width: number,
+   * }}
+  */ {
+    width,
+  };
+  
+  // Output (Prettier master)
+  const style =/**
+   * @type {{
+   *   width: number,
+   * }}
+  */({
+    width,
+  });
   ```
diff --git a/src/language-js/needs-parens.js b/src/language-js/needs-parens.js
index 0229c7bd9cb9..caa2d87f6222 100644
--- a/src/language-js/needs-parens.js
+++ b/src/language-js/needs-parens.js
@@ -45,13 +45,18 @@ function hasClosureCompilerTypeCastComment(text, path) {
   }
 
   function isTypeCastComment(comment) {
-    const trimmed = comment.trim();
-    if (!/^\*\s*@type\s*\{[^]+\}$/.test(trimmed)) {
+    const cleaned = comment
+      .trim()
+      .split("\n")
+      .map(line => line.replace(/^[\s*]+/, ""))
+      .join(" ")
+      .trim();
+    if (!/^@type\s+\{[^]+\}$/.test(cleaned)) {
       return false;
     }
     let isCompletelyClosed = false;
     let unpairedBracketCount = 0;
-    for (const char of trimmed) {
+    for (const char of cleaned) {
       if (char === "{") {
         if (isCompletelyClosed) {
           return false;
diff --git a/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap b/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
index a2549b7b2306..6b2c6c27d730 100644
--- a/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
+++ b/tests/comments_closure_typecast/__snapshots__/jsfmt.spec.js.snap
@@ -65,6 +65,14 @@ const style = /** @type {{
   ...margins,
 });
 
+const style =/**
+ * @type {{
+ *   width: number,
+ * }}
+*/({
+  width,
+});
+
 =====================================output=====================================
 // test to make sure comments are attached correctly
 let inlineComment = /* some comment */ someReallyLongFunctionCall(
@@ -128,5 +136,13 @@ const style = /** @type {{
   ...margins
 });
 
+const style = /**
+ * @type {{
+ *   width: number,
+ * }}
+ */ ({
+  width
+});
+
 ================================================================================
 `;
diff --git a/tests/comments_closure_typecast/closure-compiler-type-cast.js b/tests/comments_closure_typecast/closure-compiler-type-cast.js
index 52ed42dd0f0d..2eb1c2537282 100644
--- a/tests/comments_closure_typecast/closure-compiler-type-cast.js
+++ b/tests/comments_closure_typecast/closure-compiler-type-cast.js
@@ -56,3 +56,11 @@ const style = /** @type {{
   height,
   ...margins,
 });
+
+const style =/**
+ * @type {{
+ *   width: number,
+ * }}
+*/({
+  width,
+});