diff --git a/docs/errors/E0719.md b/docs/errors/E0719.md new file mode 100644 index 0000000000..cdc28a2447 --- /dev/null +++ b/docs/errors/E0719.md @@ -0,0 +1,15 @@ +# E0719: unexpected 'await' keyword on function declaration + +If you meant to define an asynchronous function, you need to explicitly annotate +the function with `async` keyword, not `await`. + +```javascript +await function f() {} +``` + +To fix this warning, simply replace `await` by `async`. Now, you have an +asynchronous function and you're able to use `await` inside it. + +```javascript +async function f() {} +``` diff --git a/po/messages.pot b/po/messages.pot index cfca0327e2..bc9e0cb6e6 100644 --- a/po/messages.pot +++ b/po/messages.pot @@ -2417,6 +2417,10 @@ msgstr "" msgid "using a '.' after a '?.' might fail, since '?.' might return 'undefined'." msgstr "" +#: src/quick-lint-js/diag/diagnostic-metadata-generated.cpp +msgid "unexpected 'await' keyword on function declaration; maybe you meant 'async'?" +msgstr "" + #: test/test-diagnostic-formatter.cpp #: test/test-vim-qflist-json-diag-reporter.cpp msgid "something happened" diff --git a/src/quick-lint-js/diag/diagnostic-metadata-generated.cpp b/src/quick-lint-js/diag/diagnostic-metadata-generated.cpp index f29b70bfbd..da91494369 100644 --- a/src/quick-lint-js/diag/diagnostic-metadata-generated.cpp +++ b/src/quick-lint-js/diag/diagnostic-metadata-generated.cpp @@ -6927,6 +6927,20 @@ const QLJS_CONSTINIT Diagnostic_Info all_diagnostic_infos[] = { }, }, }, + + // Diag_Unexpected_Await_On_Function_Declaration + { + .code = 719, + .severity = Diagnostic_Severity::warning, + .message_formats = { + QLJS_TRANSLATABLE("unexpected 'await' keyword on function declaration; maybe you meant 'async'?"), + }, + .message_args = { + { + Diagnostic_Message_Arg_Info(offsetof(Diag_Unexpected_Await_On_Function_Declaration, await_keyword), Diagnostic_Arg_Type::source_code_span), + }, + }, + }, }; } diff --git a/src/quick-lint-js/diag/diagnostic-metadata-generated.h b/src/quick-lint-js/diag/diagnostic-metadata-generated.h index bbd9239b0e..2887aed883 100644 --- a/src/quick-lint-js/diag/diagnostic-metadata-generated.h +++ b/src/quick-lint-js/diag/diagnostic-metadata-generated.h @@ -473,10 +473,11 @@ namespace quick_lint_js { QLJS_DIAG_TYPE_NAME(Diag_Unintuitive_Bitshift_Precedence) \ QLJS_DIAG_TYPE_NAME(Diag_TypeScript_Namespace_Alias_Cannot_Use_Import_Type) \ QLJS_DIAG_TYPE_NAME(Diag_Using_Dot_After_Optional_Chaining) \ + QLJS_DIAG_TYPE_NAME(Diag_Unexpected_Await_On_Function_Declaration) \ /* END */ // clang-format on -inline constexpr int Diag_Type_Count = 462; +inline constexpr int Diag_Type_Count = 463; extern const Diagnostic_Info all_diagnostic_infos[Diag_Type_Count]; } diff --git a/src/quick-lint-js/diag/diagnostic-types-2.h b/src/quick-lint-js/diag/diagnostic-types-2.h index b858eae431..92a6cb41f4 100644 --- a/src/quick-lint-js/diag/diagnostic-types-2.h +++ b/src/quick-lint-js/diag/diagnostic-types-2.h @@ -3599,6 +3599,15 @@ struct Diag_Using_Dot_After_Optional_Chaining { Source_Code_Span dot_op; Source_Code_Span optional_chain_op; }; + +struct Diag_Unexpected_Await_On_Function_Declaration { + [[qljs::diag("E0719", Diagnostic_Severity::warning)]] // + // clang-format off + [[qljs::message("unexpected 'await' keyword on function declaration; maybe you meant 'async'?", + ARG(await_keyword))]] // + // clang-format on + Source_Code_Span await_keyword; +}; } QLJS_WARNING_POP diff --git a/src/quick-lint-js/fe/parse-statement.cpp b/src/quick-lint-js/fe/parse-statement.cpp index df3c959349..592bb6d1d7 100644 --- a/src/quick-lint-js/fe/parse-statement.cpp +++ b/src/quick-lint-js/fe/parse-statement.cpp @@ -417,6 +417,20 @@ bool Parser::parse_and_visit_statement(Parse_Visitor_Base &v, this->skip(); this->check_body_after_label(); goto parse_statement; + } else if (this->peek().type == Token_Type::kw_function) { + this->parse_and_visit_function_declaration( + v, Function_Declaration_Options{ + .attributes = Function_Attributes::normal, + .begin = this->peek().begin, + .require_name = Name_Requirement::required_for_statement, + .async_keyword = std::nullopt, + .declare_keyword = std::nullopt, + }); + if (this->peek().type != Token_Type::left_paren) { + this->diag_reporter_->report( + Diag_Unexpected_Await_On_Function_Declaration{ + .await_keyword = await_token.span()}); + } } else { Expression *ast = this->parse_await_expression(v, await_token, Precedence{}); diff --git a/src/quick-lint-js/i18n/translation-table-generated.cpp b/src/quick-lint-js/i18n/translation-table-generated.cpp index 5c8c06916d..d43a5dcc30 100644 --- a/src/quick-lint-js/i18n/translation-table-generated.cpp +++ b/src/quick-lint-js/i18n/translation-table-generated.cpp @@ -557,7 +557,8 @@ const Translation_Table translation_data = { {0, 0, 0, 0, 0, 15}, // {0, 0, 0, 15, 0, 62}, // {16, 12, 14, 32, 17, 34}, // - {31, 12, 34, 35, 33, 29}, // + {0, 0, 0, 0, 0, 29}, // + {31, 12, 34, 35, 33, 77}, // {53, 46, 52, 49, 41, 43}, // {45, 43, 53, 32, 39, 33}, // {56, 49, 55, 52, 44, 46}, // @@ -2429,6 +2430,7 @@ const Translation_Table translation_data = { u8"unexpected '?' in type; use '| void' to make an optional type\0" u8"unexpected '?' when destructuring\0" u8"unexpected '\\' in identifier\0" + u8"unexpected 'await' keyword on function declaration; maybe you meant 'async'?\0" u8"unexpected 'case' outside switch statement\0" u8"unexpected 'catch' without 'try'\0" u8"unexpected 'default' outside switch statement\0" diff --git a/src/quick-lint-js/i18n/translation-table-generated.h b/src/quick-lint-js/i18n/translation-table-generated.h index 02355e8fb5..1b006e019f 100644 --- a/src/quick-lint-js/i18n/translation-table-generated.h +++ b/src/quick-lint-js/i18n/translation-table-generated.h @@ -18,8 +18,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 = 606; -constexpr std::size_t translation_table_string_table_size = 82482; +constexpr std::uint16_t translation_table_mapping_table_size = 607; +constexpr std::size_t translation_table_string_table_size = 82559; constexpr std::size_t translation_table_locale_table_size = 35; QLJS_CONSTEVAL std::uint16_t translation_table_const_look_up( @@ -572,6 +572,7 @@ QLJS_CONSTEVAL std::uint16_t translation_table_const_look_up( "unexpected '?' in type; use '| void' to make an optional type"sv, "unexpected '?' when destructuring"sv, "unexpected '\\' in identifier"sv, + "unexpected 'await' keyword on function declaration; maybe you meant 'async'?"sv, "unexpected 'case' outside switch statement"sv, "unexpected 'catch' without 'try'"sv, "unexpected 'default' outside switch statement"sv, diff --git a/src/quick-lint-js/i18n/translation-table-test-generated.h b/src/quick-lint-js/i18n/translation-table-test-generated.h index db9a0443c5..b4591cccaa 100644 --- a/src/quick-lint-js/i18n/translation-table-test-generated.h +++ b/src/quick-lint-js/i18n/translation-table-test-generated.h @@ -27,7 +27,7 @@ struct Translated_String { }; // clang-format off -inline const Translated_String test_translation_table[605] = { +inline const Translated_String test_translation_table[606] = { { "\"global-groups\" entries must be strings"_translatable, u8"\"global-groups\" entries must be strings", @@ -6034,6 +6034,17 @@ inline const Translated_String test_translation_table[605] = { u8"of\u00f6rv\u00e4ntad '\\' i identifierare", }, }, + { + "unexpected 'await' keyword on function declaration; maybe you meant 'async'?"_translatable, + u8"unexpected 'await' keyword on function declaration; maybe you meant 'async'?", + { + u8"unexpected 'await' keyword on function declaration; maybe you meant 'async'?", + u8"unexpected 'await' keyword on function declaration; maybe you meant 'async'?", + u8"unexpected 'await' keyword on function declaration; maybe you meant 'async'?", + u8"unexpected 'await' keyword on function declaration; maybe you meant 'async'?", + u8"unexpected 'await' keyword on function declaration; maybe you meant 'async'?", + }, + }, { "unexpected 'case' outside switch statement"_translatable, u8"unexpected 'case' outside switch statement", diff --git a/test/test-parse-function.cpp b/test/test-parse-function.cpp index 79e9ca668c..ccd12c7050 100644 --- a/test/test-parse-function.cpp +++ b/test/test-parse-function.cpp @@ -1799,6 +1799,21 @@ TEST_F(Test_Parse_Function, return_with_comma_operator_missing_arguments) { u8" ^ Diag_Missing_Operand_For_Operator"_diag); } } + +TEST_F(Test_Parse_Function, unexpected_await_on_function_declaration) { + test_parse_and_visit_statement( + u8"await function f() { }"_sv, // + u8"^^^^^ Diag_Unexpected_Await_On_Function_Declaration"_diag); + + test_parse_and_visit_statement(u8"async function f() { }"_sv, // + no_diags); + + test_parse_and_visit_statement(u8"await function foo() {}();"_sv, // + no_diags); + + test_parse_and_visit_statement(u8"await (function foo() {});"_sv, // + no_diags); +} } // quick-lint-js finds bugs in JavaScript programs.