chore: upgrade prettier and update snapshots (#2502)

.gitignore

@@ -23,3 +23,8 @@ crates/biome_js_formatter/report.*
 crates/biome_json_formatter/report.*
 crates/biome_json_formatter/report_incompatible.*
 .vercel
+
+# don't ignore any files inside prettier test specs
+!crates/biome_js_formatter/tests/specs/prettier/**/*
+!crates/biome_json_formatter/tests/specs/prettier/**/*
+!crates/biome_css_formatter/tests/specs/prettier/**/*

crates/biome_formatter_test/src/prettier/package.json

@@ -4,6 +4,6 @@
 		"start": "node prepare_tests"
 	},
 	"dependencies": {
-		"prettier": "3.1.0"
+		"prettier": "3.2.5"
 	}
 }

crates/biome_js_formatter/src/comments.rs

@@ -764,7 +764,7 @@ fn handle_if_statement_comment(
             && !comment.text_position().is_own_line()
             && comment.preceding_node().is_some()
         {
-            return CommentPlacement::dangling(consequent, comment);
+            return CommentPlacement::trailing(consequent, comment);
         }
 
         // ```javascript

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15785-1.js

@@ -0,0 +1,8 @@
+function someFunctionName(
+  someLongBreakingParameterName,
+  anotherLongParameterName,
+) {
+  return isEqual(a?.map(([t, _]) => t?.id), b?.map(([t, _]) => t?.id));
+  return isEqual(a.map(([t, _]) => t?.id), b.map(([t, _]) => t?.id));
+}
+

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15785-1.js.prettier-snap

@@ -0,0 +1,13 @@
+function someFunctionName(
+  someLongBreakingParameterName,
+  anotherLongParameterName,
+) {
+  return isEqual(
+    a?.map(([t, _]) => t?.id),
+    b?.map(([t, _]) => t?.id),
+  );
+  return isEqual(
+    a.map(([t, _]) => t?.id),
+    b.map(([t, _]) => t?.id),
+  );
+}

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15785-2.js

@@ -0,0 +1,6 @@
+const theValue = Object.entries(someLongObjectName).filter(
+  ([listingId]) => someListToCompareToHere?.includes(listingId),
+);
+const theValue2 = Object.entries(someLongObjectName).filter(
+  ([listingId]) => someListToCompareToHere.includes(listingId),
+);

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15785-2.js.prettier-snap

@@ -0,0 +1,6 @@
+const theValue = Object.entries(someLongObjectName).filter(([listingId]) =>
+  someListToCompareToHere?.includes(listingId),
+);
+const theValue2 = Object.entries(someLongObjectName).filter(([listingId]) =>
+  someListToCompareToHere.includes(listingId),
+);

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15785-3.js

@@ -0,0 +1,6 @@
+logger.log(
+  `A long template string with a conditional: ${channel?.id}, and then some more content that continues until ${JSON.stringify(location)}`
+);
+logger.log(
+  `A long template string with a conditional: ${channel.id}, and then some more content that continues until ${JSON.stringify(location)}`
+);

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15785-3.js.prettier-snap

@@ -0,0 +1,6 @@
+logger.log(
+  `A long template string with a conditional: ${channel?.id}, and then some more content that continues until ${JSON.stringify(location)}`,
+);
+logger.log(
+  `A long template string with a conditional: ${channel.id}, and then some more content that continues until ${JSON.stringify(location)}`,
+);

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15785-3.js.snap

@@ -0,0 +1,59 @@
+---
+source: crates/biome_formatter_test/src/snapshot_builder.rs
+info: js/chain-expression/issue-15785-3.js
+---
+# Input
+
+```js
+logger.log(
+  `A long template string with a conditional: ${channel?.id}, and then some more content that continues until ${JSON.stringify(location)}`
+);
+logger.log(
+  `A long template string with a conditional: ${channel.id}, and then some more content that continues until ${JSON.stringify(location)}`
+);
+
+```
+
+
+# Prettier differences
+
+```diff
+--- Prettier
++++ Biome
+@@ -1,6 +1,14 @@
+ logger.log(
+-  `A long template string with a conditional: ${channel?.id}, and then some more content that continues until ${JSON.stringify(location)}`,
++  `A long template string with a conditional: ${
++    channel?.id
++  }, and then some more content that continues until ${JSON.stringify(
++    location,
++  )}`,
+ );
+ logger.log(
+-  `A long template string with a conditional: ${channel.id}, and then some more content that continues until ${JSON.stringify(location)}`,
++  `A long template string with a conditional: ${
++    channel.id
++  }, and then some more content that continues until ${JSON.stringify(
++    location,
++  )}`,
+ );
+```
+
+# Output
+
+```js
+logger.log(
+  `A long template string with a conditional: ${
+    channel?.id
+  }, and then some more content that continues until ${JSON.stringify(
+    location,
+  )}`,
+);
+logger.log(
+  `A long template string with a conditional: ${
+    channel.id
+  }, and then some more content that continues until ${JSON.stringify(
+    location,
+  )}`,
+);
+```

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15912.js

@@ -0,0 +1,3 @@
+test()
+  .test2()
+  .test2(thing?.something);

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15912.js.prettier-snap

@@ -0,0 +1 @@
+test().test2().test2(thing?.something);

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15916.js

@@ -0,0 +1,12 @@
+const randomFuncion = (value) => {
+    if (value.a) {
+        funcA(
+            "",
+            funcB(
+                dayjs(value.a?.toString())
+                      .add(1, "day")
+                      .toISOString()
+            )
+        );
+    }
+};

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/issue-15916.js.prettier-snap

@@ -0,0 +1,5 @@
+const randomFuncion = (value) => {
+  if (value.a) {
+    funcA("", funcB(dayjs(value.a?.toString()).add(1, "day").toISOString()));
+  }
+};

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/test-2.js

@@ -0,0 +1,4 @@
+{{{{
+        const [lastCommittedX, lastCommittedY] =
+          multiElement?.lastCommittedPoint ?? [0, 0];
+}}}}

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/test-2.js.prettier-snap

@@ -0,0 +1,10 @@
+{
+  {
+    {
+      {
+        const [lastCommittedX, lastCommittedY] =
+          multiElement?.lastCommittedPoint ?? [0, 0];
+      }
+    }
+  }
+}

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/test-3.js

@@ -0,0 +1,6 @@
+function getLanguageByInterpreter(languages, file) {
+  return languages.find((language) => language.interpreters?.includes(interpreter),
+  );
+  return languages.find((language) =>language.interpreters.includes(interpreter),
+  );
+}

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/test-3.js.prettier-snap

@@ -0,0 +1,8 @@
+function getLanguageByInterpreter(languages, file) {
+  return languages.find((language) =>
+    language.interpreters?.includes(interpreter),
+  );
+  return languages.find((language) =>
+    language.interpreters.includes(interpreter),
+  );
+}

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/test-4.js

@@ -0,0 +1,22 @@
+// https://github.com/marmelab/react-admin/blob/8c1ddfeb4e011a94609d709c0f4f139fb5d480e8/packages/ra-data-localstorage/src/index.ts#L112
+export default (params) => {
+    return {
+        updateMany: (resource, params) => {
+            updateLocalStorage(() => {
+                params.ids.forEach(id => {
+                    const index = data.data.data.data.data[resource]?.findIndex(
+                        record => record.id == id
+                    );
+                    const index2 = data.data.data.data.data[resource].findIndex(
+                        record => record.id == id
+                    );
+                    data[resource][index] = {
+                        ...data[resource][index],
+                        ...params.data,
+                    };
+                });
+            });
+            return baseDataProvider.updateMany(resource, params);
+        },
+    }
+}

crates/biome_js_formatter/tests/specs/prettier/js/chain-expression/test-4.js.prettier-snap

@@ -0,0 +1,22 @@
+// https://github.com/marmelab/react-admin/blob/8c1ddfeb4e011a94609d709c0f4f139fb5d480e8/packages/ra-data-localstorage/src/index.ts#L112
+export default (params) => {
+  return {
+    updateMany: (resource, params) => {
+      updateLocalStorage(() => {
+        params.ids.forEach((id) => {
+          const index = data.data.data.data.data[resource]?.findIndex(
+            (record) => record.id == id,
+          );
+          const index2 = data.data.data.data.data[resource].findIndex(
+            (record) => record.id == id,
+          );
+          data[resource][index] = {
+            ...data[resource][index],
+            ...params.data,
+          };
+        });
+      });
+      return baseDataProvider.updateMany(resource, params);
+    },
+  };
+};

crates/biome_js_formatter/tests/specs/prettier/js/comments/return-statement.js

@@ -120,7 +120,6 @@ function inlineComment() {
   ) || 42
 }
 
-
 function multilineBlockSameLine() {
   return (
     /**

crates/biome_js_formatter/tests/specs/prettier/js/comments/return-statement.js.snap

@@ -127,7 +127,6 @@ function inlineComment() {
   ) || 42
 }
 
-
 function multilineBlockSameLine() {
   return (
     /**

crates/biome_js_formatter/tests/specs/prettier/js/cursor/cursor-11.js

@@ -0,0 +1,17 @@
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+               <|> 3, "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ]
+    ]
+  ]
+]

crates/biome_js_formatter/tests/specs/prettier/js/cursor/cursor-11.js.prettier-snap

@@ -0,0 +1,18 @@
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+        3,
+       <|> "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ],
+    ],
+  ],
+];

crates/biome_js_formatter/tests/specs/prettier/js/cursor/cursor-12.js

@@ -0,0 +1,17 @@
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+        3  <|>      ,"looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ]
+    ]
+  ]
+]

crates/biome_js_formatter/tests/specs/prettier/js/cursor/cursor-12.js.prettier-snap

@@ -0,0 +1,18 @@
+// At the time of adding this test, the cursor positioning we end up with
+// here seems clearly wrong.
+// I'm adding the test case anyway to demonstrate the brokenness and ensure
+// that if a future changes fixes it, it'll be obvious from the PR diff that
+// the fix happened.
+[
+  [
+    [
+      [
+        1,
+        2,
+        3,
+  <|>      "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+        "looooooooooooooooooooooooooooooooooooooooooooooooooong",
+      ],
+    ],
+  ],
+];

crates/biome_js_formatter/tests/specs/prettier/js/cursor/cursor-13.js

@@ -0,0 +1,3 @@
+      import lib from './lib.js';
+
+        function myFunction() { return 'foo'; }<|>

crates/biome_js_formatter/tests/specs/prettier/js/cursor/cursor-13.js.prettier-snap

@@ -0,0 +1,5 @@
+import lib from "./lib.js";
+
+function myFunction() {
+  return "foo";
+}<|>