Optimize

prettier · Sep 10, 2022 · 5751d96 · 5751d96
1 parent 98d4265
commit 5751d96
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/language-js/parse/postprocess/index.js b/src/language-js/parse/postprocess/index.js
@@ -159,22 +159,24 @@ function postprocess(ast, options) {
 
   /* eslint-disable prettier-internal-rules/no-node-comments */
   if (isNonEmptyArray(ast.comments)) {
+    let followingComment = getLast(ast.comments);
     for (let i = ast.comments.length - 2; i >= 0; i--) {
       const comment = ast.comments[i];
-      const nextComment = ast.comments[i + 1];
       if (
+        locEnd(comment) === locStart(followingComment) &&
         isBlockComment(comment) &&
         isIndentableBlockComment(comment) &&
-        isBlockComment(nextComment) &&
-        isIndentableBlockComment(nextComment) &&
-        locEnd(comment) === locStart(nextComment)
+        isBlockComment(followingComment) &&
+        isIndentableBlockComment(followingComment)
       ) {
         ast.comments.splice(i + 1, 1);
-        ast.comments[i] = {
+        followingComment = ast.comments[i] = {
           ...comment,
-          value: comment.value + "*//*" + nextComment.value,
-          range: [locStart(comment), locEnd(nextComment)],
+          value: comment.value + "*//*" + followingComment.value,
+          range: [locStart(comment), locEnd(followingComment)],
         };
+      } else {
+        followingComment = comment;
       }
     }
   }

diff --git a/tests/format/js/comments/__snapshots__/jsfmt.spec.js.snap b/tests/format/js/comments/__snapshots__/jsfmt.spec.js.snap
@@ -3177,6 +3177,7 @@ function value(type, value) {
 
 /** Trailing nestled comment 1
  *//** Trailing nestled comment 2
+ *//** Trailing nestled comment 3
  */
 
 =====================================output=====================================
@@ -3206,6 +3207,7 @@ function value(type, value) {
 
 /** Trailing nestled comment 1
  *//** Trailing nestled comment 2
+ *//** Trailing nestled comment 3
  */
 
 ================================================================================
@@ -3243,6 +3245,7 @@ function value(type, value) {
 
 /** Trailing nestled comment 1
  *//** Trailing nestled comment 2
+ *//** Trailing nestled comment 3
  */
 
 =====================================output=====================================
@@ -3272,6 +3275,7 @@ function value(type, value) {
 
 /** Trailing nestled comment 1
  *//** Trailing nestled comment 2
+ *//** Trailing nestled comment 3
  */
 
 ================================================================================

diff --git a/tests/format/js/comments/jsdoc-nestled.js b/tests/format/js/comments/jsdoc-nestled.js
@@ -24,4 +24,5 @@ function value(type, value) {
 
 /** Trailing nestled comment 1
  *//** Trailing nestled comment 2
+ *//** Trailing nestled comment 3
  */