Span for E064 is too much #280

changes in parse.h and test-parse-statement.cpp

Author: AidenThing

src/quick-lint-js/error.h

@@ -572,9 +572,9 @@
                                                                                \
   QLJS_ERROR_TYPE(                                                             \
       error_missing_body_for_if_statement, "E064",                             \
-      { source_code_span if_and_condition; },                                  \
+      { source_code_span expected_body; },                                     \
       .error(QLJS_TRANSLATABLE("missing body for 'if' statement"),             \
-             if_and_condition))                                                \
+             expected_body))                                                   \
                                                                                \
   QLJS_ERROR_TYPE(                                                             \
       error_missing_body_for_switch_statement, "E106",                         \

src/quick-lint-js/parse.h

@@ -2506,9 +2506,10 @@ class parser {
     case token_type::end_of_file:
     case token_type::kw_else:
     case token_type::right_curly:
+      const char8 *end_of_if_condition = this->lexer_.end_of_previous_token();
       this->error_reporter_->report(error_missing_body_for_if_statement{
-          .if_and_condition = source_code_span(
-              if_token_span.begin(), this->lexer_.end_of_previous_token()),
+          .expected_body =
+              source_code_span(end_of_if_condition, end_of_if_condition),
       });
       break;
     }

test/test-parse-statement.cpp

@@ -458,8 +458,8 @@ TEST(test_parse, if_without_body) {
                                       "visit_variable_use"));  // e
     EXPECT_THAT(v.errors,
                 ElementsAre(ERROR_TYPE_FIELD(
-                    error_missing_body_for_if_statement, if_and_condition,
-                    offsets_matcher(&code, 0, u8"if (a)"))));
+                    error_missing_body_for_if_statement, expected_body,
+                    offsets_matcher(&code, strlen(u8"if (a)"), u8""))));
   }
 
   {
@@ -472,8 +472,8 @@ TEST(test_parse, if_without_body) {
                                       "visit_exit_block_scope"));
     EXPECT_THAT(v.errors,
                 ElementsAre(ERROR_TYPE_FIELD(
-                    error_missing_body_for_if_statement, if_and_condition,
-                    offsets_matcher(&code, strlen(u8"{\n"), u8"if (a)"))));
+                    error_missing_body_for_if_statement, expected_body,
+                    offsets_matcher(&code, strlen(u8"{\nif (a)"), u8""))));
     EXPECT_TRUE(p.parse_and_visit_statement(v));
     EXPECT_THAT(v.visits, ElementsAre("visit_enter_block_scope",  //
                                       "visit_variable_use",       // a
@@ -490,8 +490,8 @@ TEST(test_parse, if_without_body) {
                                       "visit_end_of_module"));
     EXPECT_THAT(v.errors,
                 ElementsAre(ERROR_TYPE_FIELD(
-                    error_missing_body_for_if_statement, if_and_condition,
-                    offsets_matcher(&code, 0, u8"if (a)"))));
+                    error_missing_body_for_if_statement, expected_body,
+                    offsets_matcher(&code, strlen(u8"if (a)"), u8""))));
   }
 }