fix(js_parser): Correctly parse global declaration when the global token and the { token are not on the same line

CHANGELOG.md

@@ -130,6 +130,23 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom
 
 ### Parser
 
+#### Bug fixes
+- Fix [#1728](https://github.com/biomejs/biome/issues/1728). Correctly parse the global declaration when the `{` token is on the line following the `global` keyword.
+
+  Now the following code is correctly parsed:
+
+  ```ts
+  declare global 
+  { }
+
+  declare module foo {
+    global 
+    { }
+  }
+  ```
+
+  Contributed by @ah-yu 
+
 ## 1.5.3 (2024-01-22)
 
 ### LSP

crates/biome_js_parser/src/syntax/auxiliary.rs

@@ -47,6 +47,10 @@ pub(crate) fn is_nth_at_declaration_clause(p: &mut JsParser, n: usize) -> bool {
         return true;
     }
 
+    if is_nth_at_any_ts_namespace_declaration(p, n) {
+        return true;
+    }
+
     if p.has_nth_preceding_line_break(n + 1) {
         return false;
     }
@@ -63,10 +67,6 @@ pub(crate) fn is_nth_at_declaration_clause(p: &mut JsParser, n: usize) -> bool {
         return true;
     }
 
-    if is_nth_at_any_ts_namespace_declaration(p, n) {
-        return true;
-    }
-
     if p.nth_at(n, T![abstract]) && p.nth_at(n + 1, T![class]) {
         return true;
     }

crates/biome_js_parser/src/syntax/stmt.rs

@@ -359,7 +359,7 @@ pub(crate) fn parse_statement(p: &mut JsParser, context: StatementContext) -> Pa
         T![async] if is_at_async_function(p, LineBreak::DoNotCheck) => {
             parse_function_declaration(p, context)
         }
-        T![module] | T![namespace] | T![global] if is_at_any_ts_namespace_declaration(p) => {
+        T![module] | T![namespace] | T![global] if is_nth_at_any_ts_namespace_declaration(p, 0) => {
             let name = p.cur_range();
             TypeScript.parse_exclusive_syntax(
                 p,

crates/biome_js_parser/src/syntax/typescript/statement.rs

@@ -375,24 +375,11 @@ fn parse_ts_extends_clause(p: &mut JsParser) -> ParsedSyntax {
 }
 
 #[inline]
-pub(crate) fn is_at_any_ts_namespace_declaration(p: &mut JsParser) -> bool {
-    if p.has_nth_preceding_line_break(1) {
-        return false;
-    }
-
-    if matches!(p.cur(), T![namespace] | T![module]) {
-        return is_nth_at_identifier(p, 1) || p.nth_at(1, JS_STRING_LITERAL);
-    }
-
-    if p.at(T![global]) {
-        return p.nth_at(1, T!['{']);
+pub(crate) fn is_nth_at_any_ts_namespace_declaration(p: &mut JsParser, n: usize) -> bool {
+    if p.nth_at(n, T![global]) {
+        return p.nth_at(n + 1, T!['{']);
     }
 
-    false
-}
-
-#[inline]
-pub(crate) fn is_nth_at_any_ts_namespace_declaration(p: &mut JsParser, n: usize) -> bool {
     if p.has_nth_preceding_line_break(n + 1) {
         return false;
     }
@@ -401,10 +388,6 @@ pub(crate) fn is_nth_at_any_ts_namespace_declaration(p: &mut JsParser, n: usize)
         return is_nth_at_identifier(p, n + 1) || p.nth_at(n + 1, JS_STRING_LITERAL);
     }
 
-    if p.nth_at(n, T![global]) {
-        return p.nth_at(n + 1, T!['{']);
-    }
-
     false
 }
 
@@ -521,6 +504,13 @@ fn parse_ts_module_block(p: &mut JsParser) -> ParsedSyntax {
 //      let VERSION: string;
 //  }
 // }
+// declare module "foo" {
+//  global
+//  { }
+// }
+// declare global {}
+// declare global
+// { }
 //
 // test ts ts_global_variable
 // let global;

crates/biome_js_parser/test_data/inline/ok/ts_global_declaration.rast

@@ -48,15 +48,60 @@ JsModule {
                 },
             },
         },
+        TsDeclareStatement {
+            declare_token: [email protected] "declare" [Newline("\n")] [Whitespace(" ")],
+            declaration: TsExternalModuleDeclaration {
+                module_token: [email protected] "module" [] [Whitespace(" ")],
+                source: JsModuleSource {
+                    value_token: [email protected] "\"foo\"" [] [Whitespace(" ")],
+                },
+                body: TsModuleBlock {
+                    l_curly_token: [email protected] "{" [] [],
+                    items: JsModuleItemList [
+                        TsGlobalDeclaration {
+                            global_token: [email protected] "global" [Newline("\n"), Whitespace(" ")] [],
+                            body: TsModuleBlock {
+                                l_curly_token: [email protected] "{" [Newline("\n"), Whitespace(" ")] [Whitespace(" ")],
+                                items: JsModuleItemList [],
+                                r_curly_token: [email protected] "}" [] [],
+                            },
+                        },
+                    ],
+                    r_curly_token: [email protected] "}" [Newline("\n")] [],
+                },
+            },
+        },
+        TsDeclareStatement {
+            declare_token: [email protected] "declare" [Newline("\n")] [Whitespace(" ")],
+            declaration: TsGlobalDeclaration {
+                global_token: [email protected] "global" [] [Whitespace(" ")],
+                body: TsModuleBlock {
+                    l_curly_token: [email protected] "{" [] [],
+                    items: JsModuleItemList [],
+                    r_curly_token: [email protected] "}" [] [],
+                },
+            },
+        },
+        TsDeclareStatement {
+            declare_token: [email protected] "declare" [Newline("\n")] [Whitespace(" ")],
+            declaration: TsGlobalDeclaration {
+                global_token: [email protected] "global" [] [],
+                body: TsModuleBlock {
+                    l_curly_token: [email protected] "{" [Newline("\n")] [Whitespace(" ")],
+                    items: JsModuleItemList [],
+                    r_curly_token: [email protected] "}" [] [],
+                },
+            },
+        },
     ],
-    eof_token: EOF@66..67 "" [Newline("\n")] [],
+    eof_token: EOF@141..142 "" [Newline("\n")] [],
 }
 
-0: JS_MODULE@0..67
+0: JS_MODULE@0..142
   0: (empty)
   1: (empty)
   2: [email protected]
-  3: JS_MODULE_ITEM_LIST@0..66
+  3: JS_MODULE_ITEM_LIST@0..141
     0: [email protected]
       0: [email protected] "declare" [] [Whitespace(" ")]
       1: [email protected]
@@ -87,4 +132,36 @@ JsModule {
                     1: [email protected] ";" [] []
                 2: [email protected] "}" [Newline("\n"), Whitespace(" ")] []
           2: [email protected] "}" [Newline("\n")] []
-  4: [email protected] "" [Newline("\n")] []
+    1: [email protected]
+      0: [email protected] "declare" [Newline("\n")] [Whitespace(" ")]
+      1: [email protected]
+        0: [email protected] "module" [] [Whitespace(" ")]
+        1: [email protected]
+          0: [email protected] "\"foo\"" [] [Whitespace(" ")]
+        2: [email protected]
+          0: [email protected] "{" [] []
+          1: [email protected]
+            0: [email protected]
+              0: [email protected] "global" [Newline("\n"), Whitespace(" ")] []
+              1: [email protected]
+                0: [email protected] "{" [Newline("\n"), Whitespace(" ")] [Whitespace(" ")]
+                1: [email protected]
+                2: [email protected] "}" [] []
+          2: [email protected] "}" [Newline("\n")] []
+    2: [email protected]
+      0: [email protected] "declare" [Newline("\n")] [Whitespace(" ")]
+      1: [email protected]
+        0: [email protected] "global" [] [Whitespace(" ")]
+        1: [email protected]
+          0: [email protected] "{" [] []
+          1: [email protected]
+          2: [email protected] "}" [] []
+    3: [email protected]
+      0: [email protected] "declare" [Newline("\n")] [Whitespace(" ")]
+      1: [email protected]
+        0: [email protected] "global" [] []
+        1: [email protected]
+          0: [email protected] "{" [Newline("\n")] [Whitespace(" ")]
+          1: [email protected]
+          2: [email protected] "}" [] []
+  4: [email protected] "" [Newline("\n")] []

crates/biome_js_parser/test_data/inline/ok/ts_global_declaration.ts

@@ -3,3 +3,10 @@ declare module "./test" {
      let VERSION: string;
  }
 }
+declare module "foo" {
+ global
+ { }
+}
+declare global {}
+declare global
+{ }

website/src/content/docs/internals/changelog.mdx

@@ -136,6 +136,23 @@ Read our [guidelines for writing a good changelog entry](https://github.com/biom
 
 ### Parser
 
+#### Bug fixes
+- Fix [#1728](https://github.com/biomejs/biome/issues/1728). Correctly parse the global declaration when the `{` token is on the line following the `global` keyword.
+
+  Now the following code is correctly parsed:
+
+  ```ts
+  declare global 
+  { }
+
+  declare module foo {
+    global 
+    { }
+  }
+  ```
+
+  Contributed by @ah-yu 
+
 ## 1.5.3 (2024-01-22)
 
 ### LSP