From bd2c08b704e4ce6cf83bfc5cf2a324dedbe55af4 Mon Sep 17 00:00:00 2001 From: Karl Persson Date: Tue, 9 Jan 2024 16:16:23 +0100 Subject: [PATCH] format file --- CHANGELOG.md | 10 ++++------ .../specs/js/module/function/function_comments.js | 1 - .../specs/js/module/function/function_comments.js.snap | 1 - website/src/content/docs/internals/changelog.mdx | 10 ++++------ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f79a26c06171..0ad4450c337e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,10 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom ### Formatter +#### Bug fixes + +- Fix [#1172](https://github.com/biomejs/biome/issues/1172). Fix placement of line comment after function expression parentheses, they are now attached to first statement in body. Contributed by @kalleep + ### JavaScript APIs ### Linter @@ -32,7 +36,6 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom #### Bug fixes -<<<<<<< HEAD ### Parser @@ -53,11 +56,6 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom #### Bug fixes - Fix [#1170](https://github.com/biomejs/biome/issues/1170). Fix placement of comments inside default switch clause. Now all line comments that have a preceding node will keep their position. Contributed by @kalleep -======= -- Fix [#1172](https://github.com/biomejs/biome/issues/1172). Fix placement of line comment after function expression parentheses, they are now attached to first statement in body. Contributed by @kalleep - -### JavaScript APIs ->>>>>>> accd41b745 (fix changelog) ### Linter diff --git a/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js b/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js index d374bbd4a2ef..a39c7ca35c5c 100644 --- a/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js +++ b/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js @@ -11,7 +11,6 @@ function b() // leading comment } - function c( //some comment foo, bar, ) {} diff --git a/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap b/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap index 890ef735426a..724e07fe5fb6 100644 --- a/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap +++ b/crates/biome_js_formatter/tests/specs/js/module/function/function_comments.js.snap @@ -19,7 +19,6 @@ function b() // leading comment } - function c( //some comment foo, bar, ) {} diff --git a/website/src/content/docs/internals/changelog.mdx b/website/src/content/docs/internals/changelog.mdx index 9adcbb15aba3..3a9c6af943e3 100644 --- a/website/src/content/docs/internals/changelog.mdx +++ b/website/src/content/docs/internals/changelog.mdx @@ -26,6 +26,10 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom ### Formatter +#### Bug fixes + +- Fix [#1172](https://github.com/biomejs/biome/issues/1172). Fix placement of line comment after function expression parentheses, they are now attached to first statement in body. Contributed by @kalleep + ### JavaScript APIs ### Linter @@ -38,7 +42,6 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom #### Bug fixes -<<<<<<< HEAD ### Parser @@ -59,11 +62,6 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom #### Bug fixes - Fix [#1170](https://github.com/biomejs/biome/issues/1170). Fix placement of comments inside default switch clause. Now all line comments that have a preceding node will keep their position. Contributed by @kalleep -======= -- Fix [#1172](https://github.com/biomejs/biome/issues/1172). Fix placement of line comment after function expression parentheses, they are now attached to first statement in body. Contributed by @kalleep - -### JavaScript APIs ->>>>>>> accd41b745 (fix changelog) ### Linter