Skip to content

Commit 806cf90

Browse files
ahejlsbergahejlsberg
committed
Merge branch 'master' into fix38236
2 parents 0f76e2f + 53320f5 commit 806cf90

14 files changed

+376
-56
lines changed

‎src/compiler/binder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ namespace ts {
413413
function declareSymbol(symbolTable: SymbolTable, parent: Symbol | undefined, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags, isReplaceableByMethod?: boolean): Symbol {
414414
Debug.assert(!hasDynamicName(node));
415415

416-
const isDefaultExport = hasModifier(node, ModifierFlags.Default);
416+
const isDefaultExport = hasModifier(node, ModifierFlags.Default) || isExportSpecifier(node) && node.name.escapedText === "default";
417417

418418
// The exported symbol for an export default function/class node is always named "default"
419419
const name = isDefaultExport && parent ? InternalSymbolName.Default : getDeclarationName(node);

‎src/loc/lcl/esn/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,6 +3657,9 @@
36573657
<Item ItemId=";Declaration_augments_declaration_in_another_file_This_cannot_be_serialized_6232" ItemType="0" PsrId="306" Leaf="true">
36583658
<Str Cat="Text">
36593659
<Val><![CDATA[Declaration augments declaration in another file. This cannot be serialized.]]></Val>
3660+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3661+
<Val><![CDATA[La declaración aumenta la declaración en otro archivo. Esto no se puede serializar.]]></Val>
3662+
</Tgt>
36603663
</Str>
36613664
<Disp Icon="Str" />
36623665
</Item>
@@ -7470,12 +7473,18 @@
74707473
<Item ItemId=";Parameter_0_cannot_reference_identifier_1_declared_after_it_2373" ItemType="0" PsrId="306" Leaf="true">
74717474
<Str Cat="Text">
74727475
<Val><![CDATA[Parameter '{0}' cannot reference identifier '{1}' declared after it.]]></Val>
7476+
<Tgt Cat="Text" Stat="Loc" Orig="New">
7477+
<Val><![CDATA[El parámetro "{0}" no puede hacer referencia al identificador "{1}" declarado después de este.]]></Val>
7478+
</Tgt>
74737479
</Str>
74747480
<Disp Icon="Str" />
74757481
</Item>
74767482
<Item ItemId=";Parameter_0_cannot_reference_itself_2372" ItemType="0" PsrId="306" Leaf="true">
74777483
<Str Cat="Text">
74787484
<Val><![CDATA[Parameter '{0}' cannot reference itself.]]></Val>
7485+
<Tgt Cat="Text" Stat="Loc" Orig="New">
7486+
<Val><![CDATA[El parámetro "{0}" no puede hacer referencia a sí mismo.]]></Val>
7487+
</Tgt>
74797488
</Str>
74807489
<Disp Icon="Str" />
74817490
</Item>
@@ -10569,6 +10578,9 @@
1056910578
<Item ItemId=";This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_fil_6233" ItemType="0" PsrId="306" Leaf="true">
1057010579
<Str Cat="Text">
1057110580
<Val><![CDATA[This is the declaration being augmented. Consider moving the augmenting declaration into the same file.]]></Val>
10581+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10582+
<Val><![CDATA[Esta es la declaración que se está aumentando. Considere la posibilidad de mover la declaración en aumento al mismo archivo.]]></Val>
10583+
</Tgt>
1057210584
</Str>
1057310585
<Disp Icon="Str" />
1057410586
</Item>

‎src/loc/lcl/fra/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3657,6 +3657,9 @@
36573657
<Item ItemId=";Declaration_augments_declaration_in_another_file_This_cannot_be_serialized_6232" ItemType="0" PsrId="306" Leaf="true">
36583658
<Str Cat="Text">
36593659
<Val><![CDATA[Declaration augments declaration in another file. This cannot be serialized.]]></Val>
3660+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3661+
<Val><![CDATA[La déclaration augmente la déclaration dans un autre fichier. Cela ne peut pas être sérialisé.]]></Val>
3662+
</Tgt>
36603663
</Str>
36613664
<Disp Icon="Str" />
36623665
</Item>
@@ -7470,12 +7473,18 @@
74707473
<Item ItemId=";Parameter_0_cannot_reference_identifier_1_declared_after_it_2373" ItemType="0" PsrId="306" Leaf="true">
74717474
<Str Cat="Text">
74727475
<Val><![CDATA[Parameter '{0}' cannot reference identifier '{1}' declared after it.]]></Val>
7476+
<Tgt Cat="Text" Stat="Loc" Orig="New">
7477+
<Val><![CDATA[Le paramètre '{0}' ne peut pas référencer l'identificateur '{1}' déclaré après lui.]]></Val>
7478+
</Tgt>
74737479
</Str>
74747480
<Disp Icon="Str" />
74757481
</Item>
74767482
<Item ItemId=";Parameter_0_cannot_reference_itself_2372" ItemType="0" PsrId="306" Leaf="true">
74777483
<Str Cat="Text">
74787484
<Val><![CDATA[Parameter '{0}' cannot reference itself.]]></Val>
7485+
<Tgt Cat="Text" Stat="Loc" Orig="New">
7486+
<Val><![CDATA[Le paramètre '{0}' ne peut pas se référencer lui-même.]]></Val>
7487+
</Tgt>
74797488
</Str>
74807489
<Disp Icon="Str" />
74817490
</Item>
@@ -10212,6 +10221,9 @@
1021210221
<Item ItemId=";The_operand_of_a_delete_operator_must_be_optional_2790" ItemType="0" PsrId="306" Leaf="true">
1021310222
<Str Cat="Text">
1021410223
<Val><![CDATA[The operand of a 'delete' operator must be optional.]]></Val>
10224+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10225+
<Val><![CDATA[L'opérande d'un opérateur 'delete' doit être facultatif.]]></Val>
10226+
</Tgt>
1021510227
</Str>
1021610228
<Disp Icon="Str" />
1021710229
</Item>
@@ -10566,6 +10578,9 @@
1056610578
<Item ItemId=";This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_fil_6233" ItemType="0" PsrId="306" Leaf="true">
1056710579
<Str Cat="Text">
1056810580
<Val><![CDATA[This is the declaration being augmented. Consider moving the augmenting declaration into the same file.]]></Val>
10581+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10582+
<Val><![CDATA[Ceci est la déclaration augmentée. Pensez à déplacer la déclaration d'augmentation dans le même fichier.]]></Val>
10583+
</Tgt>
1056910584
</Str>
1057010585
<Disp Icon="Str" />
1057110586
</Item>

‎src/loc/lcl/ita/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3645,6 +3645,9 @@
36453645
<Item ItemId=";Declaration_augments_declaration_in_another_file_This_cannot_be_serialized_6232" ItemType="0" PsrId="306" Leaf="true">
36463646
<Str Cat="Text">
36473647
<Val><![CDATA[Declaration augments declaration in another file. This cannot be serialized.]]></Val>
3648+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3649+
<Val><![CDATA[La dichiarazione causa un aumento della dichiarazione in un altro file. Questa condizione non è serializzabile.]]></Val>
3650+
</Tgt>
36483651
</Str>
36493652
<Disp Icon="Str" />
36503653
</Item>
@@ -7458,12 +7461,18 @@
74587461
<Item ItemId=";Parameter_0_cannot_reference_identifier_1_declared_after_it_2373" ItemType="0" PsrId="306" Leaf="true">
74597462
<Str Cat="Text">
74607463
<Val><![CDATA[Parameter '{0}' cannot reference identifier '{1}' declared after it.]]></Val>
7464+
<Tgt Cat="Text" Stat="Loc" Orig="New">
7465+
<Val><![CDATA[Il parametro '{0}' non può fare riferimento all'identificatore '{1}' dichiarato dopo di esso.]]></Val>
7466+
</Tgt>
74617467
</Str>
74627468
<Disp Icon="Str" />
74637469
</Item>
74647470
<Item ItemId=";Parameter_0_cannot_reference_itself_2372" ItemType="0" PsrId="306" Leaf="true">
74657471
<Str Cat="Text">
74667472
<Val><![CDATA[Parameter '{0}' cannot reference itself.]]></Val>
7473+
<Tgt Cat="Text" Stat="Loc" Orig="New">
7474+
<Val><![CDATA[Il parametro '{0}' non può fare riferimento a se stesso.]]></Val>
7475+
</Tgt>
74677476
</Str>
74687477
<Disp Icon="Str" />
74697478
</Item>
@@ -10200,6 +10209,9 @@
1020010209
<Item ItemId=";The_operand_of_a_delete_operator_must_be_optional_2790" ItemType="0" PsrId="306" Leaf="true">
1020110210
<Str Cat="Text">
1020210211
<Val><![CDATA[The operand of a 'delete' operator must be optional.]]></Val>
10212+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10213+
<Val><![CDATA[L'operando di un operatore 'delete' deve essere facoltativo.]]></Val>
10214+
</Tgt>
1020310215
</Str>
1020410216
<Disp Icon="Str" />
1020510217
</Item>
@@ -10554,6 +10566,9 @@
1055410566
<Item ItemId=";This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_fil_6233" ItemType="0" PsrId="306" Leaf="true">
1055510567
<Str Cat="Text">
1055610568
<Val><![CDATA[This is the declaration being augmented. Consider moving the augmenting declaration into the same file.]]></Val>
10569+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10570+
<Val><![CDATA[Questa è la dichiarazione che verrà aumentata. Provare a spostare la dichiarazione che causa l'aumento nello stesso file.]]></Val>
10571+
</Tgt>
1055710572
</Str>
1055810573
<Disp Icon="Str" />
1055910574
</Item>

‎src/loc/lcl/jpn/diagnosticMessages/diagnosticMessages.generated.json.lcl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10209,6 +10209,9 @@
1020910209
<Item ItemId=";The_operand_of_a_delete_operator_must_be_optional_2790" ItemType="0" PsrId="306" Leaf="true">
1021010210
<Str Cat="Text">
1021110211
<Val><![CDATA[The operand of a 'delete' operator must be optional.]]></Val>
10212+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10213+
<Val><![CDATA['delete' 演算子のオペランドはオプションである必要があります。]]></Val>
10214+
</Tgt>
1021210215
</Str>
1021310216
<Disp Icon="Str" />
1021410217
</Item>
@@ -10564,7 +10567,7 @@
1056410567
<Str Cat="Text">
1056510568
<Val><![CDATA[This is the declaration being augmented. Consider moving the augmenting declaration into the same file.]]></Val>
1056610569
<Tgt Cat="Text" Stat="Loc" Orig="New">
10567-
<Val><![CDATA[これは拡張されている宣言です。拡張宣言を同じファイルに移動することを検討してください。]]></Val>
10570+
<Val><![CDATA[これは拡張される宣言です。拡張する側の宣言を同じファイルに移動することを検討してください。]]></Val>
1056810571
</Tgt>
1056910572
</Str>
1057010573
<Disp Icon="Str" />

0 commit comments

Comments
 (0)