feat(typescript): error on 'declare import ...'

strager · strager · commit 6d06db4157b9 · 2023-03-07T20:08:43.000-08:00
diff --git a/po/de.po b/po/de.po
@@ -1424,6 +1424,11 @@ msgstr ""
 msgid "move the 'extends' clause before 'implements' here"
 msgstr ""
 
+#: src/quick-lint-js/diag/diagnostic-types.h
+#, fuzzy
+msgid "cannot use 'declare' keyword with 'import'"
+msgstr "Kann keine Variable namens 'let' deklarieren und exportieren"
+
 #: src/quick-lint-js/diag/diagnostic-types.h
 #, fuzzy
 msgid "TypeScript import aliases are not allowed in JavaScript"
diff --git a/po/en_US@snarky.po b/po/en_US@snarky.po
@@ -1351,6 +1351,11 @@ msgstr ""
 msgid "move the 'extends' clause before 'implements' here"
 msgstr ""
 
+#: src/quick-lint-js/diag/diagnostic-types.h
+#, fuzzy
+msgid "cannot use 'declare' keyword with 'import'"
+msgstr "variables don't belong here"
+
 #: src/quick-lint-js/diag/diagnostic-types.h
 #, fuzzy
 msgid "TypeScript import aliases are not allowed in JavaScript"
diff --git a/po/fr_FR.po b/po/fr_FR.po
@@ -1440,6 +1440,12 @@ msgstr ""
 msgid "move the 'extends' clause before 'implements' here"
 msgstr ""
 
+#: src/quick-lint-js/diag/diagnostic-types.h
+#, fuzzy
+msgid "cannot use 'declare' keyword with 'import'"
+msgstr ""
+"impossible de déclarer et d'exporter une variable avec 'export default'"
+
 #: src/quick-lint-js/diag/diagnostic-types.h
 #, fuzzy
 msgid "TypeScript import aliases are not allowed in JavaScript"
diff --git a/po/messages.pot b/po/messages.pot
@@ -1243,6 +1243,10 @@ msgstr ""
 msgid "move the 'extends' clause before 'implements' here"
 msgstr ""
 
+#: src/quick-lint-js/diag/diagnostic-types.h
+msgid "cannot use 'declare' keyword with 'import'"
+msgstr ""
+
 #: src/quick-lint-js/diag/diagnostic-types.h
 msgid "TypeScript import aliases are not allowed in JavaScript"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -1289,6 +1289,11 @@ msgstr "'extends' precisa ficar antes do 'implements'"
 msgid "move the 'extends' clause before 'implements' here"
 msgstr "mova a cláusula 'extends' para antes do 'implements' aqui"
 
+#: src/quick-lint-js/diag/diagnostic-types.h
+#, fuzzy
+msgid "cannot use 'declare' keyword with 'import'"
+msgstr "não é possível declarar e exportar variável com 'export default'"
+
 #: src/quick-lint-js/diag/diagnostic-types.h
 msgid "TypeScript import aliases are not allowed in JavaScript"
 msgstr "apelidos de importação do TypeScript não são permitidos em JavaScript"
diff --git a/po/sv_SE.po b/po/sv_SE.po
@@ -1344,6 +1344,11 @@ msgstr ""
 msgid "move the 'extends' clause before 'implements' here"
 msgstr ""
 
+#: src/quick-lint-js/diag/diagnostic-types.h
+#, fuzzy
+msgid "cannot use 'declare' keyword with 'import'"
+msgstr "kan inte deklarera och exportera variabel med 'export default'"
+
 #: src/quick-lint-js/diag/diagnostic-types.h
 #, fuzzy
 msgid "TypeScript import aliases are not allowed in JavaScript"
diff --git a/src/quick-lint-js/diag/diagnostic-types.h b/src/quick-lint-js/diag/diagnostic-types.h
@@ -2690,6 +2690,12 @@
               use)                                                              \
           MESSAGE(QLJS_TRANSLATABLE("function declared here"), declaration))    \
                                                                                 \
+  QLJS_DIAG_TYPE(                                                               \
+      diag_import_cannot_have_declare_keyword, "E0360",                         \
+      diagnostic_severity::error, { source_code_span declare_keyword; },        \
+      MESSAGE(QLJS_TRANSLATABLE("cannot use 'declare' keyword with 'import'"),  \
+              declare_keyword))                                                 \
+                                                                                \
   QLJS_DIAG_TYPE(                                                               \
       diag_interface_fields_cannot_have_initializers, "E0221",                  \
       diagnostic_severity::error, { source_code_span equal; },                  \
diff --git a/src/quick-lint-js/fe/parse-statement.cpp b/src/quick-lint-js/fe/parse-statement.cpp
@@ -4602,16 +4602,23 @@ parser::parse_and_visit_possible_declare_statement(parse_visitor_base &v) {
   case token_type::kw_const:
   case token_type::kw_enum:
   case token_type::kw_interface:
+  case token_type::kw_function:
   case token_type::kw_let:
+  case token_type::kw_module:
   case token_type::kw_type:
   case token_type::kw_var:
-  case token_type::kw_function:
-  case token_type::kw_module:
   case token_type::kw_namespace:
+  parse_as_declare_statement:
     this->lexer_.commit_transaction(std::move(transaction));
     this->parse_and_visit_declare_statement(v, declare_keyword_span);
     return parse_possible_declare_result::parsed;
 
+  case token_type::kw_import:
+    this->diag_reporter_->report(diag_import_cannot_have_declare_keyword{
+        .declare_keyword = declare_keyword_span,
+    });
+    goto parse_as_declare_statement;
+
   // declare:  // Label.
   // declare();
   case token_type::colon:
diff --git a/src/quick-lint-js/i18n/translation-table-generated.cpp b/src/quick-lint-js/i18n/translation-table-generated.cpp
@@ -164,7 +164,8 @@ const translation_table translation_data = {
         {45, 67, 67, 54, 58, 43},            //
         {74, 45, 80, 74, 69, 63},            //
         {0, 0, 0, 67, 0, 53},                //
-        {0, 0, 0, 50, 0, 37},                //
+        {0, 0, 0, 0, 0, 37},                 //
+        {0, 0, 0, 50, 0, 43},                //
         {72, 31, 71, 68, 56, 61},            //
         {34, 30, 0, 46, 0, 40},              //
         {0, 0, 0, 20, 0, 18},                //
@@ -1875,6 +1876,7 @@ const translation_table translation_data = {
         u8"cannot reference private variables without object; use 'this.'\0"
         u8"cannot update variable with '{0}' while declaring it\0"
         u8"cannot use '...' on 'this' parameter\0"
+        u8"cannot use 'declare' keyword with 'import'\0"
         u8"catch variable can only be typed as '*', 'any', or 'unknown'\0"
         u8"character is not allowed in identifiers\0"
         u8"children end here\0"
diff --git a/src/quick-lint-js/i18n/translation-table-generated.h b/src/quick-lint-js/i18n/translation-table-generated.h
@@ -20,8 +20,8 @@ namespace quick_lint_js {
 using namespace std::literals::string_view_literals;
 
 constexpr std::uint32_t translation_table_locale_count = 5;
-constexpr std::uint16_t translation_table_mapping_table_size = 431;
-constexpr std::size_t translation_table_string_table_size = 75850;
+constexpr std::uint16_t translation_table_mapping_table_size = 432;
+constexpr std::size_t translation_table_string_table_size = 75893;
 constexpr std::size_t translation_table_locale_table_size = 35;
 
 QLJS_CONSTEVAL std::uint16_t translation_table_const_look_up(
@@ -181,6 +181,7 @@ QLJS_CONSTEVAL std::uint16_t translation_table_const_look_up(
           "cannot reference private variables without object; use 'this.'"sv,
           "cannot update variable with '{0}' while declaring it"sv,
           "cannot use '...' on 'this' parameter"sv,
+          "cannot use 'declare' keyword with 'import'"sv,
           "catch variable can only be typed as '*', 'any', or 'unknown'"sv,
           "character is not allowed in identifiers"sv,
           "children end here"sv,
diff --git a/test/quick-lint-js/test-translation-table-generated.h b/test/quick-lint-js/test-translation-table-generated.h
@@ -27,7 +27,7 @@ struct translated_string {
   const char8 *expected_per_locale[6];
 };
 
-extern const translated_string test_translation_table[430];
+extern const translated_string test_translation_table[431];
 }
 
 #endif
diff --git a/test/test-parse-typescript-module.cpp b/test/test-parse-typescript-module.cpp
@@ -823,6 +823,26 @@ TEST_F(test_parse_typescript_module, export_import_alias) {
 
 // TODO(#795): Report an error for other kinds of 'export import', such as
 // 'export import fs from "fs";'.
+
+TEST_F(test_parse_typescript_module,
+       import_cannot_be_used_with_declare_keyword) {
+  {
+    test_parser p(u8"declare import fs from 'fs';"_sv, typescript_options,
+                  capture_diags);
+    p.parse_and_visit_module();
+    EXPECT_THAT(p.visits, ElementsAreArray({
+                              "visit_variable_declaration",  // fs
+                              "visit_end_of_module",         //
+                          }));
+    EXPECT_THAT(
+        p.errors,
+        ElementsAreArray({
+            DIAG_TYPE_OFFSETS(p.code,
+                              diag_import_cannot_have_declare_keyword,  //
+                              declare_keyword, 0, u8"declare"_sv),
+        }));
+  }
+}
 }
 }
 
diff --git a/test/test-parse-typescript-namespace.cpp b/test/test-parse-typescript-namespace.cpp
@@ -304,8 +304,29 @@ TEST_F(test_parse_typescript_namespace,
             DIAG_TYPE_2_OFFSETS(
                 p.code,
                 diag_typescript_import_alias_not_allowed_in_javascript,  //
-                import_keyword, 0, u8"import"_sv, equal, strlen(u8"import A "),
-                u8"="_sv),
+                import_keyword, 0, u8"import"_sv,                        //
+                equal, strlen(u8"import A "), u8"="_sv),
+        }));
+  }
+}
+
+TEST_F(test_parse_typescript_namespace,
+       namespace_alias_cannot_be_used_with_declare_keyword) {
+  {
+    test_parser p(u8"declare import A = ns;"_sv, typescript_options,
+                  capture_diags);
+    p.parse_and_visit_module();
+    EXPECT_THAT(p.visits, ElementsAreArray({
+                              "visit_variable_declaration",    // A
+                              "visit_variable_namespace_use",  // ns
+                              "visit_end_of_module",           //
+                          }));
+    EXPECT_THAT(
+        p.errors,
+        ElementsAreArray({
+            DIAG_TYPE_OFFSETS(p.code,
+                              diag_import_cannot_have_declare_keyword,  //
+                              declare_keyword, 0, u8"declare"_sv),
         }));
   }
 }
diff --git a/test/test-translation-table-generated.cpp b/test/test-translation-table-generated.cpp
@@ -1693,6 +1693,17 @@ const translated_string test_translation_table[] = {
             u8"cannot use '...' on 'this' parameter",
         },
     },
+    {
+        "cannot use 'declare' keyword with 'import'"_translatable,
+        {
+            u8"cannot use 'declare' keyword with 'import'",
+            u8"cannot use 'declare' keyword with 'import'",
+            u8"cannot use 'declare' keyword with 'import'",
+            u8"cannot use 'declare' keyword with 'import'",
+            u8"cannot use 'declare' keyword with 'import'",
+            u8"cannot use 'declare' keyword with 'import'",
+        },
+    },
     {
         "catch variable can only be typed as '*', 'any', or 'unknown'"_translatable,
         {
