fix(fe): don't report missing else for bad if expression

quick-lint · Oct 29, 2023 · 1bbf3f5 · 1bbf3f5
1 parent 640b5e7
commit 1bbf3f5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/src/quick-lint-js/fe/parse.h b/src/quick-lint-js/fe/parse.h
@@ -1172,7 +1172,7 @@ void Parser::parse_and_visit_parenthesized_expression(
 
   const Char8 *expression_begin = this->peek().begin;
 
-  Expression *ast = this->parse_expression(v);
+  Expression *ast = this->parse_expression(v, {.trailing_identifiers = true});
   this->visit_expression(ast, v, Variable_Context::rhs);
 
   if constexpr (check_for_sketchy_conditions) {

diff --git a/test/test-parse-statement.cpp b/test/test-parse-statement.cpp
@@ -717,6 +717,25 @@ TEST_F(Test_Parse_Statement, else_without_if) {
                               "visit_exit_block_scope",
                           }));
   }
+
+  {
+    Test_Parser p(
+        u8"if (e isntanceof DataNotLoadedError) { } else { throw e; }"_sv,
+        capture_diags);
+    p.parse_and_visit_statement();
+    EXPECT_THAT(p.visits,
+                ElementsAreArray({"visit_variable_use",  // e
+                                  "visit_variable_use",  // typoed instanceof
+                                  "visit_variable_use",  // DataNotLoadedError
+                                  "visit_enter_block_scope",  //
+                                  "visit_exit_block_scope",   //
+                                  "visit_enter_block_scope",  //
+                                  "visit_variable_use",       // e
+                                  "visit_exit_block_scope"}));
+    EXPECT_THAT(
+        p.errors,
+        ::testing::Not(::testing::Contains(DIAG_TYPE(Diag_Else_Has_No_If))));
+  }
 }
 
 TEST_F(Test_Parse_Statement, missing_if_after_else) {

diff --git a/test/test-parse.cpp b/test/test-parse.cpp
@@ -320,8 +320,9 @@ TEST_F(Test_Parse, utter_garbage) {
     assert_diagnostics(
         p.code, p.errors,
         {
-            u8"   ^ Diag_Expected_Parentheses_Around_If_Condition"_diag,  //
-            u8"   ^ Diag_Unexpected_Token"_diag,
+            u8"   ^ Diag_Unexpected_Token"_diag,  //
+            u8"      ^^^^^^^^ Diag_Unexpected_Identifier_In_Expression"_diag,  //
+            u8"   ^^^^^^^^^^^ Diag_Expected_Parentheses_Around_If_Condition"_diag,
         });
   }
 }