challenge(formatter): fix typescript declarations and soft wrap index signatures

crates/biome_js_formatter/src/comments.rs

@@ -142,7 +142,8 @@ impl CommentStyle for JsCommentStyle {
                 .or_else(handle_array_hole_comment)
                 .or_else(handle_call_expression_comment)
                 .or_else(handle_continue_break_comment)
-                .or_else(handle_class_comment),
+                .or_else(handle_class_comment)
+                .or_else(handle_declare_comment),
         }
     }
 }
@@ -301,6 +302,75 @@ fn handle_labelled_statement_comment(
     }
 }
 
+/// Moves comments in declaration statements to behind the identifier
+///
+/// ```javascript
+/// declare module /* comment */ A {}
+/// declare /* module */ global {}
+/// ```
+fn handle_declare_comment(comment: DecoratedComment<JsLanguage>) -> CommentPlacement<JsLanguage> {
+    match (comment.enclosing_node().kind(), comment.following_node()) {
+        // Check if it is a declare statement
+        (JsSyntaxKind::TS_DECLARE_STATEMENT, Some(following)) => {
+            println!("following: {:?}", following);
+            following.children().for_each(|child| {
+                println!("\tchild: {:?}", child);
+                child.children().for_each(|grandchild| {
+                    println!("\t\tgrandchild: {:?}", grandchild);
+                });
+            });
+            match following.kind() {
+                JsSyntaxKind::TS_GLOBAL_DECLARATION => {
+                    // Global declarations have no identifier, so keep at default
+                    CommentPlacement::Default(comment)
+                }
+                JsSyntaxKind::TS_MODULE_DECLARATION
+                | JsSyntaxKind::TS_ENUM_DECLARATION
+                | JsSyntaxKind::TS_INTERFACE_DECLARATION
+                | JsSyntaxKind::TS_DECLARE_FUNCTION_DECLARATION
+                | JsSyntaxKind::TS_TYPE_ALIAS_DECLARATION => {
+                    // Move comment after the module keyword
+                    // This is the first child of the module declaration which is the identifier
+                    if following.first_child().is_some() {
+                        return CommentPlacement::leading(
+                            following.first_child().unwrap().clone(),
+                            comment,
+                        );
+                    }
+                    CommentPlacement::Default(comment)
+                }
+                JsSyntaxKind::JS_CLASS_DECLARATION => {
+                    if following.first_child().is_some()
+                        && following.first_child().unwrap().next_sibling().is_some()
+                    {
+                        return CommentPlacement::leading(
+                            following
+                                .first_child()
+                                .unwrap()
+                                .next_sibling()
+                                .unwrap()
+                                .clone(),
+                            comment,
+                        );
+                    }
+                    CommentPlacement::Default(comment)
+                }
+                JsSyntaxKind::JS_VARIABLE_DECLARATION_CLAUSE => {
+                    let first_identifier = following
+                        .descendants()
+                        .find(|node| node.kind() == JsSyntaxKind::JS_IDENTIFIER_BINDING);
+                    if let Some(first_identifier_exists) = first_identifier {
+                        return CommentPlacement::leading(first_identifier_exists.clone(), comment);
+                    }
+                    CommentPlacement::Default(comment)
+                }
+                _ => CommentPlacement::Default(comment),
+            }
+        }
+        _ => CommentPlacement::Default(comment),
+    }
+}
+
 fn handle_class_comment(comment: DecoratedComment<JsLanguage>) -> CommentPlacement<JsLanguage> {
     // Make comments following after the `extends` or `implements` keyword trailing comments
     // of the preceding extends, type parameters, or id.

crates/biome_js_formatter/src/ts/auxiliary/index_signature_type_member.rs

@@ -1,7 +1,7 @@
 use crate::prelude::*;
 use crate::utils::FormatTypeMemberSeparator;
 
-use biome_formatter::write;
+use biome_formatter::{format_args, write};
 use biome_js_syntax::{TsIndexSignatureTypeMember, TsIndexSignatureTypeMemberFields};
 
 #[derive(Debug, Clone, Default)]
@@ -29,9 +29,11 @@ impl FormatNodeRule<TsIndexSignatureTypeMember> for FormatTsIndexSignatureTypeMe
         write![
             f,
             [
-                l_brack_token.format(),
-                parameter.format(),
-                r_brack_token.format(),
+                group(&format_args![
+                    l_brack_token.format(),
+                    soft_block_indent(&format_args![parameter.format()]),
+                    r_brack_token.format(),
+                ]),
                 type_annotation.format(),
                 FormatTypeMemberSeparator::new(separator_token.as_ref()),
             ]

crates/biome_js_formatter/tests/specs/prettier/typescript/conformance/types/moduleDeclaration/kind-detection.ts

@@ -1 +1,9 @@
 declare /* module */ namespace A {}
+declare /* module */ function B()
+declare /* module */ class C {}
+declare /* module */ enum D {}
+declare /* module */ interface E {}
+declare /* module */ type F = {}
+declare /* module */ var G: number;
+declare /* module */ let H: number;
+declare /* module */ const I = 1;

crates/biome_js_formatter/tests/specs/prettier/typescript/conformance/types/moduleDeclaration/kind-detection.ts.prettier-snap

@@ -1 +1,9 @@
 declare namespace /* module */ A {}
+declare function /* module */ B();
+declare class /* module */ C {}
+declare enum /* module */ D {}
+declare interface /* module */ E {}
+declare type /* module */ F = {};
+declare var /* module */ G: number;
+declare let /* module */ H: number;
+declare const /* module */ I = 1;

crates/biome_js_formatter/tests/specs/prettier/typescript/error-recovery/index-signature.ts.snap

@@ -34,7 +34,7 @@ type TooLongSingleParam = {
 ```diff
 --- Prettier
 +++ Biome
-@@ -2,30 +2,22 @@
+@@ -2,26 +2,20 @@
 
  type TwoParams = {
    [a: string, b: string]: string;
@@ -71,11 +71,6 @@ type TooLongSingleParam = {
 
  // note lack of trailing comma in the index signature
  type TooLongSingleParam = {
--  [
--    looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong: string
--  ]: string;
-+  [looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong: string]: string;
- };
 ```
 
 # Output
@@ -102,7 +97,9 @@ type TooLong80 =
 
 // note lack of trailing comma in the index signature
 type TooLongSingleParam = {
-  [looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong: string]: string;
+  [
+    looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong: string
+  ]: string;
 };
 ```
 
@@ -447,7 +444,7 @@ index-signature.ts:14:99 parse ━━━━━━━━━━━━━━━━
    11:   [loooooooooooooooooooooooooong: string, looooooooooooooooooooooooooooooooooooooong: string]: string;
    14:   { [loooooooooooooooooooooooooong: string, loooooooooooooooooong: string]: string;
    17:   { [loooooooooooooooooooooooooong: string, looooooooooooooooong: string]: string;
-   22:   [looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong: string]: string;
+   23:     looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong: string
 ```