fix(typescript): don't double-diagnose 'break;' inside 'declare namespace'

Author: strager

src/quick-lint-js/fe/parse-statement.cpp

@@ -656,7 +656,6 @@ bool Parser::parse_and_visit_statement(Parse_Visitor_Base &v,
   case Token_Type::kw_break:
   case Token_Type::kw_continue:
     this->is_current_typescript_namespace_non_empty_ = true;
-    on_non_declaring_statement();
     this->parse_and_visit_break_or_continue();
     break;
 

src/quick-lint-js/fe/parse.cpp

@@ -955,24 +955,31 @@ Parser::enter_typescript_namespace_or_module(
       this,
       std::exchange(this->in_typescript_namespace_or_module_,
                     namespace_or_module_keyword_span),
-      std::exchange(this->in_typescript_module_, entering_module));
+      std::exchange(this->in_typescript_module_, entering_module),
+      std::exchange(this->in_loop_statement_, false),
+      std::exchange(this->in_switch_statement_, false));
 }
 
 Parser::TypeScript_Namespace_Or_Module_Guard::
     TypeScript_Namespace_Or_Module_Guard(
         Parser* parser,
         std::optional<Source_Code_Span> old_in_typescript_namespace_or_module,
-        bool old_in_typescript_module)
+        bool old_in_typescript_module, bool old_in_loop_statement,
+        bool old_in_switch_statement)
     : parser_(parser),
       old_in_typescript_namespace_or_module_(
           old_in_typescript_namespace_or_module),
-      old_in_typescript_module_(old_in_typescript_module) {}
+      old_in_typescript_module_(old_in_typescript_module),
+      old_in_loop_statement_(old_in_loop_statement),
+      old_in_switch_statement_(old_in_switch_statement) {}
 
 Parser::TypeScript_Namespace_Or_Module_Guard::
     ~TypeScript_Namespace_Or_Module_Guard() {
   this->parser_->in_typescript_namespace_or_module_ =
       this->old_in_typescript_namespace_or_module_;
   this->parser_->in_typescript_module_ = this->old_in_typescript_module_;
+  this->parser_->in_loop_statement_ = this->old_in_loop_statement_;
+  this->parser_->in_switch_statement_ = this->old_in_switch_statement_;
 }
 
 bool Parser::Parse_Expression_Cache_Key::operator==(

src/quick-lint-js/fe/parse.h

@@ -982,7 +982,8 @@ class Parser {
     explicit TypeScript_Namespace_Or_Module_Guard(
         Parser *,
         std::optional<Source_Code_Span> old_in_typescript_namespace_or_module,
-        bool old_in_typescript_module);
+        bool old_in_typescript_module, bool old_in_loop_statement,
+        bool old_in_switch_statement);
 
     TypeScript_Namespace_Or_Module_Guard(
         const TypeScript_Namespace_Or_Module_Guard &) = delete;
@@ -995,6 +996,8 @@ class Parser {
     Parser *parser_;
     std::optional<Source_Code_Span> old_in_typescript_namespace_or_module_;
     bool old_in_typescript_module_;
+    bool old_in_loop_statement_;
+    bool old_in_switch_statement_;
   };
   // Sets in_typescript_namespace_or_module_ and in_typescript_module_.
   [[nodiscard]] TypeScript_Namespace_Or_Module_Guard

test/test-parse-typescript-declare-namespace.cpp

@@ -1012,19 +1012,31 @@ TEST_F(Test_Parse_TypeScript_Declare_Namespace,
       u8"                       ^^^^^^^^ Diag_Declare_Namespace_Cannot_Contain_Statement.first_statement_token"_diag,  //
       u8"                       ^^^^^^^ Diag_Keywords_Cannot_Contain_Escape_Sequences"_diag,
       typescript_options);
+}
 
-  // TODO(strager): Perhaps we should only emit
-  // Diag_Invalid_Break/Diag_Invalid_Continue.
+TEST_F(
+    Test_Parse_TypeScript_Declare_Namespace,
+    declare_namespace_does_not_report_double_diagnostic_for_certain_statements) {
   test_parse_and_visit_module(
       u8"declare namespace ns { break; }"_sv,  //
-      u8"                       ^^^^^ Diag_Declare_Namespace_Cannot_Contain_Statement.first_statement_token"_diag,  //
       u8"                       ^^^^^ Diag_Invalid_Break"_diag,
       typescript_options);
+  test_parse_and_visit_module(
+      u8"for (;;) { declare namespace ns { break; } }"_sv,  //
+      u8"                                  ^^^^^ Diag_Invalid_Break"_diag,
+      typescript_options);
+  test_parse_and_visit_module(
+      u8"switch (true) { default: declare namespace ns { break; } }"_sv,  //
+      u8"                                                ^^^^^ Diag_Invalid_Break"_diag,
+      typescript_options);
   test_parse_and_visit_module(
       u8"declare namespace ns { continue; }"_sv,  //
-      u8"                       ^^^^^^^^ Diag_Declare_Namespace_Cannot_Contain_Statement.first_statement_token"_diag,  //
       u8"                       ^^^^^^^^ Diag_Invalid_Continue"_diag,
       typescript_options);
+  test_parse_and_visit_module(
+      u8"for (;;) { declare namespace ns { continue; } }"_sv,  //
+      u8"                                  ^^^^^^^^ Diag_Invalid_Continue"_diag,
+      typescript_options);
 }
 
 TEST_F(Test_Parse_TypeScript_Declare_Namespace,