@typescript-deploys/pr-build 5.2.0-pr-54777-9 → 5.2.0-pr-54838-4

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230628`;
+      version = `${versionMajorMinor}.0-insiders.20230703`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1599,6 +1599,13 @@ var ts = (() => {
       return array.slice(0, index);
     }
   }
+  function startWhitespaceCount(s) {
+    for (let i = 0; i < s.length; i++) {
+      if (!isWhiteSpaceLike(s.charCodeAt(i)))
+        return i;
+    }
+    return s.length;
+  }
   function skipWhile(array, predicate) {
     if (array) {
       const len = array.length;
@@ -7021,7 +7028,7 @@ ${lanes.join("\n")}
         Identifier_expected: diag(1003, 1 /* Error */, "Identifier_expected_1003", "Identifier expected."),
         _0_expected: diag(1005, 1 /* Error */, "_0_expected_1005", "'{0}' expected."),
         A_file_cannot_have_a_reference_to_itself: diag(1006, 1 /* Error */, "A_file_cannot_have_a_reference_to_itself_1006", "A file cannot have a reference to itself."),
-        The_parser_expected_to_find_a_1_to_match_the_0_token_here: diag(1007, 1 /* Error */, "The_parser_expected_to_find_a_1_to_match_the_0_token_here_1007", "The parser expected to find a '{1}' to match the '{0}' token here."),
+        The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon: diag(1007, 1 /* Error */, "The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon_1007", "The parser expected to find a '{1}' to match the '{0}' token here:"),
         Trailing_comma_not_allowed: diag(1009, 1 /* Error */, "Trailing_comma_not_allowed_1009", "Trailing comma not allowed."),
         Asterisk_Slash_expected: diag(1010, 1 /* Error */, "Asterisk_Slash_expected_1010", "'*/' expected."),
         An_element_access_expression_should_take_an_argument: diag(1011, 1 /* Error */, "An_element_access_expression_should_take_an_argument_1011", "An element access expression should take an argument."),
@@ -7283,7 +7290,7 @@ ${lanes.join("\n")}
         unique_symbol_types_are_not_allowed_here: diag(1335, 1 /* Error */, "unique_symbol_types_are_not_allowed_here_1335", "'unique symbol' types are not allowed here."),
         An_index_signature_parameter_type_cannot_be_a_literal_type_or_generic_type_Consider_using_a_mapped_object_type_instead: diag(1337, 1 /* Error */, "An_index_signature_parameter_type_cannot_be_a_literal_type_or_generic_type_Consider_using_a_mapped_o_1337", "An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead."),
         infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type: diag(1338, 1 /* Error */, "infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type_1338", "'infer' declarations are only permitted in the 'extends' clause of a conditional type."),
-        Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here: diag(1339, 1 /* Error */, "Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_1339", "Module '{0}' does not refer to a value, but is used as a value here."),
+        Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_Colon: diag(1339, 1 /* Error */, "Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_Colon_1339", "Module '{0}' does not refer to a value, but is used as a value here:"),
         Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0: diag(1340, 1 /* Error */, "Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0_1340", "Module '{0}' does not refer to a type, but is used as a type here. Did you mean 'typeof import('{0}')'?"),
         Class_constructor_may_not_be_an_accessor: diag(1341, 1 /* Error */, "Class_constructor_may_not_be_an_accessor_1341", "Class constructor may not be an accessor."),
         The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_es2020_es2022_esnext_system_node16_or_nodenext: diag(1343, 1 /* Error */, "The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_es2020_es2022_esnext_system__1343", "The 'import.meta' meta-property is only allowed when the '--module' option is 'es2020', 'es2022', 'esnext', 'system', 'node16', or 'nodenext'."),
@@ -7291,7 +7298,7 @@ ${lanes.join("\n")}
         An_expression_of_type_void_cannot_be_tested_for_truthiness: diag(1345, 1 /* Error */, "An_expression_of_type_void_cannot_be_tested_for_truthiness_1345", "An expression of type 'void' cannot be tested for truthiness."),
         This_parameter_is_not_allowed_with_use_strict_directive: diag(1346, 1 /* Error */, "This_parameter_is_not_allowed_with_use_strict_directive_1346", "This parameter is not allowed with 'use strict' directive."),
         use_strict_directive_cannot_be_used_with_non_simple_parameter_list: diag(1347, 1 /* Error */, "use_strict_directive_cannot_be_used_with_non_simple_parameter_list_1347", "'use strict' directive cannot be used with non-simple parameter list."),
-        Non_simple_parameter_declared_here: diag(1348, 1 /* Error */, "Non_simple_parameter_declared_here_1348", "Non-simple parameter declared here."),
+        Non_simple_parameter_declared_here_Colon: diag(1348, 1 /* Error */, "Non_simple_parameter_declared_here_Colon_1348", "Non-simple parameter declared here:"),
         use_strict_directive_used_here: diag(1349, 1 /* Error */, "use_strict_directive_used_here_1349", "'use strict' directive used here."),
         Print_the_final_configuration_instead_of_building: diag(1350, 3 /* Message */, "Print_the_final_configuration_instead_of_building_1350", "Print the final configuration instead of building."),
         An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal: diag(1351, 1 /* Error */, "An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal_1351", "An identifier or keyword cannot immediately follow a numeric literal."),
@@ -7315,8 +7322,8 @@ ${lanes.join("\n")}
         Did_you_mean_0: diag(1369, 3 /* Message */, "Did_you_mean_0_1369", "Did you mean '{0}'?"),
         This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set_to_error: diag(1371, 1 /* Error */, "This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set__1371", "This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'."),
         await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module: diag(1375, 1 /* Error */, "await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_fi_1375", "'await' expressions are only allowed at the top level of a file when that file is a module, but this file has no imports or exports. Consider adding an empty 'export {}' to make this file a module."),
-        _0_was_imported_here: diag(1376, 3 /* Message */, "_0_was_imported_here_1376", "'{0}' was imported here."),
-        _0_was_exported_here: diag(1377, 3 /* Message */, "_0_was_exported_here_1377", "'{0}' was exported here."),
+        _0_was_imported_here_Colon: diag(1376, 3 /* Message */, "_0_was_imported_here_Colon_1376", "'{0}' was imported here:"),
+        _0_was_exported_here_Colon: diag(1377, 3 /* Message */, "_0_was_exported_here_Colon_1377", "'{0}' was exported here:"),
         Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_or_nodenext_and_the_target_option_is_set_to_es2017_or_higher: diag(1378, 1 /* Error */, "Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378", "Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher."),
         An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type: diag(1379, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type_1379", "An import alias cannot reference a declaration that was exported using 'export type'."),
         An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type: diag(1380, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type_1380", "An import alias cannot reference a declaration that was imported using 'import type'."),
@@ -7335,34 +7342,34 @@ ${lanes.join("\n")}
         Imported_via_0_from_file_1_with_packageId_2_to_import_importHelpers_as_specified_in_compilerOptions: diag(1396, 3 /* Message */, "Imported_via_0_from_file_1_with_packageId_2_to_import_importHelpers_as_specified_in_compilerOptions_1396", "Imported via {0} from file '{1}' with packageId '{2}' to import 'importHelpers' as specified in compilerOptions"),
         Imported_via_0_from_file_1_to_import_jsx_and_jsxs_factory_functions: diag(1397, 3 /* Message */, "Imported_via_0_from_file_1_to_import_jsx_and_jsxs_factory_functions_1397", "Imported via {0} from file '{1}' to import 'jsx' and 'jsxs' factory functions"),
         Imported_via_0_from_file_1_with_packageId_2_to_import_jsx_and_jsxs_factory_functions: diag(1398, 3 /* Message */, "Imported_via_0_from_file_1_with_packageId_2_to_import_jsx_and_jsxs_factory_functions_1398", "Imported via {0} from file '{1}' with packageId '{2}' to import 'jsx' and 'jsxs' factory functions"),
-        File_is_included_via_import_here: diag(1399, 3 /* Message */, "File_is_included_via_import_here_1399", "File is included via import here."),
+        File_is_included_via_import_here_Colon: diag(1399, 3 /* Message */, "File_is_included_via_import_here_Colon_1399", "File is included via import here:"),
         Referenced_via_0_from_file_1: diag(1400, 3 /* Message */, "Referenced_via_0_from_file_1_1400", "Referenced via '{0}' from file '{1}'"),
-        File_is_included_via_reference_here: diag(1401, 3 /* Message */, "File_is_included_via_reference_here_1401", "File is included via reference here."),
+        File_is_included_via_reference_here_Colon: diag(1401, 3 /* Message */, "File_is_included_via_reference_here_Colon_1401", "File is included via reference here:"),
         Type_library_referenced_via_0_from_file_1: diag(1402, 3 /* Message */, "Type_library_referenced_via_0_from_file_1_1402", "Type library referenced via '{0}' from file '{1}'"),
         Type_library_referenced_via_0_from_file_1_with_packageId_2: diag(1403, 3 /* Message */, "Type_library_referenced_via_0_from_file_1_with_packageId_2_1403", "Type library referenced via '{0}' from file '{1}' with packageId '{2}'"),
-        File_is_included_via_type_library_reference_here: diag(1404, 3 /* Message */, "File_is_included_via_type_library_reference_here_1404", "File is included via type library reference here."),
+        File_is_included_via_type_library_reference_here_Colon: diag(1404, 3 /* Message */, "File_is_included_via_type_library_reference_here_Colon_1404", "File is included via type library reference here:"),
         Library_referenced_via_0_from_file_1: diag(1405, 3 /* Message */, "Library_referenced_via_0_from_file_1_1405", "Library referenced via '{0}' from file '{1}'"),
-        File_is_included_via_library_reference_here: diag(1406, 3 /* Message */, "File_is_included_via_library_reference_here_1406", "File is included via library reference here."),
+        File_is_included_via_library_reference_here_Colon: diag(1406, 3 /* Message */, "File_is_included_via_library_reference_here_Colon_1406", "File is included via library reference here:"),
         Matched_by_include_pattern_0_in_1: diag(1407, 3 /* Message */, "Matched_by_include_pattern_0_in_1_1407", "Matched by include pattern '{0}' in '{1}'"),
-        File_is_matched_by_include_pattern_specified_here: diag(1408, 3 /* Message */, "File_is_matched_by_include_pattern_specified_here_1408", "File is matched by include pattern specified here."),
+        File_is_matched_by_include_pattern_specified_here_Colon: diag(1408, 3 /* Message */, "File_is_matched_by_include_pattern_specified_here_Colon_1408", "File is matched by include pattern specified here:"),
         Part_of_files_list_in_tsconfig_json: diag(1409, 3 /* Message */, "Part_of_files_list_in_tsconfig_json_1409", "Part of 'files' list in tsconfig.json"),
-        File_is_matched_by_files_list_specified_here: diag(1410, 3 /* Message */, "File_is_matched_by_files_list_specified_here_1410", "File is matched by 'files' list specified here."),
+        File_is_matched_by_files_list_specified_here_Colon: diag(1410, 3 /* Message */, "File_is_matched_by_files_list_specified_here_Colon_1410", "File is matched by 'files' list specified here:"),
         Output_from_referenced_project_0_included_because_1_specified: diag(1411, 3 /* Message */, "Output_from_referenced_project_0_included_because_1_specified_1411", "Output from referenced project '{0}' included because '{1}' specified"),
         Output_from_referenced_project_0_included_because_module_is_specified_as_none: diag(1412, 3 /* Message */, "Output_from_referenced_project_0_included_because_module_is_specified_as_none_1412", "Output from referenced project '{0}' included because '--module' is specified as 'none'"),
-        File_is_output_from_referenced_project_specified_here: diag(1413, 3 /* Message */, "File_is_output_from_referenced_project_specified_here_1413", "File is output from referenced project specified here."),
+        File_is_output_from_referenced_project_specified_here_Colon: diag(1413, 3 /* Message */, "File_is_output_from_referenced_project_specified_here_Colon_1413", "File is output from referenced project specified here:"),
         Source_from_referenced_project_0_included_because_1_specified: diag(1414, 3 /* Message */, "Source_from_referenced_project_0_included_because_1_specified_1414", "Source from referenced project '{0}' included because '{1}' specified"),
         Source_from_referenced_project_0_included_because_module_is_specified_as_none: diag(1415, 3 /* Message */, "Source_from_referenced_project_0_included_because_module_is_specified_as_none_1415", "Source from referenced project '{0}' included because '--module' is specified as 'none'"),
-        File_is_source_from_referenced_project_specified_here: diag(1416, 3 /* Message */, "File_is_source_from_referenced_project_specified_here_1416", "File is source from referenced project specified here."),
+        File_is_source_from_referenced_project_specified_here_Colon: diag(1416, 3 /* Message */, "File_is_source_from_referenced_project_specified_here_Colon_1416", "File is source from referenced project specified here:"),
         Entry_point_of_type_library_0_specified_in_compilerOptions: diag(1417, 3 /* Message */, "Entry_point_of_type_library_0_specified_in_compilerOptions_1417", "Entry point of type library '{0}' specified in compilerOptions"),
         Entry_point_of_type_library_0_specified_in_compilerOptions_with_packageId_1: diag(1418, 3 /* Message */, "Entry_point_of_type_library_0_specified_in_compilerOptions_with_packageId_1_1418", "Entry point of type library '{0}' specified in compilerOptions with packageId '{1}'"),
-        File_is_entry_point_of_type_library_specified_here: diag(1419, 3 /* Message */, "File_is_entry_point_of_type_library_specified_here_1419", "File is entry point of type library specified here."),
+        File_is_entry_point_of_type_library_specified_here_Colon: diag(1419, 3 /* Message */, "File_is_entry_point_of_type_library_specified_here_Colon_1419", "File is entry point of type library specified here:"),
         Entry_point_for_implicit_type_library_0: diag(1420, 3 /* Message */, "Entry_point_for_implicit_type_library_0_1420", "Entry point for implicit type library '{0}'"),
         Entry_point_for_implicit_type_library_0_with_packageId_1: diag(1421, 3 /* Message */, "Entry_point_for_implicit_type_library_0_with_packageId_1_1421", "Entry point for implicit type library '{0}' with packageId '{1}'"),
         Library_0_specified_in_compilerOptions: diag(1422, 3 /* Message */, "Library_0_specified_in_compilerOptions_1422", "Library '{0}' specified in compilerOptions"),
-        File_is_library_specified_here: diag(1423, 3 /* Message */, "File_is_library_specified_here_1423", "File is library specified here."),
+        File_is_library_specified_here_Colon: diag(1423, 3 /* Message */, "File_is_library_specified_here_Colon_1423", "File is library specified here:"),
         Default_library: diag(1424, 3 /* Message */, "Default_library_1424", "Default library"),
         Default_library_for_target_0: diag(1425, 3 /* Message */, "Default_library_for_target_0_1425", "Default library for target '{0}'"),
-        File_is_default_library_for_target_specified_here: diag(1426, 3 /* Message */, "File_is_default_library_for_target_specified_here_1426", "File is default library for target specified here."),
+        File_is_default_library_for_target_specified_here_Colon: diag(1426, 3 /* Message */, "File_is_default_library_for_target_specified_here_Colon_1426", "File is default library for target specified here:"),
         Root_file_specified_for_compilation: diag(1427, 3 /* Message */, "Root_file_specified_for_compilation_1427", "Root file specified for compilation"),
         File_is_output_of_project_reference_source_0: diag(1428, 3 /* Message */, "File_is_output_of_project_reference_source_0_1428", "File is output of project reference source '{0}'"),
         File_redirects_to_file_0: diag(1429, 3 /* Message */, "File_redirects_to_file_0_1429", "File redirects to file '{0}'"),
@@ -7815,7 +7822,7 @@ ${lanes.join("\n")}
         Cannot_extend_an_interface_0_Did_you_mean_implements: diag(2689, 1 /* Error */, "Cannot_extend_an_interface_0_Did_you_mean_implements_2689", "Cannot extend an interface '{0}'. Did you mean 'implements'?"),
         _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0: diag(2690, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0_2690", "'{0}' only refers to a type, but is being used as a value here. Did you mean to use '{1} in {0}'?"),
         _0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible: diag(2692, 1 /* Error */, "_0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible_2692", "'{0}' is a primitive, but '{1}' is a wrapper object. Prefer using '{0}' when possible."),
-        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here: diag(2693, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_2693", "'{0}' only refers to a type, but is being used as a value here."),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon: diag(2693, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon_2693", "'{0}' only refers to a type, but is being used as a value here:"),
         Namespace_0_has_no_exported_member_1: diag(2694, 1 /* Error */, "Namespace_0_has_no_exported_member_1_2694", "Namespace '{0}' has no exported member '{1}'."),
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: diag(
           2695,
@@ -7831,7 +7838,7 @@ ${lanes.join("\n")}
         Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1: diag(2699, 1 /* Error */, "Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1_2699", "Static property '{0}' conflicts with built-in property 'Function.{0}' of constructor function '{1}'."),
         Rest_types_may_only_be_created_from_object_types: diag(2700, 1 /* Error */, "Rest_types_may_only_be_created_from_object_types_2700", "Rest types may only be created from object types."),
         The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access: diag(2701, 1 /* Error */, "The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access_2701", "The target of an object rest assignment must be a variable or a property access."),
-        _0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here: diag(2702, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_2702", "'{0}' only refers to a type, but is being used as a namespace here."),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_Colon: diag(2702, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_Colon_2702", "'{0}' only refers to a type, but is being used as a namespace here:"),
         The_operand_of_a_delete_operator_must_be_a_property_reference: diag(2703, 1 /* Error */, "The_operand_of_a_delete_operator_must_be_a_property_reference_2703", "The operand of a 'delete' operator must be a property reference."),
         The_operand_of_a_delete_operator_cannot_be_a_read_only_property: diag(2704, 1 /* Error */, "The_operand_of_a_delete_operator_cannot_be_a_read_only_property_2704", "The operand of a 'delete' operator cannot be a read-only property."),
         An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2705, 1 /* Error */, "An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_de_2705", "An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option."),
@@ -7857,12 +7864,12 @@ ${lanes.join("\n")}
         Class_name_cannot_be_Object_when_targeting_ES5_with_module_0: diag(2725, 1 /* Error */, "Class_name_cannot_be_Object_when_targeting_ES5_with_module_0_2725", "Class name cannot be 'Object' when targeting ES5 with module {0}."),
         Cannot_find_lib_definition_for_0: diag(2726, 1 /* Error */, "Cannot_find_lib_definition_for_0_2726", "Cannot find lib definition for '{0}'."),
         Cannot_find_lib_definition_for_0_Did_you_mean_1: diag(2727, 1 /* Error */, "Cannot_find_lib_definition_for_0_Did_you_mean_1_2727", "Cannot find lib definition for '{0}'. Did you mean '{1}'?"),
-        _0_is_declared_here: diag(2728, 3 /* Message */, "_0_is_declared_here_2728", "'{0}' is declared here."),
+        _0_is_declared_here_Colon: diag(2728, 3 /* Message */, "_0_is_declared_here_Colon_2728", "'{0}' is declared here:"),
         Property_0_is_used_before_its_initialization: diag(2729, 1 /* Error */, "Property_0_is_used_before_its_initialization_2729", "Property '{0}' is used before its initialization."),
         An_arrow_function_cannot_have_a_this_parameter: diag(2730, 1 /* Error */, "An_arrow_function_cannot_have_a_this_parameter_2730", "An arrow function cannot have a 'this' parameter."),
         Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_in_String: diag(2731, 1 /* Error */, "Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_i_2731", "Implicit conversion of a 'symbol' to a 'string' will fail at runtime. Consider wrapping this expression in 'String(...)'."),
         Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension: diag(2732, 1 /* Error */, "Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension_2732", "Cannot find module '{0}'. Consider using '--resolveJsonModule' to import module with '.json' extension."),
-        Property_0_was_also_declared_here: diag(2733, 1 /* Error */, "Property_0_was_also_declared_here_2733", "Property '{0}' was also declared here."),
+        Property_0_was_also_declared_here_Colon: diag(2733, 1 /* Error */, "Property_0_was_also_declared_here_Colon_2733", "Property '{0}' was also declared here:"),
         Are_you_missing_a_semicolon: diag(2734, 1 /* Error */, "Are_you_missing_a_semicolon_2734", "Are you missing a semicolon?"),
         Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1: diag(2735, 1 /* Error */, "Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1_2735", "Did you mean for '{0}' to be constrained to type 'new (...args: any[]) => {1}'?"),
         Operator_0_cannot_be_applied_to_type_1: diag(2736, 1 /* Error */, "Operator_0_cannot_be_applied_to_type_1_2736", "Operator '{0}' cannot be applied to type '{1}'."),
@@ -7879,10 +7886,10 @@ ${lanes.join("\n")}
         _0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_type_of_1_is_2: diag(2747, 1 /* Error */, "_0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_t_2747", "'{0}' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of '{1}' is '{2}'."),
         Cannot_access_ambient_const_enums_when_0_is_enabled: diag(2748, 1 /* Error */, "Cannot_access_ambient_const_enums_when_0_is_enabled_2748", "Cannot access ambient const enums when '{0}' is enabled."),
         _0_refers_to_a_value_but_is_being_used_as_a_type_here_Did_you_mean_typeof_0: diag(2749, 1 /* Error */, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_Did_you_mean_typeof_0_2749", "'{0}' refers to a value, but is being used as a type here. Did you mean 'typeof {0}'?"),
-        The_implementation_signature_is_declared_here: diag(2750, 1 /* Error */, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
+        The_implementation_signature_is_declared_here_Colon: diag(2750, 1 /* Error */, "The_implementation_signature_is_declared_here_Colon_2750", "The implementation signature is declared here:"),
         Circularity_originates_in_type_at_this_location: diag(2751, 1 /* Error */, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
-        The_first_export_default_is_here: diag(2752, 1 /* Error */, "The_first_export_default_is_here_2752", "The first export default is here."),
-        Another_export_default_is_here: diag(2753, 1 /* Error */, "Another_export_default_is_here_2753", "Another export default is here."),
+        The_first_export_default_is_here_Colon: diag(2752, 1 /* Error */, "The_first_export_default_is_here_Colon_2752", "The first export default is here:"),
+        Another_export_default_is_here_Colon: diag(2753, 1 /* Error */, "Another_export_default_is_here_Colon_2753", "Another export default is here:"),
         super_may_not_use_type_arguments: diag(2754, 1 /* Error */, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
         No_constituent_of_type_0_is_callable: diag(2755, 1 /* Error */, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
         Not_all_constituents_of_type_0_are_callable: diag(2756, 1 /* Error */, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
@@ -7900,7 +7907,7 @@ ${lanes.join("\n")}
         The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, 1 /* Error */, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
         No_overload_matches_this_call: diag(2769, 1 /* Error */, "No_overload_matches_this_call_2769", "No overload matches this call."),
         The_last_overload_gave_the_following_error: diag(2770, 1 /* Error */, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
-        The_last_overload_is_declared_here: diag(2771, 1 /* Error */, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
+        The_last_overload_is_declared_here_Colon: diag(2771, 1 /* Error */, "The_last_overload_is_declared_here_Colon_2771", "The last overload is declared here:"),
         Overload_0_of_1_2_gave_the_following_error: diag(2772, 1 /* Error */, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
         Did_you_forget_to_use_await: diag(2773, 1 /* Error */, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_instead: diag(2774, 1 /* Error */, "This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_2774", "This condition will always return true since this function is always defined. Did you mean to call it instead?"),
@@ -7927,7 +7934,7 @@ ${lanes.join("\n")}
         The_intrinsic_keyword_can_only_be_used_to_declare_compiler_provided_intrinsic_types: diag(2795, 1 /* Error */, "The_intrinsic_keyword_can_only_be_used_to_declare_compiler_provided_intrinsic_types_2795", "The 'intrinsic' keyword can only be used to declare compiler provided intrinsic types."),
         It_is_likely_that_you_are_missing_a_comma_to_separate_these_two_template_expressions_They_form_a_tagged_template_expression_which_cannot_be_invoked: diag(2796, 1 /* Error */, "It_is_likely_that_you_are_missing_a_comma_to_separate_these_two_template_expressions_They_form_a_tag_2796", "It is likely that you are missing a comma to separate these two template expressions. They form a tagged template expression which cannot be invoked."),
         A_mixin_class_that_extends_from_a_type_variable_containing_an_abstract_construct_signature_must_also_be_declared_abstract: diag(2797, 1 /* Error */, "A_mixin_class_that_extends_from_a_type_variable_containing_an_abstract_construct_signature_must_also_2797", "A mixin class that extends from a type variable containing an abstract construct signature must also be declared 'abstract'."),
-        The_declaration_was_marked_as_deprecated_here: diag(2798, 1 /* Error */, "The_declaration_was_marked_as_deprecated_here_2798", "The declaration was marked as deprecated here."),
+        The_declaration_was_marked_as_deprecated_here_Colon: diag(2798, 1 /* Error */, "The_declaration_was_marked_as_deprecated_here_Colon_2798", "The declaration was marked as deprecated here:"),
         Type_produces_a_tuple_type_that_is_too_large_to_represent: diag(2799, 1 /* Error */, "Type_produces_a_tuple_type_that_is_too_large_to_represent_2799", "Type produces a tuple type that is too large to represent."),
         Expression_produces_a_tuple_type_that_is_too_large_to_represent: diag(2800, 1 /* Error */, "Expression_produces_a_tuple_type_that_is_too_large_to_represent_2800", "Expression produces a tuple type that is too large to represent."),
         This_condition_will_always_return_true_since_this_0_is_always_defined: diag(2801, 1 /* Error */, "This_condition_will_always_return_true_since_this_0_is_always_defined_2801", "This condition will always return true since this '{0}' is always defined."),
@@ -8364,8 +8371,8 @@ ${lanes.join("\n")}
         Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0: diag(6200, 1 /* Error */, "Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0_6200", "Definitions of the following identifiers conflict with those in another file: {0}"),
         Conflicts_are_in_this_file: diag(6201, 3 /* Message */, "Conflicts_are_in_this_file_6201", "Conflicts are in this file."),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, 1 /* Error */, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
-        _0_was_also_declared_here: diag(6203, 3 /* Message */, "_0_was_also_declared_here_6203", "'{0}' was also declared here."),
-        and_here: diag(6204, 3 /* Message */, "and_here_6204", "and here."),
+        _0_was_also_declared_here_Colon: diag(6203, 3 /* Message */, "_0_was_also_declared_here_Colon_6203", "'{0}' was also declared here:"),
+        and_here_Colon: diag(6204, 3 /* Message */, "and_here_Colon_6204", "and here:"),
         All_type_parameters_are_unused: diag(6205, 1 /* Error */, "All_type_parameters_are_unused_6205", "All type parameters are unused."),
         package_json_has_a_typesVersions_field_with_version_specific_path_mappings: diag(6206, 3 /* Message */, "package_json_has_a_typesVersions_field_with_version_specific_path_mappings_6206", "'package.json' has a 'typesVersions' field with version-specific path mappings."),
         package_json_does_not_have_a_typesVersions_entry_that_matches_version_0: diag(6207, 3 /* Message */, "package_json_does_not_have_a_typesVersions_entry_that_matches_version_0_6207", "'package.json' does not have a 'typesVersions' entry that matches version '{0}'."),
@@ -8769,6 +8776,7 @@ ${lanes.join("\n")}
         Parameter_modifiers_can_only_be_used_in_TypeScript_files: diag(8012, 1 /* Error */, "Parameter_modifiers_can_only_be_used_in_TypeScript_files_8012", "Parameter modifiers can only be used in TypeScript files."),
         Non_null_assertions_can_only_be_used_in_TypeScript_files: diag(8013, 1 /* Error */, "Non_null_assertions_can_only_be_used_in_TypeScript_files_8013", "Non-null assertions can only be used in TypeScript files."),
         Type_assertion_expressions_can_only_be_used_in_TypeScript_files: diag(8016, 1 /* Error */, "Type_assertion_expressions_can_only_be_used_in_TypeScript_files_8016", "Type assertion expressions can only be used in TypeScript files."),
+        Signature_declarations_can_only_be_used_in_TypeScript_files: diag(8017, 1 /* Error */, "Signature_declarations_can_only_be_used_in_TypeScript_files_8017", "Signature declarations can only be used in TypeScript files."),
         Report_errors_in_js_files: diag(8019, 3 /* Message */, "Report_errors_in_js_files_8019", "Report errors in .js files."),
         JSDoc_types_can_only_be_used_inside_documentation_comments: diag(8020, 1 /* Error */, "JSDoc_types_can_only_be_used_inside_documentation_comments_8020", "JSDoc types can only be used inside documentation comments."),
         JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags: diag(8021, 1 /* Error */, "JSDoc_typedef_tag_should_either_have_a_type_annotation_or_be_followed_by_property_or_member_tags_8021", "JSDoc '@typedef' tag should either have a type annotation or be followed by '@property' or '@member' tags."),
@@ -8784,7 +8792,7 @@ ${lanes.join("\n")}
         You_cannot_rename_a_module_via_a_global_import: diag(8031, 1 /* Error */, "You_cannot_rename_a_module_via_a_global_import_8031", "You cannot rename a module via a global import."),
         Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, 1 /* Error */, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."),
         A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags: diag(8033, 1 /* Error */, "A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags_8033", "A JSDoc '@typedef' comment may not contain multiple '@type' tags."),
-        The_tag_was_first_specified_here: diag(8034, 1 /* Error */, "The_tag_was_first_specified_here_8034", "The tag was first specified here."),
+        The_tag_was_first_specified_here_Colon: diag(8034, 1 /* Error */, "The_tag_was_first_specified_here_Colon_8034", "The tag was first specified here:"),
         You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder: diag(8035, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder_8035", "You cannot rename elements that are defined in a 'node_modules' folder."),
         You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files: diag(8037, 1 /* Error */, "Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files_8037", "Type satisfaction expressions can only be used in TypeScript files."),
@@ -16411,7 +16419,7 @@ ${lanes.join("\n")}
   }
   function createTextWriter(newLine) {
     var output;
-    var indent3;
+    var indent2;
     var lineStart;
     var lineCount;
     var linePos;
@@ -16429,7 +16437,7 @@ ${lanes.join("\n")}
     function writeText(s) {
       if (s && s.length) {
         if (lineStart) {
-          s = getIndentString(indent3) + s;
+          s = getIndentString(indent2) + s;
           lineStart = false;
         }
         output += s;
@@ -16448,7 +16456,7 @@ ${lanes.join("\n")}
     }
     function reset2() {
       output = "";
-      indent3 = 0;
+      indent2 = 0;
       lineStart = true;
       lineCount = 0;
       linePos = 0;
@@ -16485,15 +16493,15 @@ ${lanes.join("\n")}
       writeLiteral,
       writeLine,
       increaseIndent: () => {
-        indent3++;
+        indent2++;
       },
       decreaseIndent: () => {
-        indent3--;
+        indent2--;
       },
-      getIndent: () => indent3,
+      getIndent: () => indent2,
       getTextPos: () => output.length,
       getLine: () => lineCount,
-      getColumn: () => lineStart ? indent3 * getIndentSize() : output.length - linePos,
+      getColumn: () => lineStart ? indent2 * getIndentSize() : output.length - linePos,
       getText: () => output,
       isAtStartOfLine: () => lineStart,
       hasTrailingComment: () => hasTrailingComment,
@@ -29065,7 +29073,8 @@ ${lanes.join("\n")}
           nextToken();
           const statements = parseList(0 /* SourceElements */, parseStatement);
           Debug.assert(token() === 1 /* EndOfFileToken */);
-          const endOfFileToken = addJSDocComment(parseTokenNode());
+          const endHasJSDoc = hasPrecedingJSDocComment();
+          const endOfFileToken = withJSDoc(parseTokenNode(), endHasJSDoc);
           const sourceFile = createSourceFile2(fileName, languageVersion2, scriptKind2, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator2);
           processCommentPragmas(sourceFile, sourceText);
           processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -29085,11 +29094,11 @@ ${lanes.join("\n")}
             parseDiagnostics.push(createDetachedDiagnostic(fileName, pos, end, diagnostic));
           }
         }
-        function withJSDoc(node, hasJSDoc) {
-          return hasJSDoc ? addJSDocComment(node) : node;
-        }
         let hasDeprecatedTag = false;
-        function addJSDocComment(node) {
+        function withJSDoc(node, hasJSDoc) {
+          if (!hasJSDoc) {
+            return node;
+          }
           Debug.assert(!node.jsDoc);
           const jsDoc = mapDefined(getJSDocCommentRanges(node, sourceText), (comment) => JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos));
           if (jsDoc.length)
@@ -29550,7 +29559,7 @@ ${lanes.join("\n")}
           if (lastError) {
             addRelatedInfo(
               lastError,
-              createDetachedDiagnostic(fileName, openPosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, tokenToString(openKind), tokenToString(closeKind))
+              createDetachedDiagnostic(fileName, openPosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon, tokenToString(openKind), tokenToString(closeKind))
             );
           }
         }
@@ -29883,6 +29892,9 @@ ${lanes.join("\n")}
             case 22 /* HeritageClauses */:
               return isHeritageClause2();
             case 23 /* ImportOrExportSpecifiers */:
+              if (token() === 161 /* FromKeyword */ && lookAhead(nextTokenIsStringLiteral)) {
+                return false;
+              }
               return tokenIsIdentifierOrKeyword(token());
             case 13 /* JsxAttributes */:
               return tokenIsIdentifierOrKeyword(token()) || token() === 19 /* OpenBraceToken */;
@@ -30241,6 +30253,9 @@ ${lanes.join("\n")}
             case 22 /* HeritageClauses */:
               return parseErrorAtCurrentToken(Diagnostics.Unexpected_token_expected);
             case 23 /* ImportOrExportSpecifiers */:
+              if (token() === 161 /* FromKeyword */) {
+                return parseErrorAtCurrentToken(Diagnostics._0_expected, "}");
+              }
               return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
             case 13 /* JsxAttributes */:
               return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
@@ -31132,7 +31147,7 @@ ${lanes.join("\n")}
             if (lastError && lastError.code === Diagnostics._0_expected.code) {
               addRelatedInfo(
                 lastError,
-                createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, "{", "}")
+                createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon, "{", "}")
               );
             }
           }
@@ -31598,12 +31613,14 @@ ${lanes.join("\n")}
             return arrowExpression;
           }
           const pos = getNodePos();
+          const hasJSDoc = hasPrecedingJSDocComment();
           const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
           if (expr.kind === 80 /* Identifier */ && token() === 39 /* EqualsGreaterThanToken */) {
             return parseSimpleArrowFunctionExpression(
               pos,
               expr,
               allowReturnTypeInArrowFunction,
+              hasJSDoc,
               /*asyncModifier*/
               void 0
             );
@@ -31649,7 +31666,7 @@ ${lanes.join("\n")}
             ), pos);
           }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier) {
           Debug.assert(token() === 39 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
           const parameter = factory2.createParameterDeclaration(
             /*modifiers*/
@@ -31682,7 +31699,7 @@ ${lanes.join("\n")}
             equalsGreaterThanToken,
             body
           );
-          return addJSDocComment(finishNode(node, pos));
+          return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
         function tryParseParenthesizedArrowFunctionExpression(allowReturnTypeInArrowFunction) {
           const triState = isParenthesizedArrowFunctionExpression();
@@ -31810,9 +31827,10 @@ ${lanes.join("\n")}
           if (token() === 134 /* AsyncKeyword */) {
             if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
               const pos = getNodePos();
+              const hasJSDoc = hasPrecedingJSDocComment();
               const asyncModifier = parseModifiersForArrowFunction();
               const expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-              return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, asyncModifier);
+              return parseSimpleArrowFunctionExpression(pos, expr, allowReturnTypeInArrowFunction, hasJSDoc, asyncModifier);
             }
           }
           return void 0;
@@ -33486,6 +33504,9 @@ ${lanes.join("\n")}
               return void 0;
           }
         }
+        function nextTokenIsStringLiteral() {
+          return nextToken() === 11 /* StringLiteral */;
+        }
         function nextTokenIsIdentifierOrStringLiteralOnSameLine() {
           nextToken();
           return !scanner2.hasPrecedingLineBreak() && (isIdentifier2() || token() === 11 /* StringLiteral */);
@@ -34230,7 +34251,7 @@ ${lanes.join("\n")}
               if (lastError && lastError.code === Diagnostics._0_expected.code) {
                 addRelatedInfo(
                   lastError,
-                  createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, "{", "}")
+                  createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon, "{", "}")
                 );
               }
             }
@@ -34598,20 +34619,20 @@ ${lanes.join("\n")}
             function doJSDocScan() {
               let state = 1 /* SawAsterisk */;
               let margin;
-              let indent3 = start - (content.lastIndexOf("\n", start) + 1) + 4;
+              let indent2 = start - (content.lastIndexOf("\n", start) + 1) + 4;
               function pushComment(text) {
                 if (!margin) {
-                  margin = indent3;
+                  margin = indent2;
                 }
                 comments.push(text);
-                indent3 += text.length;
+                indent2 += text.length;
               }
               nextTokenJSDoc();
               while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                 ;
               if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
                 state = 0 /* BeginningOfLine */;
-                indent3 = 0;
+                indent2 = 0;
               }
               loop:
                 while (true) {
@@ -34620,14 +34641,14 @@ ${lanes.join("\n")}
                       removeTrailingWhitespace(comments);
                       if (!commentsPos)
                         commentsPos = getNodePos();
-                      addTag(parseTag(indent3));
+                      addTag(parseTag(indent2));
                       state = 0 /* BeginningOfLine */;
                       margin = void 0;
                       break;
                     case 4 /* NewLineTrivia */:
                       comments.push(scanner2.getTokenText());
                       state = 0 /* BeginningOfLine */;
-                      indent3 = 0;
+                      indent2 = 0;
                       break;
                     case 42 /* AsteriskToken */:
                       const asterisk = scanner2.getTokenText();
@@ -34637,16 +34658,16 @@ ${lanes.join("\n")}
                       } else {
                         Debug.assert(state === 0 /* BeginningOfLine */);
                         state = 1 /* SawAsterisk */;
-                        indent3 += asterisk.length;
+                        indent2 += asterisk.length;
                       }
                       break;
                     case 5 /* WhitespaceTrivia */:
                       Debug.assert(state !== 2 /* SavingComments */, "whitespace shouldn't come from the scanner while saving top-level comment text");
                       const whitespace = scanner2.getTokenText();
-                      if (margin !== void 0 && indent3 + whitespace.length > margin) {
-                        comments.push(whitespace.slice(margin - indent3));
+                      if (margin !== void 0 && indent2 + whitespace.length > margin) {
+                        comments.push(whitespace.slice(margin - indent2));
                       }
-                      indent3 += whitespace.length;
+                      indent2 += whitespace.length;
                       break;
                     case 1 /* EndOfFileToken */:
                       break loop;
@@ -34848,7 +34869,7 @@ ${lanes.join("\n")}
               }
               return parseTagComments(margin, indentText.slice(margin));
             }
-            function parseTagComments(indent3, initialMargin) {
+            function parseTagComments(indent2, initialMargin) {
               const commentsPos2 = getNodePos();
               let comments2 = [];
               const parts2 = [];
@@ -34857,10 +34878,10 @@ ${lanes.join("\n")}
               let margin;
               function pushComment(text) {
                 if (!margin) {
-                  margin = indent3;
+                  margin = indent2;
                 }
                 comments2.push(text);
-                indent3 += text.length;
+                indent2 += text.length;
               }
               if (initialMargin !== void 0) {
                 if (initialMargin !== "") {
@@ -34875,7 +34896,7 @@ ${lanes.join("\n")}
                     case 4 /* NewLineTrivia */:
                       state = 0 /* BeginningOfLine */;
                       comments2.push(scanner2.getTokenText());
-                      indent3 = 0;
+                      indent2 = 0;
                       break;
                     case 60 /* AtToken */:
                       scanner2.resetTokenState(scanner2.getTokenEnd() - 1);
@@ -34885,11 +34906,11 @@ ${lanes.join("\n")}
                     case 5 /* WhitespaceTrivia */:
                       Debug.assert(state !== 2 /* SavingComments */ && state !== 3 /* SavingBackticks */, "whitespace shouldn't come from the scanner while saving comment text");
                       const whitespace = scanner2.getTokenText();
-                      if (margin !== void 0 && indent3 + whitespace.length > margin) {
-                        comments2.push(whitespace.slice(margin - indent3));
+                      if (margin !== void 0 && indent2 + whitespace.length > margin) {
+                        comments2.push(whitespace.slice(margin - indent2));
                         state = 2 /* SavingComments */;
                       }
-                      indent3 += whitespace.length;
+                      indent2 += whitespace.length;
                       break;
                     case 19 /* OpenBraceToken */:
                       state = 2 /* SavingComments */;
@@ -34922,7 +34943,7 @@ ${lanes.join("\n")}
                     case 42 /* AsteriskToken */:
                       if (state === 0 /* BeginningOfLine */) {
                         state = 1 /* SawAsterisk */;
-                        indent3 += 1;
+                        indent2 += 1;
                         break;
                       }
                     default:
@@ -34987,8 +35008,8 @@ ${lanes.join("\n")}
             function isJSDocLinkTag(kind) {
               return kind === "link" || kind === "linkcode" || kind === "linkplain";
             }
-            function parseUnknownTag(start2, tagName, indent3, indentText) {
-              return finishNode(factory2.createJSDocUnknownTag(tagName, parseTrailingTagComments(start2, getNodePos(), indent3, indentText)), start2);
+            function parseUnknownTag(start2, tagName, indent2, indentText) {
+              return finishNode(factory2.createJSDocUnknownTag(tagName, parseTrailingTagComments(start2, getNodePos(), indent2, indentText)), start2);
             }
             function addTag(tag) {
               if (!tag) {
@@ -35035,7 +35056,7 @@ ${lanes.join("\n")}
                   return isTypeReferenceNode(node) && isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
               }
             }
-            function parseParameterOrPropertyTag(start2, tagName, target, indent3) {
+            function parseParameterOrPropertyTag(start2, tagName, target, indent2) {
               let typeExpression = tryParseTypeExpression();
               let isNameFirst = !typeExpression;
               skipWhitespaceOrAsterisk();
@@ -35044,8 +35065,8 @@ ${lanes.join("\n")}
               if (isNameFirst && !lookAhead(parseJSDocLinkPrefix)) {
                 typeExpression = tryParseTypeExpression();
               }
-              const comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
-              const nestedTypeLiteral = target !== 4 /* CallbackParameter */ && parseNestedTypeLiteral(typeExpression, name, target, indent3);
+              const comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
+              const nestedTypeLiteral = parseNestedTypeLiteral(typeExpression, name, target, indent2);
               if (nestedTypeLiteral) {
                 typeExpression = nestedTypeLiteral;
                 isNameFirst = true;
@@ -35053,12 +35074,12 @@ ${lanes.join("\n")}
               const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
               return finishNode(result2, start2);
             }
-            function parseNestedTypeLiteral(typeExpression, name, target, indent3) {
+            function parseNestedTypeLiteral(typeExpression, name, target, indent2) {
               if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
                 const pos = getNodePos();
                 let child;
                 let children;
-                while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent3, name))) {
+                while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent2, name))) {
                   if (child.kind === 348 /* JSDocParameterTag */ || child.kind === 355 /* JSDocPropertyTag */) {
                     children = append(children, child);
                   } else if (child.kind === 352 /* JSDocTemplateTag */) {
@@ -35071,14 +35092,14 @@ ${lanes.join("\n")}
                 }
               }
             }
-            function parseReturnTag(start2, tagName, indent3, indentText) {
+            function parseReturnTag(start2, tagName, indent2, indentText) {
               if (some(tags, isJSDocReturnTag)) {
                 parseErrorAt(tagName.pos, scanner2.getTokenStart(), Diagnostics._0_tag_already_specified, unescapeLeadingUnderscores(tagName.escapedText));
               }
               const typeExpression = tryParseTypeExpression();
-              return finishNode(factory2.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start2, getNodePos(), indent3, indentText)), start2);
+              return finishNode(factory2.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start2, getNodePos(), indent2, indentText)), start2);
             }
-            function parseTypeTag(start2, tagName, indent3, indentText) {
+            function parseTypeTag(start2, tagName, indent2, indentText) {
               if (some(tags, isJSDocTypeTag)) {
                 parseErrorAt(tagName.pos, scanner2.getTokenStart(), Diagnostics._0_tag_already_specified, unescapeLeadingUnderscores(tagName.escapedText));
               }
@@ -35086,25 +35107,25 @@ ${lanes.join("\n")}
                 /*mayOmitBraces*/
                 true
               );
-              const comments2 = indent3 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent3, indentText) : void 0;
+              const comments2 = indent2 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent2, indentText) : void 0;
               return finishNode(factory2.createJSDocTypeTag(tagName, typeExpression, comments2), start2);
             }
-            function parseSeeTag(start2, tagName, indent3, indentText) {
+            function parseSeeTag(start2, tagName, indent2, indentText) {
               const isMarkdownOrJSDocLink = token() === 23 /* OpenBracketToken */ || lookAhead(() => nextTokenJSDoc() === 60 /* AtToken */ && tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && isJSDocLinkTag(scanner2.getTokenValue()));
               const nameExpression = isMarkdownOrJSDocLink ? void 0 : parseJSDocNameReference();
-              const comments2 = indent3 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent3, indentText) : void 0;
+              const comments2 = indent2 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent2, indentText) : void 0;
               return finishNode(factory2.createJSDocSeeTag(tagName, nameExpression, comments2), start2);
             }
-            function parseThrowsTag(start2, tagName, indent3, indentText) {
+            function parseThrowsTag(start2, tagName, indent2, indentText) {
               const typeExpression = tryParseTypeExpression();
-              const comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
+              const comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
               return finishNode(factory2.createJSDocThrowsTag(tagName, typeExpression, comment), start2);
             }
-            function parseAuthorTag(start2, tagName, indent3, indentText) {
+            function parseAuthorTag(start2, tagName, indent2, indentText) {
               const commentStart = getNodePos();
               const textOnly = parseAuthorNameAndEmail();
               let commentEnd = scanner2.getTokenFullStart();
-              const comments2 = parseTrailingTagComments(start2, commentEnd, indent3, indentText);
+              const comments2 = parseTrailingTagComments(start2, commentEnd, indent2, indentText);
               if (!comments2) {
                 commentEnd = scanner2.getTokenFullStart();
               }
@@ -35188,19 +35209,19 @@ ${lanes.join("\n")}
               skipWhitespace();
               return finishNode(factory2.createJSDocEnumTag(tagName, typeExpression, parseTrailingTagComments(start2, getNodePos(), margin, indentText)), start2);
             }
-            function parseTypedefTag(start2, tagName, indent3, indentText) {
+            function parseTypedefTag(start2, tagName, indent2, indentText) {
               let typeExpression = tryParseTypeExpression();
               skipWhitespaceOrAsterisk();
               const fullName = parseJSDocTypeNameWithNamespace();
               skipWhitespace();
-              let comment = parseTagComments(indent3);
+              let comment = parseTagComments(indent2);
               let end2;
               if (!typeExpression || isObjectOrObjectArrayTypeReference(typeExpression.type)) {
                 let child;
                 let childTypeTag;
                 let jsDocPropertyTags;
                 let hasChildren = false;
-                while (child = tryParse(() => parseChildPropertyTag(indent3))) {
+                while (child = tryParse(() => parseChildPropertyTag(indent2))) {
                   if (child.kind === 352 /* JSDocTemplateTag */) {
                     break;
                   }
@@ -35209,7 +35230,7 @@ ${lanes.join("\n")}
                     if (childTypeTag) {
                       const lastError = parseErrorAtCurrentToken(Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
                       if (lastError) {
-                        addRelatedInfo(lastError, createDetachedDiagnostic(fileName, 0, 0, Diagnostics.The_tag_was_first_specified_here));
+                        addRelatedInfo(lastError, createDetachedDiagnostic(fileName, 0, 0, Diagnostics.The_tag_was_first_specified_here_Colon));
                       }
                       break;
                     } else {
@@ -35228,7 +35249,7 @@ ${lanes.join("\n")}
               }
               end2 = end2 || comment !== void 0 ? getNodePos() : (fullName ?? typeExpression ?? tagName).end;
               if (!comment) {
-                comment = parseTrailingTagComments(start2, end2, indent3, indentText);
+                comment = parseTrailingTagComments(start2, end2, indent2, indentText);
               }
               const typedefTag = factory2.createJSDocTypedefTag(tagName, typeExpression, fullName, comment);
               return finishNode(typedefTag, start2, end2);
@@ -35258,11 +35279,11 @@ ${lanes.join("\n")}
               }
               return typeNameOrNamespaceName;
             }
-            function parseCallbackTagParameters(indent3) {
+            function parseCallbackTagParameters(indent2) {
               const pos = getNodePos();
               let child;
               let parameters;
-              while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent3))) {
+              while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent2))) {
                 if (child.kind === 352 /* JSDocTemplateTag */) {
                   parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
                   break;
@@ -35271,11 +35292,11 @@ ${lanes.join("\n")}
               }
               return createNodeArray(parameters || [], pos);
             }
-            function parseJSDocSignature(start2, indent3) {
-              const parameters = parseCallbackTagParameters(indent3);
+            function parseJSDocSignature(start2, indent2) {
+              const parameters = parseCallbackTagParameters(indent2);
               const returnTag = tryParse(() => {
                 if (parseOptionalJsdoc(60 /* AtToken */)) {
-                  const tag = parseTag(indent3);
+                  const tag = parseTag(indent2);
                   if (tag && tag.kind === 349 /* JSDocReturnTag */) {
                     return tag;
                   }
@@ -35288,23 +35309,23 @@ ${lanes.join("\n")}
                 returnTag
               ), start2);
             }
-            function parseCallbackTag(start2, tagName, indent3, indentText) {
+            function parseCallbackTag(start2, tagName, indent2, indentText) {
               const fullName = parseJSDocTypeNameWithNamespace();
               skipWhitespace();
-              let comment = parseTagComments(indent3);
-              const typeExpression = parseJSDocSignature(start2, indent3);
+              let comment = parseTagComments(indent2);
+              const typeExpression = parseJSDocSignature(start2, indent2);
               if (!comment) {
-                comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
+                comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
               }
               const end2 = comment !== void 0 ? getNodePos() : typeExpression.end;
               return finishNode(factory2.createJSDocCallbackTag(tagName, typeExpression, fullName, comment), start2, end2);
             }
-            function parseOverloadTag(start2, tagName, indent3, indentText) {
+            function parseOverloadTag(start2, tagName, indent2, indentText) {
               skipWhitespace();
-              let comment = parseTagComments(indent3);
-              const typeExpression = parseJSDocSignature(start2, indent3);
+              let comment = parseTagComments(indent2);
+              const typeExpression = parseJSDocSignature(start2, indent2);
               if (!comment) {
-                comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
+                comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
               }
               const end2 = comment !== void 0 ? getNodePos() : typeExpression.end;
               return finishNode(factory2.createJSDocOverloadTag(tagName, typeExpression, comment), start2, end2);
@@ -35320,18 +35341,18 @@ ${lanes.join("\n")}
               }
               return a.escapedText === b.escapedText;
             }
-            function parseChildPropertyTag(indent3) {
-              return parseChildParameterOrPropertyTag(1 /* Property */, indent3);
+            function parseChildPropertyTag(indent2) {
+              return parseChildParameterOrPropertyTag(1 /* Property */, indent2);
             }
-            function parseChildParameterOrPropertyTag(target, indent3, name) {
+            function parseChildParameterOrPropertyTag(target, indent2, name) {
               let canParseTag = true;
               let seenAsterisk = false;
               while (true) {
                 switch (nextTokenJSDoc()) {
                   case 60 /* AtToken */:
                     if (canParseTag) {
-                      const child = tryParseChildTag(target, indent3);
-                      if (child && (child.kind === 348 /* JSDocParameterTag */ || child.kind === 355 /* JSDocPropertyTag */) && target !== 4 /* CallbackParameter */ && name && (isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
+                      const child = tryParseChildTag(target, indent2);
+                      if (child && (child.kind === 348 /* JSDocParameterTag */ || child.kind === 355 /* JSDocPropertyTag */) && name && (isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                         return false;
                       }
                       return child;
@@ -35356,7 +35377,7 @@ ${lanes.join("\n")}
                 }
               }
             }
-            function tryParseChildTag(target, indent3) {
+            function tryParseChildTag(target, indent2) {
               Debug.assert(token() === 60 /* AtToken */);
               const start2 = scanner2.getTokenFullStart();
               nextTokenJSDoc();
@@ -35376,14 +35397,14 @@ ${lanes.join("\n")}
                   t = 2 /* Parameter */ | 4 /* CallbackParameter */;
                   break;
                 case "template":
-                  return parseTemplateTag(start2, tagName, indent3, indentText);
+                  return parseTemplateTag(start2, tagName, indent2, indentText);
                 default:
                   return false;
               }
               if (!(target & t)) {
                 return false;
               }
-              return parseParameterOrPropertyTag(start2, tagName, target, indent3);
+              return parseParameterOrPropertyTag(start2, tagName, target, indent2);
             }
             function parseTemplateTagTypeParameter() {
               const typeParameterPos = getNodePos();
@@ -35424,10 +35445,10 @@ ${lanes.join("\n")}
               } while (parseOptionalJsdoc(28 /* CommaToken */));
               return createNodeArray(typeParameters, pos);
             }
-            function parseTemplateTag(start2, tagName, indent3, indentText) {
+            function parseTemplateTag(start2, tagName, indent2, indentText) {
               const constraint = token() === 19 /* OpenBraceToken */ ? parseJSDocTypeExpression() : void 0;
               const typeParameters = parseTemplateTagTypeParameters();
-              return finishNode(factory2.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start2, getNodePos(), indent3, indentText)), start2);
+              return finishNode(factory2.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start2, getNodePos(), indent2, indentText)), start2);
             }
             function parseOptionalJsdoc(t) {
               if (token() === t) {
@@ -41938,10 +41959,10 @@ ${lanes.join("\n")}
               const decl = getNameOfDeclaration(declaration) || declaration;
               const diag3 = messageNeedsName ? createDiagnosticForNode2(decl, message, getDisplayName(declaration)) : createDiagnosticForNode2(decl, message);
               file.bindDiagnostics.push(
-                multipleDefaultExports ? addRelatedInfo(diag3, createDiagnosticForNode2(declarationName, index === 0 ? Diagnostics.Another_export_default_is_here : Diagnostics.and_here)) : diag3
+                multipleDefaultExports ? addRelatedInfo(diag3, createDiagnosticForNode2(declarationName, index === 0 ? Diagnostics.Another_export_default_is_here_Colon : Diagnostics.and_here_Colon)) : diag3
               );
               if (multipleDefaultExports) {
-                relatedInformation.push(createDiagnosticForNode2(decl, Diagnostics.The_first_export_default_is_here));
+                relatedInformation.push(createDiagnosticForNode2(decl, Diagnostics.The_first_export_default_is_here_Colon));
               }
             });
             const diag2 = messageNeedsName ? createDiagnosticForNode2(declarationName, message, getDisplayName(node)) : createDiagnosticForNode2(declarationName, message);
@@ -46446,7 +46467,7 @@ ${lanes.join("\n")}
       if (deprecatedTag) {
         addRelatedInfo(
           diagnostic,
-          createDiagnosticForNode(deprecatedTag, Diagnostics.The_declaration_was_marked_as_deprecated_here)
+          createDiagnosticForNode(deprecatedTag, Diagnostics.The_declaration_was_marked_as_deprecated_here_Colon)
         );
       }
       suggestionDiagnostics.add(diagnostic);
@@ -46641,8 +46662,8 @@ ${lanes.join("\n")}
         if (adjustedNode === errorNode)
           continue;
         err.relatedInformation = err.relatedInformation || [];
-        const leadingMessage = createDiagnosticForNode(adjustedNode, Diagnostics._0_was_also_declared_here, symbolName2);
-        const followOnMessage = createDiagnosticForNode(adjustedNode, Diagnostics.and_here);
+        const leadingMessage = createDiagnosticForNode(adjustedNode, Diagnostics._0_was_also_declared_here_Colon, symbolName2);
+        const followOnMessage = createDiagnosticForNode(adjustedNode, Diagnostics.and_here_Colon);
         if (length(err.relatedInformation) >= 5 || some(err.relatedInformation, (r) => compareDiagnostics(r, followOnMessage) === 0 /* EqualTo */ || compareDiagnostics(r, leadingMessage) === 0 /* EqualTo */))
           continue;
         addRelatedInfo(err, !length(err.relatedInformation) ? leadingMessage : followOnMessage);
@@ -47253,7 +47274,7 @@ ${lanes.join("\n")}
                   if (suggestion.valueDeclaration) {
                     addRelatedInfo(
                       diagnostic,
-                      createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here, suggestionName)
+                      createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here_Colon, suggestionName)
                     );
                   }
                 }
@@ -47315,7 +47336,7 @@ ${lanes.join("\n")}
         diagnostic,
         createDiagnosticForNode(
           typeOnlyDeclaration,
-          typeOnlyDeclaration.kind === 281 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 278 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 280 /* NamespaceExport */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
+          typeOnlyDeclaration.kind === 281 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 278 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 280 /* NamespaceExport */ ? Diagnostics._0_was_exported_here_Colon : Diagnostics._0_was_imported_here_Colon,
           unescapedName
         )
       );
@@ -47452,7 +47473,7 @@ ${lanes.join("\n")}
               return true;
             }
           }
-          error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here, unescapeLeadingUnderscores(name));
+          error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_Colon, unescapeLeadingUnderscores(name));
           return true;
         }
       }
@@ -47494,7 +47515,7 @@ ${lanes.join("\n")}
           if (isExtendedByInterface(errorLocation)) {
             error2(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes, unescapeLeadingUnderscores(name));
           } else {
-            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, unescapeLeadingUnderscores(name));
+            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon, unescapeLeadingUnderscores(name));
           }
           return true;
         }
@@ -47517,7 +47538,7 @@ ${lanes.join("\n")}
           } else if (maybeMappedType(errorLocation, symbol)) {
             error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0, rawName, rawName === "K" ? "P" : "K");
           } else {
-            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, rawName);
+            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon, rawName);
           }
           return true;
         }
@@ -47623,7 +47644,7 @@ ${lanes.join("\n")}
         if (diagnosticMessage) {
           addRelatedInfo(
             diagnosticMessage,
-            createDiagnosticForNode(declaration, Diagnostics._0_is_declared_here, declarationName)
+            createDiagnosticForNode(declaration, Diagnostics._0_is_declared_here_Colon, declarationName)
           );
         }
       }
@@ -47691,7 +47712,7 @@ ${lanes.join("\n")}
         const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(getSymbolOfDeclaration(node));
         const isExport = typeOnlyDeclaration.kind === 281 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 278 /* ExportDeclaration */;
         const message = isExport ? Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type : Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type;
-        const relatedMessage = isExport ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here;
+        const relatedMessage = isExport ? Diagnostics._0_was_exported_here_Colon : Diagnostics._0_was_imported_here_Colon;
         const name = typeOnlyDeclaration.kind === 278 /* ExportDeclaration */ ? "*" : unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
         addRelatedInfo(error2(node.moduleReference, message), createDiagnosticForNode(typeOnlyDeclaration, relatedMessage, name));
       }
@@ -48013,7 +48034,7 @@ ${lanes.join("\n")}
         if (suggestion.valueDeclaration) {
           addRelatedInfo(
             diagnostic,
-            createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here, suggestionName)
+            createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here_Colon, suggestionName)
           );
         }
       } else {
@@ -48043,7 +48064,7 @@ ${lanes.join("\n")}
           if (localSymbol.declarations) {
             addRelatedInfo(
               diagnostic,
-              ...map(localSymbol.declarations, (decl, index) => createDiagnosticForNode(decl, index === 0 ? Diagnostics._0_is_declared_here : Diagnostics.and_here, declarationName))
+              ...map(localSymbol.declarations, (decl, index) => createDiagnosticForNode(decl, index === 0 ? Diagnostics._0_is_declared_here_Colon : Diagnostics.and_here_Colon, declarationName))
             );
           }
         }
@@ -54088,11 +54109,11 @@ ${lanes.join("\n")}
                 const exportedMemberName = ((_a = tryCast(exportedMember.valueDeclaration, isNamedDeclaration)) == null ? void 0 : _a.name) || exportedMember.valueDeclaration;
                 addRelatedInfo(
                   error2(s.valueDeclaration, Diagnostics.Duplicate_identifier_0, unescapedName),
-                  createDiagnosticForNode(exportedMemberName, Diagnostics._0_was_also_declared_here, unescapedName)
+                  createDiagnosticForNode(exportedMemberName, Diagnostics._0_was_also_declared_here_Colon, unescapedName)
                 );
                 addRelatedInfo(
                   error2(exportedMemberName, Diagnostics.Duplicate_identifier_0, unescapedName),
-                  createDiagnosticForNode(s.valueDeclaration, Diagnostics._0_was_also_declared_here, unescapedName)
+                  createDiagnosticForNode(s.valueDeclaration, Diagnostics._0_was_also_declared_here_Colon, unescapedName)
                 );
               }
               const union = createSymbol(s.flags | exportedMember.flags, name);
@@ -54603,7 +54624,7 @@ ${lanes.join("\n")}
         return checkFlags & 2 /* SyntheticProperty */ ? checkFlags & 65536 /* DeferredType */ ? getWriteTypeOfSymbolWithDeferredType(symbol) || getTypeOfSymbolWithDeferredType(symbol) : (
           // NOTE: cast to TransientSymbol should be safe because only TransientSymbols can have CheckFlags.SyntheticProperty
           symbol.links.writeType || symbol.links.type
-        ) : removeMissingType(getTypeOfSymbol(symbol), !!(symbol.flags & 16777216 /* Optional */));
+        ) : getTypeOfSymbol(symbol);
       }
       if (symbol.flags & 98304 /* Accessor */) {
         return checkFlags & 1 /* Instantiated */ ? getWriteTypeOfInstantiatedSymbol(symbol) : getWriteTypeOfAccessors(symbol);
@@ -55327,7 +55348,7 @@ ${lanes.join("\n")}
           if (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol) {
             const declarations = earlySymbol ? concatenate(earlySymbol.declarations, lateSymbol.declarations) : lateSymbol.declarations;
             const name = !(type.flags & 8192 /* UniqueESSymbol */) && unescapeLeadingUnderscores(memberName) || declarationNameToString(declName);
-            forEach(declarations, (declaration) => error2(getNameOfDeclaration(declaration) || declaration, Diagnostics.Property_0_was_also_declared_here, name));
+            forEach(declarations, (declaration) => error2(getNameOfDeclaration(declaration) || declaration, Diagnostics.Property_0_was_also_declared_here_Colon, name));
             error2(declName || decl, Diagnostics.Duplicate_property_0, name);
             lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
           }
@@ -60239,7 +60260,7 @@ ${lanes.join("\n")}
           if (moduleSymbol.flags & targetMeaning) {
             links.resolvedType = resolveImportSymbolType(node, links, moduleSymbol, targetMeaning);
           } else {
-            const errorMessage = targetMeaning === 111551 /* Value */ ? Diagnostics.Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here : Diagnostics.Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0;
+            const errorMessage = targetMeaning === 111551 /* Value */ ? Diagnostics.Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_Colon : Diagnostics.Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0;
             error2(node, errorMessage, node.argument.literal.text);
             links.resolvedSymbol = unknownSymbol;
             links.resolvedType = errorType;
@@ -64000,7 +64021,7 @@ ${lanes.join("\n")}
           );
           reportError(Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, ...getTypeNamesForErrorDisplay(source2, target2));
           if (length(unmatchedProperty.declarations)) {
-            associateRelatedInfo(createDiagnosticForNode(unmatchedProperty.declarations[0], Diagnostics._0_is_declared_here, propName));
+            associateRelatedInfo(createDiagnosticForNode(unmatchedProperty.declarations[0], Diagnostics._0_is_declared_here_Colon, propName));
           }
           if (shouldSkipElaboration && errorInfo) {
             overrideNextErrorInfo++;
@@ -64954,7 +64975,8 @@ ${lanes.join("\n")}
       return !!elementType && isEmptyLiteralType(elementType);
     }
     function isTupleLikeType(type) {
-      return isTupleType(type) || !!getPropertyOfType(type, "0");
+      let lengthType;
+      return isTupleType(type) || !!getPropertyOfType(type, "0") || isArrayLikeType(type) && !!(lengthType = getTypeOfPropertyOfType(type, "length")) && everyType(lengthType, (t) => !!(t.flags & 256 /* NumberLiteral */));
     }
     function isArrayOrTupleLikeType(type) {
       return isArrayLikeType(type) || isTupleLikeType(type);
@@ -68477,15 +68499,7 @@ ${lanes.join("\n")}
           location = location.parent;
         }
         if (isExpressionNode(location) && (!isAssignmentTarget(location) || isWriteAccess(location))) {
-          const type = removeOptionalTypeMarker(
-            isWriteAccess(location) && location.kind === 211 /* PropertyAccessExpression */ ? checkPropertyAccessExpression(
-              location,
-              /*checkMode*/
-              void 0,
-              /*writeOnly*/
-              true
-            ) : getTypeOfExpression(location)
-          );
+          const type = removeOptionalTypeMarker(getTypeOfExpression(location));
           if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
             return type;
           }
@@ -70324,6 +70338,10 @@ ${lanes.join("\n")}
     function hasDefaultValue(node) {
       return node.kind === 208 /* BindingElement */ && !!node.initializer || node.kind === 226 /* BinaryExpression */ && node.operatorToken.kind === 64 /* EqualsToken */;
     }
+    function isSpreadIntoCallOrNew(node) {
+      const parent2 = walkUpParenthesizedExpressions(node.parent);
+      return isSpreadElement(parent2) && isCallOrNewExpression(parent2.parent);
+    }
     function checkArrayLiteral(node, checkMode, forceTuple) {
       const elements = node.elements;
       const elementCount = elements.length;
@@ -70331,14 +70349,13 @@ ${lanes.join("\n")}
       const elementFlags = [];
       pushCachedContextualType(node);
       const inDestructuringPattern = isAssignmentTarget(node);
-      const isSpreadIntoCallOrNew = isSpreadElement(node.parent) && isCallOrNewExpression(node.parent.parent);
-      const inConstContext = isSpreadIntoCallOrNew || isConstContext(node);
+      const inConstContext = isConstContext(node);
       const contextualType = getApparentTypeOfContextualType(
         node,
         /*contextFlags*/
         void 0
       );
-      const inTupleContext = isSpreadIntoCallOrNew || !!contextualType && someType(contextualType, isTupleLikeType);
+      const inTupleContext = isSpreadIntoCallOrNew(node) || !!contextualType && someType(contextualType, isTupleLikeType);
       let hasOmittedExpression = false;
       for (let i = 0; i < elementCount; i++) {
         const e = elements[i];
@@ -71779,7 +71796,7 @@ ${lanes.join("\n")}
       if (diagnosticMessage) {
         addRelatedInfo(
           diagnosticMessage,
-          createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here, declarationName)
+          createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here_Colon, declarationName)
         );
       }
     }
@@ -71866,7 +71883,7 @@ ${lanes.join("\n")}
               const suggestedName = symbolName(suggestion);
               const message = isUncheckedJS ? Diagnostics.Property_0_may_not_exist_on_type_1_Did_you_mean_2 : Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2;
               errorInfo = chainDiagnosticMessages(errorInfo, message, missingProperty, container, suggestedName);
-              relatedInfo = suggestion.valueDeclaration && createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here, suggestedName);
+              relatedInfo = suggestion.valueDeclaration && createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here_Colon, suggestedName);
             } else {
               const diagnostic = containerSeemsToBeEmptyDomElement(containingType) ? Diagnostics.Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom : Diagnostics.Property_0_does_not_exist_on_type_1;
               errorInfo = chainDiagnosticMessages(elaborateNeverIntersection(errorInfo, containingType), diagnostic, missingProperty, container);
@@ -72583,7 +72600,7 @@ ${lanes.join("\n")}
           const diag2 = createDiagnosticForNode(node.tagName, Diagnostics.Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3, entityNameToString(node.tagName), absoluteMinArgCount, entityNameToString(factory2), maxParamCount);
           const tagNameDeclaration = (_a = getSymbolAtLocation(node.tagName)) == null ? void 0 : _a.valueDeclaration;
           if (tagNameDeclaration) {
-            addRelatedInfo(diag2, createDiagnosticForNode(tagNameDeclaration, Diagnostics._0_is_declared_here, entityNameToString(node.tagName)));
+            addRelatedInfo(diag2, createDiagnosticForNode(tagNameDeclaration, Diagnostics._0_is_declared_here_Colon, entityNameToString(node.tagName)));
           }
           if (errorOutputContainer && errorOutputContainer.skipLogging) {
             (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag2);
@@ -73035,7 +73052,7 @@ ${lanes.join("\n")}
             if (diags) {
               for (const d of diags) {
                 if (last2.declaration && candidatesForArgumentError.length > 3) {
-                  addRelatedInfo(d, createDiagnosticForNode(last2.declaration, Diagnostics.The_last_overload_is_declared_here));
+                  addRelatedInfo(d, createDiagnosticForNode(last2.declaration, Diagnostics.The_last_overload_is_declared_here_Colon));
                 }
                 addImplementationSuccessElaboration(last2, d);
                 diagnostics.add(d);
@@ -78175,7 +78192,7 @@ ${lanes.join("\n")}
               const errorNode = signature.declaration && isJSDocSignature(signature.declaration) ? signature.declaration.parent.tagName : signature.declaration;
               addRelatedInfo(
                 error2(errorNode, Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature),
-                createDiagnosticForNode(bodyDeclaration, Diagnostics.The_implementation_signature_is_declared_here)
+                createDiagnosticForNode(bodyDeclaration, Diagnostics.The_implementation_signature_is_declared_here_Colon)
               );
               break;
             }
@@ -78641,7 +78658,7 @@ ${lanes.join("\n")}
           const diag2 = error2(typeName, Diagnostics.A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled);
           const aliasDeclaration = find(rootSymbol.declarations || emptyArray, isAliasSymbolDeclaration2);
           if (aliasDeclaration) {
-            addRelatedInfo(diag2, createDiagnosticForNode(aliasDeclaration, Diagnostics._0_was_imported_here, idText(rootName)));
+            addRelatedInfo(diag2, createDiagnosticForNode(aliasDeclaration, Diagnostics._0_was_imported_here_Colon, idText(rootName)));
           }
         }
       }
@@ -79585,7 +79602,7 @@ ${lanes.join("\n")}
       if (firstDeclaration) {
         addRelatedInfo(
           err,
-          createDiagnosticForNode(firstDeclaration, Diagnostics._0_was_also_declared_here, declName)
+          createDiagnosticForNode(firstDeclaration, Diagnostics._0_was_also_declared_here_Colon, declName)
         );
       }
     }
@@ -80695,7 +80712,7 @@ ${lanes.join("\n")}
             typeToString(info.type)
           );
           if (propDeclaration && errorNode !== propDeclaration) {
-            addRelatedInfo(diagnostic, createDiagnosticForNode(propDeclaration, Diagnostics._0_is_declared_here, symbolToString(prop)));
+            addRelatedInfo(diagnostic, createDiagnosticForNode(propDeclaration, Diagnostics._0_is_declared_here_Colon, symbolToString(prop)));
           }
           diagnostics.add(diagnostic);
         }
@@ -85030,7 +85047,7 @@ ${lanes.join("\n")}
                 createDiagnosticForNode(useStrictDirective, Diagnostics.use_strict_directive_used_here)
               );
             });
-            const diagnostics2 = nonSimpleParameters.map((parameter, index) => index === 0 ? createDiagnosticForNode(parameter, Diagnostics.Non_simple_parameter_declared_here) : createDiagnosticForNode(parameter, Diagnostics.and_here));
+            const diagnostics2 = nonSimpleParameters.map((parameter, index) => index === 0 ? createDiagnosticForNode(parameter, Diagnostics.Non_simple_parameter_declared_here_Colon) : createDiagnosticForNode(parameter, Diagnostics.and_here_Colon));
             addRelatedInfo(error2(useStrictDirective, Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list), ...diagnostics2);
             return true;
           }
@@ -117714,39 +117731,49 @@ ${lanes.join("\n")}
   function formatColorAndReset(text, formatStyle) {
     return formatStyle + text + resetEscapeSequence;
   }
-  function formatCodeSpan(file, start, length2, indent3, squiggleColor, host) {
+  function formatCodeSpan(file, start, length2, indent2, underlineColor, host) {
     const { line: firstLine, character: firstLineChar } = getLineAndCharacterOfPosition(file, start);
     const { line: lastLine, character: lastLineChar } = getLineAndCharacterOfPosition(file, start + length2);
     const lastLineInFile = getLineAndCharacterOfPosition(file, file.text.length).line;
+    const gutterWidth = 1;
     const hasMoreThanFiveLines = lastLine - firstLine >= 4;
-    let gutterWidth = (lastLine + 1 + "").length;
-    if (hasMoreThanFiveLines) {
-      gutterWidth = Math.max(ellipsis.length, gutterWidth);
+    let whitespaceToTrim = Number.MAX_VALUE;
+    for (let i = firstLine; i <= lastLine; i++) {
+      if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
+        i = lastLine - 1;
+      }
+      const lineStart = getPositionOfLineAndCharacter(file, i, 0);
+      const lineEnd = i < lastLineInFile ? getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
+      const lineContent = file.text.slice(lineStart, lineEnd);
+      whitespaceToTrim = Math.min(whitespaceToTrim, startWhitespaceCount(lineContent));
     }
     let context = "";
     for (let i = firstLine; i <= lastLine; i++) {
       context += host.getNewLine();
       if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
-        context += indent3 + formatColorAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
+        context += indent2 + formatColorAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
         i = lastLine - 1;
       }
       const lineStart = getPositionOfLineAndCharacter(file, i, 0);
       const lineEnd = i < lastLineInFile ? getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
       let lineContent = file.text.slice(lineStart, lineEnd);
+      lineContent = lineContent.slice(whitespaceToTrim);
       lineContent = trimStringEnd(lineContent);
       lineContent = lineContent.replace(/\t/g, " ");
-      context += indent3 + formatColorAndReset(padLeft(i + 1 + "", gutterWidth), gutterStyleSequence) + gutterSeparator;
+      const gutterLine = "|";
+      context += indent2 + padLeft(gutterLine, gutterWidth) + gutterSeparator;
       context += lineContent + host.getNewLine();
-      context += indent3 + formatColorAndReset(padLeft("", gutterWidth), gutterStyleSequence) + gutterSeparator;
-      context += squiggleColor;
+      context += indent2 + padLeft("", gutterWidth) + gutterSeparator;
+      context += underlineColor;
       if (i === firstLine) {
         const lastCharForLine = i === lastLine ? lastLineChar : void 0;
-        context += lineContent.slice(0, firstLineChar).replace(/\S/g, " ");
-        context += lineContent.slice(firstLineChar, lastCharForLine).replace(/./g, "~");
+        context += lineContent.slice(0, firstLineChar - whitespaceToTrim).replace(/\S/g, " ");
+        const amendedLastChar = lastCharForLine ? lastCharForLine - whitespaceToTrim : void 0;
+        context += lineContent.slice(firstLineChar - whitespaceToTrim, amendedLastChar).replace(/./g, "\u2594");
       } else if (i === lastLine) {
-        context += lineContent.slice(0, lastLineChar).replace(/./g, "~");
+        context += lineContent.slice(0, lastLineChar).replace(/./g, "\u2594");
       } else {
-        context += lineContent.replace(/./g, "~");
+        context += lineContent.replace(/./g, "\u2594");
       }
       context += resetEscapeSequence;
     }
@@ -117764,54 +117791,87 @@ ${lanes.join("\n")}
     return output;
   }
   function formatDiagnosticsWithColorAndContext(diagnostics, host) {
+    var _a, _b;
+    const terminalWidth = ((_b = (_a = sys).getWidthOfTerminal) == null ? void 0 : _b.call(_a)) ?? 0;
+    const indent2 = terminalWidth < 60 ? "" : halfIndent;
     let output = "";
     for (const diagnostic of diagnostics) {
-      if (diagnostic.file) {
-        const { file, start } = diagnostic;
-        output += formatLocation(file, start, host);
-        output += " - ";
-      }
-      output += formatColorAndReset(diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
-      output += formatColorAndReset(` TS${diagnostic.code}: `, "\x1B[90m" /* Grey */);
-      output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
+      const diagnosticCode = "TS" + diagnostic.code;
+      const diagnosticCatName = diagnosticCategoryName(
+        diagnostic,
+        /*lowerCase*/
+        false
+      );
+      const diagnosticCatNameColored = formatColorAndReset(diagnosticCatName, getCategoryFormat(diagnostic.category));
       if (diagnostic.file && diagnostic.code !== Diagnostics.File_appears_to_be_binary.code) {
+        const { file, start } = diagnostic;
+        const location = formatLocation(file, start, host);
+        const locationLength = location.replace(/\u001b[[0-9]+m/g, "").length;
+        const codeLength = diagnosticCode.length;
+        output += formatColorAndReset(bullet, getCategoryFormat(diagnostic.category)) + location;
+        const defaultPad = codeLength + 1;
+        let padWidth = terminalWidth < 60 ? defaultPad : terminalWidth - (bullet.length + locationLength + codeLength + diagnosticCatName.length + 2);
+        if (padWidth < diagnosticCode.length)
+          padWidth = defaultPad;
+        output += padLeft(diagnosticCatNameColored, padWidth + (diagnosticCatNameColored.length - diagnosticCatName.length));
+        output += " " + diagnosticCode;
+        output += formatCodeSpan(diagnostic.file, diagnostic.start, diagnostic.length, indent2, getCategoryFormat(diagnostic.category), host);
         output += host.getNewLine();
-        output += formatCodeSpan(diagnostic.file, diagnostic.start, diagnostic.length, "", getCategoryFormat(diagnostic.category), host);
+      } else {
+        output += formatColorAndReset(bullet, getCategoryFormat(diagnostic.category)) + " " + diagnosticCatNameColored + " " + diagnosticCode;
       }
+      let diagnosticText = flattenDiagnosticMessageText(
+        diagnostic.messageText,
+        host.getNewLine(),
+        0,
+        /*pretty*/
+        true
+      );
+      diagnosticText = diagnosticText.split(host.getNewLine()).map((text) => indent2 + text).join(host.getNewLine());
+      output += diagnosticText;
+      output += host.getNewLine();
       if (diagnostic.relatedInformation) {
         output += host.getNewLine();
         for (const { file, start, length: length2, messageText } of diagnostic.relatedInformation) {
+          output += indent2 + trimStringStart(flattenDiagnosticMessageText(
+            messageText,
+            host.getNewLine(),
+            0,
+            /*pretty*/
+            true
+          ));
           if (file) {
+            output += " " + formatLocation(file, start, host);
             output += host.getNewLine();
-            output += halfIndent + formatLocation(file, start, host);
-            output += formatCodeSpan(file, start, length2, indent, "\x1B[96m" /* Cyan */, host);
+            output += formatCodeSpan(file, start, length2, indent2 + "  ", "\x1B[96m" /* Cyan */, host);
           }
-          output += host.getNewLine();
-          output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
         }
       }
-      output += host.getNewLine();
     }
     return output;
   }
-  function flattenDiagnosticMessageText(diag2, newLine, indent3 = 0) {
+  function flattenDiagnosticMessageText(diag2, newLine, indent2 = 0, pretty = false) {
     if (isString(diag2)) {
       return diag2;
     } else if (diag2 === void 0) {
       return "";
     }
     let result = "";
-    if (indent3) {
+    if (indent2) {
       result += newLine;
-      for (let i = 0; i < indent3; i++) {
-        result += "  ";
-      }
+      const indentsToReplaceWithNewLines = pretty ? 1 : 0;
+      if (indent2 > indentsToReplaceWithNewLines) {
+        for (let i = indentsToReplaceWithNewLines; i < indent2; i++) {
+          result += "  ";
+        }
+      } else
+        result += newLine;
     }
     result += diag2.messageText;
-    indent3++;
+    indent2++;
     if (diag2.next) {
       for (const kid of diag2.next) {
-        result += flattenDiagnosticMessageText(kid, newLine, indent3);
+        result += flattenDiagnosticMessageText(kid, newLine, indent2);
       }
     }
     return result;
@@ -119366,6 +119426,14 @@ ${lanes.join("\n")}
             case 265 /* TypeAliasDeclaration */:
               diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
               return "skip";
+            case 176 /* Constructor */:
+            case 174 /* MethodDeclaration */:
+            case 262 /* FunctionDeclaration */:
+              if (!node.body) {
+                diagnostics.push(createDiagnosticForNode2(node, Diagnostics.Signature_declarations_can_only_be_used_in_TypeScript_files));
+                return "skip";
+              }
+              return;
             case 266 /* EnumDeclaration */:
               const enumKeyword = Debug.checkDefined(tokenToString(94 /* EnumKeyword */));
               diagnostics.push(createDiagnosticForNode2(node, Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, enumKeyword));
@@ -120799,16 +120867,16 @@ ${lanes.join("\n")}
         let message2;
         switch (reason.kind) {
           case 3 /* Import */:
-            message2 = Diagnostics.File_is_included_via_import_here;
+            message2 = Diagnostics.File_is_included_via_import_here_Colon;
             break;
           case 4 /* ReferenceFile */:
-            message2 = Diagnostics.File_is_included_via_reference_here;
+            message2 = Diagnostics.File_is_included_via_reference_here_Colon;
             break;
           case 5 /* TypeReferenceDirective */:
-            message2 = Diagnostics.File_is_included_via_type_library_reference_here;
+            message2 = Diagnostics.File_is_included_via_type_library_reference_here_Colon;
             break;
           case 7 /* LibReferenceDirective */:
-            message2 = Diagnostics.File_is_included_via_library_reference_here;
+            message2 = Diagnostics.File_is_included_via_library_reference_here_Colon;
             break;
           default:
             Debug.assertNever(reason);
@@ -120832,14 +120900,14 @@ ${lanes.join("\n")}
           const matchedByFiles = getMatchedFileSpec(program, fileName);
           if (matchedByFiles) {
             configFileNode = getTsConfigPropArrayElementValue(options.configFile, "files", matchedByFiles);
-            message = Diagnostics.File_is_matched_by_files_list_specified_here;
+            message = Diagnostics.File_is_matched_by_files_list_specified_here_Colon;
             break;
           }
           const matchedByInclude = getMatchedIncludeSpec(program, fileName);
           if (!matchedByInclude || !isString(matchedByInclude))
             return void 0;
           configFileNode = getTsConfigPropArrayElementValue(options.configFile, "include", matchedByInclude);
-          message = Diagnostics.File_is_matched_by_include_pattern_specified_here;
+          message = Diagnostics.File_is_matched_by_include_pattern_specified_here_Colon;
           break;
         case 1 /* SourceFromProjectReference */:
         case 2 /* OutputFromProjectReference */:
@@ -120860,23 +120928,23 @@ ${lanes.join("\n")}
           return referencesSyntax && referencesSyntax.elements.length > index ? createDiagnosticForNodeInSourceFile(
             sourceFile,
             referencesSyntax.elements[index],
-            reason.kind === 2 /* OutputFromProjectReference */ ? Diagnostics.File_is_output_from_referenced_project_specified_here : Diagnostics.File_is_source_from_referenced_project_specified_here
+            reason.kind === 2 /* OutputFromProjectReference */ ? Diagnostics.File_is_output_from_referenced_project_specified_here_Colon : Diagnostics.File_is_source_from_referenced_project_specified_here_Colon
           ) : void 0;
         case 8 /* AutomaticTypeDirectiveFile */:
           if (!options.types)
             return void 0;
           configFileNode = getOptionsSyntaxByArrayElementValue("types", reason.typeReference);
-          message = Diagnostics.File_is_entry_point_of_type_library_specified_here;
+          message = Diagnostics.File_is_entry_point_of_type_library_specified_here_Colon;
           break;
         case 6 /* LibFile */:
           if (reason.index !== void 0) {
             configFileNode = getOptionsSyntaxByArrayElementValue("lib", options.lib[reason.index]);
-            message = Diagnostics.File_is_library_specified_here;
+            message = Diagnostics.File_is_library_specified_here_Colon;
             break;
           }
           const target = forEachEntry(targetOptionDeclaration.type, (value, key) => value === getEmitScriptTarget(options) ? key : void 0);
           configFileNode = target ? getOptionsSyntaxByValue("target", target) : void 0;
-          message = Diagnostics.File_is_default_library_for_target_specified_here;
+          message = Diagnostics.File_is_default_library_for_target_specified_here_Colon;
           break;
         default:
           Debug.assertNever(reason);
@@ -121368,7 +121436,7 @@ ${lanes.join("\n")}
     }
     Debug.fail("should never ask for module name at index higher than possible module name");
   }
-  var ForegroundColorEscapeSequences, gutterStyleSequence, gutterSeparator, resetEscapeSequence, ellipsis, halfIndent, indent, emptyResolution, moduleResolutionNameAndModeGetter, typeReferenceResolutionNameAndModeGetter, inferredTypesContainingFile, plainJSErrors, emitSkippedWithNoDiagnostics;
+  var ForegroundColorEscapeSequences, gutterStyleSequence, gutterSeparator, resetEscapeSequence, ellipsis, halfIndent, bullet, emptyResolution, moduleResolutionNameAndModeGetter, typeReferenceResolutionNameAndModeGetter, inferredTypesContainingFile, plainJSErrors, emitSkippedWithNoDiagnostics;
   var init_program = __esm({
     "src/compiler/program.ts"() {
       "use strict";
@@ -121387,7 +121455,7 @@ ${lanes.join("\n")}
       resetEscapeSequence = "\x1B[0m";
       ellipsis = "...";
       halfIndent = "  ";
-      indent = "    ";
+      bullet = "\u25CF ";
       emptyResolution = {
         resolvedModule: void 0,
         resolvedTypeReferenceDirective: void 0
@@ -121405,8 +121473,8 @@ ${lanes.join("\n")}
         // binder errors
         Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
         Diagnostics.A_module_cannot_have_multiple_default_exports.code,
-        Diagnostics.Another_export_default_is_here.code,
-        Diagnostics.The_first_export_default_is_here.code,
+        Diagnostics.Another_export_default_is_here_Colon.code,
+        Diagnostics.The_first_export_default_is_here_Colon.code,
         Diagnostics.Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module.code,
         Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode.code,
         Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here.code,
@@ -130116,7 +130184,7 @@ ${lanes.join("\n")}
     const absoluteMaximumLength = defaultMaximumTruncationLength * 10;
     let displayParts;
     let lineStart;
-    let indent3;
+    let indent2;
     let length2;
     resetWriter();
     const unknownWrite = (text) => writeKind(text, 17 /* text */);
@@ -130152,12 +130220,12 @@ ${lanes.join("\n")}
       hasTrailingWhitespace: () => false,
       hasTrailingComment: () => false,
       rawWrite: notImplemented,
-      getIndent: () => indent3,
+      getIndent: () => indent2,
       increaseIndent: () => {
-        indent3++;
+        indent2++;
       },
       decreaseIndent: () => {
-        indent3--;
+        indent2--;
       },
       clear: resetWriter
     };
@@ -130165,7 +130233,7 @@ ${lanes.join("\n")}
       if (length2 > absoluteMaximumLength)
         return;
       if (lineStart) {
-        const indentString = getIndentString(indent3);
+        const indentString = getIndentString(indent2);
         if (indentString) {
           length2 += indentString.length;
           displayParts.push(displayPart(indentString, 16 /* space */));
@@ -130197,7 +130265,7 @@ ${lanes.join("\n")}
     function resetWriter() {
       displayParts = [];
       lineStart = true;
-      indent3 = 0;
+      indent2 = 0;
       length2 = 0;
     }
   }
@@ -148939,6 +149007,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     if (compilerOptions.configFile) {
       return getEmitModuleKind(compilerOptions) < 5 /* ES2015 */;
     }
+    if (sourceFile.impliedNodeFormat === 1 /* CommonJS */)
+      return true;
+    if (sourceFile.impliedNodeFormat === 99 /* ESNext */)
+      return false;
     for (const otherFile of program.getSourceFiles()) {
       if (otherFile === sourceFile || !isSourceFileJS(otherFile) || program.isSourceFileFromExternalLibrary(otherFile))
         continue;
@@ -149670,7 +149742,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code,
         Diagnostics.Cannot_find_namespace_0.code,
         Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code,
-        Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here.code,
+        Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon.code,
         Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code,
         Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type.code
       ];
@@ -156890,6 +156962,13 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       data = originToCompletionEntryData(origin);
       hasAction = !importStatementCompletion;
     }
+    const parentNamedImportOrExport = findAncestor(location, isNamedImportsOrExports);
+    if ((parentNamedImportOrExport == null ? void 0 : parentNamedImportOrExport.kind) === 275 /* NamedImports */) {
+      const possibleToken = stringToToken(name);
+      if (parentNamedImportOrExport && possibleToken && (possibleToken === 135 /* AwaitKeyword */ || isNonContextualKeyword(possibleToken))) {
+        insertText = `${name} as ${name}_`;
+      }
+    }
     return {
       name,
       kind: ts_SymbolDisplay_exports.getSymbolKind(typeChecker, symbol, location),
@@ -157670,7 +157749,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextToken, origin, symbol, program, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data, source, cancellationToken) {
     if (data == null ? void 0 : data.moduleSpecifier) {
-      if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken).replacementSpan) {
+      if (previousToken && getImportStatementCompletionInfo(contextToken || previousToken, sourceFile).replacementSpan) {
         return { codeActions: void 0, sourceDisplay: [textPart(data.moduleSpecifier)] };
       }
     }
@@ -157883,7 +157962,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     let isNewIdentifierLocation = false;
     let flags = 0 /* None */;
     if (contextToken) {
-      const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken);
+      const importStatementCompletionInfo = getImportStatementCompletionInfo(contextToken, sourceFile);
       if (importStatementCompletionInfo.keywordCompletion) {
         if (importStatementCompletionInfo.isKeywordOnlyCompletion) {
           return {
@@ -159514,7 +159593,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     return void 0;
   }
-  function getImportStatementCompletionInfo(contextToken) {
+  function getImportStatementCompletionInfo(contextToken, sourceFile) {
     var _a, _b, _c;
     let keywordCompletion;
     let isKeywordOnlyCompletion = false;
@@ -159530,6 +159609,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     function getCandidate() {
       const parent2 = contextToken.parent;
       if (isImportEqualsDeclaration(parent2)) {
+        const lastToken = parent2.getLastToken(sourceFile);
+        if (isIdentifier(contextToken) && lastToken !== contextToken) {
+          keywordCompletion = 161 /* FromKeyword */;
+          isKeywordOnlyCompletion = true;
+          return void 0;
+        }
         keywordCompletion = contextToken.kind === 156 /* TypeKeyword */ ? void 0 : 156 /* TypeKeyword */;
         return isModuleSpecifierMissingOrEmpty(parent2.moduleReference) ? parent2 : void 0;
       }
@@ -160097,7 +160182,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         extensionOptions,
         host,
         /*moduleSpecifierIsRelative*/
-        false,
+        true,
         scriptPath
       ).values());
     }
@@ -167779,8 +167864,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           const startPosition = getFirstNonSpaceCharacterPosition(sourceFile.text, lineStartPosition);
           const insertAtLineStart = isValidLocationToAddComment(sourceFile, startPosition);
           const token = getTouchingToken(sourceFile, insertAtLineStart ? startPosition : position);
-          const indent3 = sourceFile.text.slice(lineStartPosition, startPosition);
-          const text = `${insertAtLineStart ? "" : this.newLineCharacter}//${commentText}${this.newLineCharacter}${indent3}`;
+          const indent2 = sourceFile.text.slice(lineStartPosition, startPosition);
+          const text = `${insertAtLineStart ? "" : this.newLineCharacter}//${commentText}${this.newLineCharacter}${indent2}`;
           this.insertText(sourceFile, token.getStart(sourceFile), text);
         }
         insertJsdocCommentBefore(sourceFile, node, tag) {
@@ -167799,8 +167884,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             }
           }
           const startPosition = getPrecedingNonSpaceCharacterPosition(sourceFile.text, fnStart - 1);
-          const indent3 = sourceFile.text.slice(startPosition, fnStart);
-          this.insertNodeAt(sourceFile, fnStart, tag, { suffix: this.newLineCharacter + indent3 });
+          const indent2 = sourceFile.text.slice(startPosition, fnStart);
+          this.insertNodeAt(sourceFile, fnStart, tag, { suffix: this.newLineCharacter + indent2 });
         }
         createJSDocText(sourceFile, node) {
           const comments = flatMap(node.jsDoc, (jsDoc2) => isString(jsDoc2.comment) ? factory.createJSDocText(jsDoc2.comment) : jsDoc2.comment);
@@ -171880,7 +171965,7 @@ ${options.prefix}` : "\n" : options.prefix
       array.splice(removeIndex, 1);
     }
   }
-  function indent2(str) {
+  function indent(str) {
     return indentStr + str.replace(/\n/g, indentStr);
   }
   function stringifyIndented(json) {
@@ -178674,7 +178759,7 @@ Dynamic files must always be opened with service's current directory or service
     const verboseLogging = logger.hasLevel(3 /* verbose */);
     const json = JSON.stringify(msg);
     if (verboseLogging) {
-      logger.info(`${msg.type}:${indent2(JSON.stringify(msg, void 0, " "))}`);
+      logger.info(`${msg.type}:${indent(JSON.stringify(msg, void 0, " "))}`);
     }
     const len = byteLength(json, "utf8");
     return `Content-Length: ${1 + len}\r
@@ -179983,9 +180068,9 @@ ${json}${newLine}`;
         logErrorWorker(err, cmd, fileRequest) {
           let msg = "Exception on executing command " + cmd;
           if (err.message) {
-            msg += ":\n" + indent2(err.message);
+            msg += ":\n" + indent(err.message);
             if (err.stack) {
-              msg += "\n" + indent2(err.stack);
+              msg += "\n" + indent(err.stack);
             }
           }
           if (this.logger.hasLevel(3 /* verbose */)) {
@@ -179997,7 +180082,7 @@ ${json}${newLine}`;
                   const text = getSnapshotText(scriptInfo.getSnapshot());
                   msg += `
 
-File text of ${fileRequest.file}:${indent2(text)}
+File text of ${fileRequest.file}:${indent(text)}
 `;
                 }
               } catch {
@@ -181838,7 +181923,7 @@ ${e.message}`;
           if (this.logger.hasLevel(2 /* requestTime */)) {
             start = this.hrtime();
             if (this.logger.hasLevel(3 /* verbose */)) {
-              this.logger.info(`request:${indent2(this.toStringMessage(message))}`);
+              this.logger.info(`request:${indent(this.toStringMessage(message))}`);
             }
           }
           let request;
@@ -182711,7 +182796,7 @@ ${e.message}`;
     getLocationInNewDocument: () => getLocationInNewDocument,
     hasArgument: () => hasArgument,
     hasNoTypeScriptSource: () => hasNoTypeScriptSource,
-    indent: () => indent2,
+    indent: () => indent,
     isConfigFile: () => isConfigFile,
     isConfiguredProject: () => isConfiguredProject,
     isDynamicFileName: () => isDynamicFileName,
@@ -184871,6 +184956,7 @@ ${e.message}`;
     startEndOverlapsWithStartEnd: () => startEndOverlapsWithStartEnd,
     startOnNewLine: () => startOnNewLine,
     startTracing: () => startTracing,
+    startWhitespaceCount: () => startWhitespaceCount,
     startsWith: () => startsWith,
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,
@@ -185126,7 +185212,7 @@ ${e.message}`;
     getLocationInNewDocument: () => getLocationInNewDocument,
     hasArgument: () => hasArgument,
     hasNoTypeScriptSource: () => hasNoTypeScriptSource,
-    indent: () => indent2,
+    indent: () => indent,
     isConfigFile: () => isConfigFile,
     isConfiguredProject: () => isConfiguredProject,
     isDynamicFileName: () => isDynamicFileName,
@@ -187274,6 +187360,7 @@ ${e.message}`;
     startEndOverlapsWithStartEnd: () => startEndOverlapsWithStartEnd,
     startOnNewLine: () => startOnNewLine,
     startTracing: () => startTracing,
+    startWhitespaceCount: () => startWhitespaceCount,
     startsWith: () => startsWith,
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,