Fix empty line check between array elements

changelog_unreleased/javascript/14736.md

@@ -0,0 +1,30 @@
+#### Fix trailing parens tripping up skipToLineEnd (#14736 by @solarized-fox)
+
+<!-- prettier-ignore -->
+```jsx
+// Input
+[
+  1
+  ,
+
+  2,
+
+  3
+]
+
+// Prettier stable
+[
+  1, 2,
+
+  3,
+];
+
+// Prettier main
+[
+  1,
+
+  2,
+
+  3,
+];
+```

src/language-js/print/array.js

@@ -9,17 +9,18 @@ import {
   fill,
 } from "../../document/builders.js";
 import hasNewline from "../../utils/has-newline.js";
+import isNextLineEmptyAfterIndex from "../../utils/is-next-line-empty.js";
+import { skipInlineComment, skipTrailingComment } from "../../utils/public.js";
 import {
   shouldPrintComma,
   hasComment,
   CommentCheckFlags,
-  isNextLineEmpty,
   isNumericLiteral,
   isSignedNumericLiteral,
   isArrayOrTupleExpression,
   isObjectOrRecordExpression,
 } from "../utils/index.js";
-import { locStart } from "../loc.js";
+import { locStart, locEnd } from "../loc.js";
 
 import { printOptionalToken } from "./misc.js";
 import { printTypeAnnotationProperty } from "./type-annotation.js";
@@ -170,6 +171,18 @@ function isConciselyPrintedArray(node, options) {
   );
 }
 
+function isLineAfterElementEmpty(path, { originalText: text }) {
+  const skipComment = (idx) =>
+    skipInlineComment(text, skipTrailingComment(text, idx));
+
+  const skipToComma = (currentIdx) =>
+    text[currentIdx] === ","
+      ? currentIdx
+      : skipToComma(skipComment(currentIdx + 1));
+
+  return isNextLineEmptyAfterIndex(text, skipToComma(locEnd(path.node)));
+}
+
 function printArrayElements(path, options, elementsProperty, print) {
   const parts = [];
 
@@ -180,7 +193,7 @@ function printArrayElements(path, options, elementsProperty, print) {
       parts.push([
         ",",
         line,
-        node && isNextLineEmpty(node, options) ? softline : "",
+        node && isLineAfterElementEmpty(path, options) ? softline : "",
       ]);
     }
   }, elementsProperty);
@@ -191,12 +204,12 @@ function printArrayElements(path, options, elementsProperty, print) {
 function printArrayElementsConcisely(path, options, print, trailingComma) {
   const parts = [];
 
-  path.each(({ node, isLast, next }) => {
+  path.each(({ isLast, next }) => {
     parts.push([print(), isLast ? trailingComma : ","]);
 
     if (!isLast) {
       parts.push(
-        isNextLineEmpty(node, options)
+        isLineAfterElementEmpty(path, options)
           ? [hardline, hardline]
           : hasComment(next, CommentCheckFlags.Leading | CommentCheckFlags.Line)
           ? hardline

tests/format/js/arrays/__snapshots__/jsfmt.spec.js.snap

@@ -844,6 +844,87 @@ a = [
 
 ]
 
+b = [
+  100,
+
+  (200)
+  ,
+
+  300
+  ,
+
+  1
+  ,
+  2, 3
+]
+
+c = [
+  "apple",
+  "banana",
+  "blueberry",
+
+  "red",
+  "blue"
+  ,
+  "yellow",
+
+  "broccoli",
+  "celery",
+  "lettuce"
+  ,
+
+  "green"
+  ,
+  "green",
+  "green",
+
+  //an egg
+  "egg",
+  //a bigger egg
+  "big egg"
+  //the biggest egg
+  ,
+  "huge egg"
+  ,
+
+  //not an egg
+  "lasagna"
+
+]
+
+_ = [
+  a,
+
+  b //
+]
+
+_ = [
+  (a),
+
+  b, //
+];
+
+_ = [
+  (((((
+    a = b/* comment */))/* comment */))),
+
+  c //
+]
+
+_ = [
+  (((((
+    (a = b)/* comment */))/* comment */))),
+
+  c //
+]
+
+_ = [
+  (a=b
+
+  ),
+  b, //
+];
+
 =====================================output=====================================
 a = [
   1, 2,
@@ -853,6 +934,73 @@ a = [
   4,
 ];
 
+b = [
+  100,
+
+  200,
+
+  300,
+
+  1, 2, 3,
+];
+
+c = [
+  "apple",
+  "banana",
+  "blueberry",
+
+  "red",
+  "blue",
+  "yellow",
+
+  "broccoli",
+  "celery",
+  "lettuce",
+
+  "green",
+  "green",
+  "green",
+
+  //an egg
+  "egg",
+  //a bigger egg
+  "big egg",
+  //the biggest egg
+  "huge egg",
+
+  //not an egg
+  "lasagna",
+];
+
+_ = [
+  a,
+
+  b, //
+];
+
+_ = [
+  a,
+
+  b, //
+];
+
+_ = [
+  (a = b) /* comment */ /* comment */,
+
+  c, //
+];
+
+_ = [
+  (a = b) /* comment */ /* comment */,
+
+  c, //
+];
+
+_ = [
+  (a = b),
+  b, //
+];
+
 ================================================================================
 `;
 

tests/format/js/arrays/preserve_empty_lines.js

@@ -10,3 +10,84 @@ a = [
 
 
 ]
+
+b = [
+  100,
+
+  (200)
+  ,
+
+  300
+  ,
+
+  1
+  ,
+  2, 3
+]
+
+c = [
+  "apple",
+  "banana",
+  "blueberry",
+
+  "red",
+  "blue"
+  ,
+  "yellow",
+
+  "broccoli",
+  "celery",
+  "lettuce"
+  ,
+
+  "green"
+  ,
+  "green",
+  "green",
+
+  //an egg
+  "egg",
+  //a bigger egg
+  "big egg"
+  //the biggest egg
+  ,
+  "huge egg"
+  ,
+
+  //not an egg
+  "lasagna"
+
+]
+
+_ = [
+  a,
+
+  b //
+]
+
+_ = [
+  (a),
+
+  b, //
+];
+
+_ = [
+  (((((
+    a = b/* comment */))/* comment */))),
+
+  c //
+]
+
+_ = [
+  (((((
+    (a = b)/* comment */))/* comment */))),
+
+  c //
+]
+
+_ = [
+  (a=b
+
+  ),
+  b, //
+];

tests/format/json/json/__snapshots__/jsfmt.spec.js.snap

@@ -1565,6 +1565,7 @@ trailingComma: "all"
   0.5,
   98.6,
   99.44,
+
   1066,
   1e1,
   0.1e1,
@@ -1695,6 +1696,7 @@ trailingComma: "all"
   0.5,
   98.6,
   99.44,
+
   1066,
   1e1,
   0.1e1,
@@ -1825,6 +1827,7 @@ trailingComma: "es5"
   0.5,
   98.6,
   99.44,
+
   1066,
   1e1,
   0.1e1,
@@ -1955,6 +1958,7 @@ trailingComma: "es5"
   0.5,
   98.6,
   99.44,
+
   1066,
   1e1,
   0.1e1,