format file

biomejs · Jan 10, 2024 · 6feeb93 · 6feeb93
1 parent b50507e
commit 6feeb93
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git 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
 
 
@@ -47,17 +50,11 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom
 - Fix [#1465](https://github.com/biomejs/biome/issues/1465), by taking in consideration the workspace folder when matching a pattern. Contributed by @ematipico
 - Fix [#1465](https://github.com/biomejs/biome/issues/1465), by correctly process globs that contain file names. Contributed by @ematipico
 
-
 ### Formatter
 
 #### 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
@@ -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
@@ -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
@@ -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
 
 
@@ -53,17 +56,11 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom
 - Fix [#1465](https://github.com/biomejs/biome/issues/1465), by taking in consideration the workspace folder when matching a pattern. Contributed by @ematipico
 - Fix [#1465](https://github.com/biomejs/biome/issues/1465), by correctly process globs that contain file names. Contributed by @ematipico
 
-
 ### Formatter
 
 #### 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
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ function b() // leading comment @@
     }
     function c( //some comment
         foo, bar,
     ) {}
@@ Expand Down @@