Skip to content

Commit dd21650

Browse files
a-tarasyuka-tarasyuk
committed
Merge branch 'master' of https://github.com/Microsoft/TypeScript into bug/24542-bad-error-message-for-import-ing-an-export
2 parents 2c7b39a + 7a082d4 commit dd21650

File tree

155 files changed

+35977
-29173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+35977
-29173
lines changed

‎lib/cs/diagnosticMessages.generated.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434": "Deklarace oboru názvů nemůže být umístěná před třídou nebo funkcí, se kterou se slučuje.",
5050
"A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235": "Deklarace oboru názvů je povolená jenom v oboru názvů nebo v modulu.",
5151
"A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_7038": "Import stylu oboru názvů není možné vyvolat nebo konstruovat a způsobí selhání za běhu.",
52-
"A_non_dry_build_would_build_project_0_6357": "Build nedodržující princip DRY by vytvořil projekt {0}.",
53-
"A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Build nedodržující princip DRY by odstranil následující soubory: {0}",
52+
"A_non_dry_build_would_build_project_0_6357": "Build bez příznaku -dry by vytvořil projekt {0}.",
53+
"A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Build bez příznaku -dry by odstranil následující soubory: {0}",
5454
"A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371": "Inicializátor parametru je povolený jenom v implementaci funkce nebo konstruktoru.",
5555
"A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317": "Vlastnost parametru se nedá deklarovat pomocí parametru rest.",
5656
"A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369": "Vlastnost parametru je povolená jenom v implementaci konstruktoru.",

‎lib/de/diagnosticMessages.generated.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434": "Eine Namespacedeklaration darf nicht vor der Klasse oder Funktion positioniert werden, mit der sie zusammengeführt wird.",
5050
"A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235": "Eine Namespacedeklaration ist nur in einem Namespace oder Modul zulässig.",
5151
"A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_7038": "Ein Import im Namespacestil kann nicht aufgerufen oder erstellt werden und verursacht zur Laufzeit einen Fehler.",
52-
"A_non_dry_build_would_build_project_0_6357": "Bei einem echten Build würde das Projekt \"{0}\" erstellt.",
53-
"A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Bei einem echten Build würden die folgenden Dateien gelöscht: {0}",
52+
"A_non_dry_build_would_build_project_0_6357": "Bei einem Build mit dem Flag \"-dry\" würde das Projekt \"{0}\" erstellt.",
53+
"A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Bei einem Build mit dem Flag \"-dry\" würden die folgenden Dateien gelöscht: {0}",
5454
"A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371": "Ein Parameterinitialisierer ist nur in einer Funktions- oder Konstruktorimplementierung zulässig.",
5555
"A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317": "Eine Parametereigenschaft darf nicht mithilfe eines rest-Parameters deklariert werden.",
5656
"A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369": "Eine Parametereigenschaft ist nur in einer Konstruktorimplementierung zulässig.",

‎lib/enu/diagnosticMessages.generated.json.lcg

Lines changed: 122 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,12 @@
363363
</Str>
364364
<Disp Icon="Str" />
365365
</Item>
366+
<Item ItemId=";A_required_element_cannot_follow_an_optional_element_1257" ItemType="0" PsrId="306" Leaf="true">
367+
<Str Cat="Text">
368+
<Val><![CDATA[A required element cannot follow an optional element.]]></Val>
369+
</Str>
370+
<Disp Icon="Str" />
371+
</Item>
366372
<Item ItemId=";A_required_parameter_cannot_follow_an_optional_parameter_1016" ItemType="0" PsrId="306" Leaf="true">
367373
<Str Cat="Text">
368374
<Val><![CDATA[A required parameter cannot follow an optional parameter.]]></Val>
@@ -393,6 +399,18 @@
393399
</Str>
394400
<Disp Icon="Str" />
395401
</Item>
402+
<Item ItemId=";A_rest_element_must_be_last_in_a_tuple_type_1256" ItemType="0" PsrId="306" Leaf="true">
403+
<Str Cat="Text">
404+
<Val><![CDATA[A rest element must be last in a tuple type.]]></Val>
405+
</Str>
406+
<Disp Icon="Str" />
407+
</Item>
408+
<Item ItemId=";A_rest_element_type_must_be_an_array_type_2574" ItemType="0" PsrId="306" Leaf="true">
409+
<Str Cat="Text">
410+
<Val><![CDATA[A rest element type must be an array type.]]></Val>
411+
</Str>
412+
<Disp Icon="Str" />
413+
</Item>
396414
<Item ItemId=";A_rest_parameter_cannot_be_optional_1047" ItemType="0" PsrId="306" Leaf="true">
397415
<Str Cat="Text">
398416
<Val><![CDATA[A rest parameter cannot be optional.]]></Val>
@@ -495,12 +513,6 @@
495513
</Str>
496514
<Disp Icon="Str" />
497515
</Item>
498-
<Item ItemId=";A_tuple_type_element_list_cannot_be_empty_1122" ItemType="0" PsrId="306" Leaf="true">
499-
<Str Cat="Text">
500-
<Val><![CDATA[A tuple type element list cannot be empty.]]></Val>
501-
</Str>
502-
<Disp Icon="Str" />
503-
</Item>
504516
<Item ItemId=";A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007" ItemType="0" PsrId="306" Leaf="true">
505517
<Str Cat="Text">
506518
<Val><![CDATA[A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses.]]></Val>
@@ -603,6 +615,12 @@
603615
</Str>
604616
<Disp Icon="Str" />
605617
</Item>
618+
<Item ItemId=";Add_all_missing_imports_95064" ItemType="0" PsrId="306" Leaf="true">
619+
<Str Cat="Text">
620+
<Val><![CDATA[Add all missing imports]]></Val>
621+
</Str>
622+
<Disp Icon="Str" />
623+
</Item>
606624
<Item ItemId=";Add_all_missing_members_95022" ItemType="0" PsrId="306" Leaf="true">
607625
<Str Cat="Text">
608626
<Val><![CDATA[Add all missing members]]></Val>
@@ -657,6 +675,12 @@
657675
</Str>
658676
<Disp Icon="Str" />
659677
</Item>
678+
<Item ItemId=";Add_missing_enum_member_0_95063" ItemType="0" PsrId="306" Leaf="true">
679+
<Str Cat="Text">
680+
<Val><![CDATA[Add missing enum member '{0}']]></Val>
681+
</Str>
682+
<Disp Icon="Str" />
683+
</Item>
660684
<Item ItemId=";Add_missing_super_call_90001" ItemType="0" PsrId="306" Leaf="true">
661685
<Str Cat="Text">
662686
<Val><![CDATA[Add missing 'super()' call]]></Val>
@@ -1683,6 +1707,12 @@
16831707
</Str>
16841708
<Disp Icon="Str" />
16851709
</Item>
1710+
<Item ItemId=";Conflicts_are_in_this_file_6201" ItemType="0" PsrId="306" Leaf="true">
1711+
<Str Cat="Text">
1712+
<Val><![CDATA[Conflicts are in this file.]]></Val>
1713+
</Str>
1714+
<Disp Icon="Str" />
1715+
</Item>
16861716
<Item ItemId=";Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013" ItemType="0" PsrId="306" Leaf="true">
16871717
<Str Cat="Text">
16881718
<Val><![CDATA[Construct signature, which lacks return-type annotation, implicitly has an 'any' return type.]]></Val>
@@ -1743,6 +1773,12 @@
17431773
</Str>
17441774
<Disp Icon="Str" />
17451775
</Item>
1776+
<Item ItemId=";Convert_default_export_to_named_export_95061" ItemType="0" PsrId="306" Leaf="true">
1777+
<Str Cat="Text">
1778+
<Val><![CDATA[Convert default export to named export]]></Val>
1779+
</Str>
1780+
<Disp Icon="Str" />
1781+
</Item>
17461782
<Item ItemId=";Convert_function_0_to_class_95002" ItemType="0" PsrId="306" Leaf="true">
17471783
<Str Cat="Text">
17481784
<Val><![CDATA[Convert function '{0}' to class]]></Val>
@@ -1755,6 +1791,12 @@
17551791
</Str>
17561792
<Disp Icon="Str" />
17571793
</Item>
1794+
<Item ItemId=";Convert_named_export_to_default_export_95062" ItemType="0" PsrId="306" Leaf="true">
1795+
<Str Cat="Text">
1796+
<Val><![CDATA[Convert named export to default export]]></Val>
1797+
</Str>
1798+
<Disp Icon="Str" />
1799+
</Item>
17581800
<Item ItemId=";Convert_named_imports_to_namespace_import_95057" ItemType="0" PsrId="306" Leaf="true">
17591801
<Str Cat="Text">
17601802
<Val><![CDATA[Convert named imports to namespace import]]></Val>
@@ -1869,6 +1911,12 @@
18691911
</Str>
18701912
<Disp Icon="Str" />
18711913
</Item>
1914+
<Item ItemId=";Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0_6200" ItemType="0" PsrId="306" Leaf="true">
1915+
<Str Cat="Text">
1916+
<Val><![CDATA[Definitions of the following identifiers conflict with those in another file: {0}]]></Val>
1917+
</Str>
1918+
<Disp Icon="Str" />
1919+
</Item>
18721920
<Item ItemId=";Delete_all_unused_declarations_95024" ItemType="0" PsrId="306" Leaf="true">
18731921
<Str Cat="Text">
18741922
<Val><![CDATA[Delete all unused declarations]]></Val>
@@ -2805,6 +2853,12 @@
28052853
</Str>
28062854
<Disp Icon="Str" />
28072855
</Item>
2856+
<Item ItemId=";If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_S_7040" ItemType="0" PsrId="306" Leaf="true">
2857+
<Str Cat="Text">
2858+
<Val><![CDATA[If the '{0}' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/{0}`]]></Val>
2859+
</Str>
2860+
<Disp Icon="Str" />
2861+
</Item>
28082862
<Item ItemId=";Ignore_this_error_message_90019" ItemType="0" PsrId="306" Leaf="true">
28092863
<Str Cat="Text">
28102864
<Val><![CDATA[Ignore this error message]]></Val>
@@ -3405,9 +3459,9 @@
34053459
</Str>
34063460
<Disp Icon="Str" />
34073461
</Item>
3408-
<Item ItemId=";Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_1340" ItemType="0" PsrId="306" Leaf="true">
3462+
<Item ItemId=";Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0_1340" ItemType="0" PsrId="306" Leaf="true">
34093463
<Str Cat="Text">
3410-
<Val><![CDATA[Module '{0}' does not refer to a type, but is used as a type here.]]></Val>
3464+
<Val><![CDATA[Module '{0}' does not refer to a type, but is used as a type here. Did you mean 'typeof import('{0}')'?]]></Val>
34113465
</Str>
34123466
<Disp Icon="Str" />
34133467
</Item>
@@ -4203,6 +4257,12 @@
42034257
</Str>
42044258
<Disp Icon="Str" />
42054259
</Item>
4260+
<Item ItemId=";Property_0_is_incompatible_with_rest_element_type_2573" ItemType="0" PsrId="306" Leaf="true">
4261+
<Str Cat="Text">
4262+
<Val><![CDATA[Property '{0}' is incompatible with rest element type.]]></Val>
4263+
</Str>
4264+
<Disp Icon="Str" />
4265+
</Item>
42064266
<Item ItemId=";Property_0_is_missing_in_type_1_2324" ItemType="0" PsrId="306" Leaf="true">
42074267
<Str Cat="Text">
42084268
<Val><![CDATA[Property '{0}' is missing in type '{1}'.]]></Val>
@@ -4257,6 +4317,12 @@
42574317
</Str>
42584318
<Disp Icon="Str" />
42594319
</Item>
4320+
<Item ItemId=";Property_0_is_used_before_its_initialization_2729" ItemType="0" PsrId="306" Leaf="true">
4321+
<Str Cat="Text">
4322+
<Val><![CDATA[Property '{0}' is used before its initialization.]]></Val>
4323+
</Str>
4324+
<Disp Icon="Str" />
4325+
</Item>
42604326
<Item ItemId=";Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606" ItemType="0" PsrId="306" Leaf="true">
42614327
<Str Cat="Text">
42624328
<Val><![CDATA[Property '{0}' of JSX spread attribute is not assignable to target property.]]></Val>
@@ -4593,6 +4659,12 @@
45934659
</Str>
45944660
<Disp Icon="Str" />
45954661
</Item>
4662+
<Item ItemId=";Rest_signatures_are_incompatible_2572" ItemType="0" PsrId="306" Leaf="true">
4663+
<Str Cat="Text">
4664+
<Val><![CDATA[Rest signatures are incompatible.]]></Val>
4665+
</Str>
4666+
<Disp Icon="Str" />
4667+
</Item>
45964668
<Item ItemId=";Rest_types_may_only_be_created_from_object_types_2700" ItemType="0" PsrId="306" Leaf="true">
45974669
<Str Cat="Text">
45984670
<Val><![CDATA[Rest types may only be created from object types.]]></Val>
@@ -5109,6 +5181,18 @@
51095181
</Str>
51105182
<Disp Icon="Str" />
51115183
</Item>
5184+
<Item ItemId=";The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500" ItemType="0" PsrId="306" Leaf="true">
5185+
<Str Cat="Text">
5186+
<Val><![CDATA[The expected type comes from property '{0}' which is declared here on type '{1}']]></Val>
5187+
</Str>
5188+
<Disp Icon="Str" />
5189+
</Item>
5190+
<Item ItemId=";The_expected_type_comes_from_this_index_signature_6501" ItemType="0" PsrId="306" Leaf="true">
5191+
<Str Cat="Text">
5192+
<Val><![CDATA[The expected type comes from this index signature.]]></Val>
5193+
</Str>
5194+
<Disp Icon="Str" />
5195+
</Item>
51125196
<Item ItemId=";The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context_2714" ItemType="0" PsrId="306" Leaf="true">
51135197
<Str Cat="Text">
51145198
<Val><![CDATA[The expression of an export assignment must be an identifier or qualified name in an ambient context.]]></Val>
@@ -5355,6 +5439,12 @@
53555439
</Str>
53565440
<Disp Icon="Str" />
53575441
</Item>
5442+
<Item ItemId=";This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap_2367" ItemType="0" PsrId="306" Leaf="true">
5443+
<Str Cat="Text">
5444+
<Val><![CDATA[This condition will always return '{0}' since the types '{1}' and '{2}' have no overlap.]]></Val>
5445+
</Str>
5446+
<Disp Icon="Str" />
5447+
</Item>
53585448
<Item ItemId=";This_constructor_function_may_be_converted_to_a_class_declaration_80002" ItemType="0" PsrId="306" Leaf="true">
53595449
<Str Cat="Text">
53605450
<Val><![CDATA[This constructor function may be converted to a class declaration.]]></Val>
@@ -5619,6 +5709,12 @@
56195709
</Str>
56205710
<Disp Icon="Str" />
56215711
</Item>
5712+
<Item ItemId=";Type_of_computed_property_s_value_is_0_which_is_not_assignable_to_type_1_2418" ItemType="0" PsrId="306" Leaf="true">
5713+
<Str Cat="Text">
5714+
<Val><![CDATA[Type of computed property's value is '{0}', which is not assignable to type '{1}'.]]></Val>
5715+
</Str>
5716+
<Disp Icon="Str" />
5717+
</Item>
56225718
<Item ItemId=";Type_of_iterated_elements_of_a_yield_Asterisk_operand_must_either_be_a_valid_promise_or_must_not_con_1322" ItemType="0" PsrId="306" Leaf="true">
56235719
<Str Cat="Text">
56245720
<Val><![CDATA[Type of iterated elements of a 'yield*' operand must either be a valid promise or must not contain a callable 'then' member.]]></Val>
@@ -6177,6 +6273,18 @@
61776273
</Str>
61786274
<Disp Icon="Str" />
61796275
</Item>
6276+
<Item ItemId=";_0_was_also_declared_here_6203" ItemType="0" PsrId="306" Leaf="true">
6277+
<Str Cat="Text">
6278+
<Val><![CDATA['{0}' was also declared here.]]></Val>
6279+
</Str>
6280+
<Disp Icon="Str" />
6281+
</Item>
6282+
<Item ItemId=";_0_was_declared_here_2728" ItemType="0" PsrId="306" Leaf="true">
6283+
<Str Cat="Text">
6284+
<Val><![CDATA['{0}' was declared here.]]></Val>
6285+
</Str>
6286+
<Disp Icon="Str" />
6287+
</Item>
61806288
<Item ItemId=";_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010" ItemType="0" PsrId="306" Leaf="true">
61816289
<Str Cat="Text">
61826290
<Val><![CDATA['{0}', which lacks return-type annotation, implicitly has an '{1}' return type.]]></Val>
@@ -6189,6 +6297,12 @@
61896297
</Str>
61906298
<Disp Icon="Str" />
61916299
</Item>
6300+
<Item ItemId=";and_here_6204" ItemType="0" PsrId="306" Leaf="true">
6301+
<Str Cat="Text">
6302+
<Val><![CDATA[and here.]]></Val>
6303+
</Str>
6304+
<Disp Icon="Str" />
6305+
</Item>
61926306
<Item ItemId=";await_expression_is_only_allowed_within_an_async_function_1308" ItemType="0" PsrId="306" Leaf="true">
61936307
<Str Cat="Text">
61946308
<Val><![CDATA['await' expression is only allowed within an async function.]]></Val>

‎lib/es/diagnosticMessages.generated.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
"A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434": "Una declaración de espacio de nombres no se puede situar antes que una clase o función con la que se combina.",
5050
"A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235": "Una declaración de espacio de nombres solo se permite en un espacio de nombres o en un módulo.",
5151
"A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_7038": "No se puede llamar o construir una importación de estilo de espacio de nombres, y provocará un error en tiempo de ejecución.",
52-
"A_non_dry_build_would_build_project_0_6357": "Una compilación no DRY compilaría el proyecto \"{0}\"",
53-
"A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Una compilación no DRY eliminaría los siguientes archivos: {0}",
52+
"A_non_dry_build_would_build_project_0_6357": "Una compilación no -dry compilaría el proyecto \"{0}\"",
53+
"A_non_dry_build_would_delete_the_following_files_Colon_0_6356": "Una compilación no -dry eliminaría los archivos siguientes: {0}",
5454
"A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371": "Un inicializador de parámetros solo se permite en una implementación de función o de constructor.",
5555
"A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317": "Una propiedad de parámetro no se puede declarar mediante un parámetro rest.",
5656
"A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369": "Una propiedad de parámetro solo se permite en una implementación de constructor.",

0 commit comments

Comments
 (0)