fix: limit unclosed object value error boundary

biomejs · Apr 15, 2024 · 79e3871 · 79e3871
1 parent 53862c8
commit 79e3871
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 17 deletions.
diff --git a/crates/biome_graphql_parser/src/parser/value.rs b/crates/biome_graphql_parser/src/parser/value.rs
@@ -65,7 +65,7 @@ impl ParseRecovery for ObjectValueMemberListParseRecovery {
     const RECOVERED_KIND: Self::Kind = GRAPHQL_OBJECT_FIELD;
 
     fn is_at_recovered(&self, p: &mut Self::Parser<'_>) -> bool {
-        is_at_name(p)
+        is_at_name(p) || is_at_object_end(p)
     }
 }
 
@@ -83,7 +83,7 @@ impl ParseNodeList for ObjectValueMemberList {
     }
 
     fn is_at_list_end(&self, p: &mut Self::Parser<'_>) -> bool {
-        p.at(T!['}'])
+        is_at_object_end(p)
     }
 
     fn recover(
@@ -286,3 +286,8 @@ fn is_at_object(p: &GraphqlParser) -> bool {
 fn is_at_object_field(p: &GraphqlParser) -> bool {
     is_at_name(p)
 }
+
+#[inline]
+fn is_at_object_end(p: &GraphqlParser) -> bool {
+    p.at(T!['}']) || is_at_argument_list_end(p)
+}
diff --git a/crates/biome_graphql_parser/tests/graphql_test_suite/err/value.graphql b/crates/biome_graphql_parser/tests/graphql_test_suite/err/value.graphql
@@ -13,5 +13,6 @@
 		object_value: {key:}
 		object_value: {key}
 		object_value: key}
+		object_value: {
 	)
 }
diff --git a/crates/biome_graphql_parser/tests/graphql_test_suite/err/value.graphql.snap b/crates/biome_graphql_parser/tests/graphql_test_suite/err/value.graphql.snap
@@ -19,6 +19,7 @@ expression: snapshot
 		object_value: {key:}
 		object_value: {key}
 		object_value: key}
+		object_value: {
 	)
 }
 
@@ -237,37 +238,48 @@ GraphqlRoot {
                                                 r_curly_token: R_CURLY@321..322 "}" [] [],
                                             },
                                         },
+                                        GraphqlArgument {
+                                            name: GraphqlName {
+                                                value_token: GRAPHQL_NAME@322..337 "object_value" [Newline("\n"), Whitespace("\t\t")] [],
+                                            },
+                                            colon_token: COLON@337..339 ":" [] [Whitespace(" ")],
+                                            value: GraphqlObjectValue {
+                                                l_curly_token: L_CURLY@339..340 "{" [] [],
+                                                members: GraphqlObjectValueMemberList [],
+                                                r_curly_token: missing (required),
+                                            },
+                                        },
                                     ],
                                 },
-                                R_PAREN@322..325 ")" [Newline("\n"), Whitespace("\t")] [],
+                                R_PAREN@340..343 ")" [Newline("\n"), Whitespace("\t")] [],
                             ],
                         },
                         GraphqlDirectiveList [],
                     ],
                 },
             ],
-            r_curly_token: R_CURLY@325..327 "}" [Newline("\n")] [],
+            r_curly_token: R_CURLY@343..345 "}" [Newline("\n")] [],
         },
     ],
-    eof_token: EOF@327..328 "" [Newline("\n")] [],
+    eof_token: EOF@345..346 "" [Newline("\n")] [],
 }
 ```
 
 ## CST
 
 ```
-0: GRAPHQL_ROOT@0..328
+0: GRAPHQL_ROOT@0..346
   0: (empty)
-  1: GRAPHQL_DEFINITION_LIST@0..327
-    0: GRAPHQL_SELECTION_SET@0..327
+  1: GRAPHQL_DEFINITION_LIST@0..345
+    0: GRAPHQL_SELECTION_SET@0..345
       0: L_CURLY@0..1 "{" [] []
-      1: GRAPHQL_SELECTION_LIST@1..325
-        0: GRAPHQL_BOGUS_SELECTION@1..325
+      1: GRAPHQL_SELECTION_LIST@1..343
+        0: GRAPHQL_BOGUS_SELECTION@1..343
           0: GRAPHQL_NAME@1..14
             0: GRAPHQL_NAME@1..14 "field_value" [Newline("\n"), Whitespace("\t")] []
-          1: GRAPHQL_BOGUS@14..325
+          1: GRAPHQL_BOGUS@14..343
             0: L_PAREN@14..15 "(" [] []
-            1: GRAPHQL_BOGUS@15..322
+            1: GRAPHQL_BOGUS@15..340
               0: GRAPHQL_ARGUMENT@15..31
                 0: GRAPHQL_NAME@15..29
                   0: GRAPHQL_NAME@15..29 "float_value" [Newline("\n"), Whitespace("\t\t")] []
@@ -391,10 +403,18 @@ GraphqlRoot {
                         0: GRAPHQL_NAME@318..321
                           0: GRAPHQL_NAME@318..321 "key" [] []
                   2: R_CURLY@321..322 "}" [] []
-            2: R_PAREN@322..325 ")" [Newline("\n"), Whitespace("\t")] []
-          2: GRAPHQL_DIRECTIVE_LIST@325..325
-      2: R_CURLY@325..327 "}" [Newline("\n")] []
-  2: EOF@327..328 "" [Newline("\n")] []
+              16: GRAPHQL_ARGUMENT@322..340
+                0: GRAPHQL_NAME@322..337
+                  0: GRAPHQL_NAME@322..337 "object_value" [Newline("\n"), Whitespace("\t\t")] []
+                1: COLON@337..339 ":" [] [Whitespace(" ")]
+                2: GRAPHQL_OBJECT_VALUE@339..340
+                  0: L_CURLY@339..340 "{" [] []
+                  1: GRAPHQL_OBJECT_VALUE_MEMBER_LIST@340..340
+                  2: (empty)
+            2: R_PAREN@340..343 ")" [Newline("\n"), Whitespace("\t")] []
+          2: GRAPHQL_DIRECTIVE_LIST@343..343
+      2: R_CURLY@343..345 "}" [Newline("\n")] []
+  2: EOF@345..346 "" [Newline("\n")] []
 
 ```
 
@@ -565,8 +585,21 @@ value.graphql:14:21 parse ━━━━━━━━━━━━━━━━━━
   > 14 │ 		object_value: {key}
        │ 		                  ^
     15 │ 		object_value: key}
-    16 │ 	)
+    16 │ 		object_value: {
   
   i Remove }
   
+value.graphql:17:2 parse ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  × expected `}` but instead found `)`
+  
+    15 │ 		object_value: key}
+    16 │ 		object_value: {
+  > 17 │ 	)
+       │ 	^
+    18 │ }
+    19 │ 
+  
+  i Remove )
+  
 ```