Skip to content

Commit 22c59ec

Browse files
rbucktonrbuckton
committed
Merge branch 'main' into mergeDecoratorsAndModifiers
2 parents 1cf55ef + ce85d64 commit 22c59ec

File tree

41 files changed

+757
-81
lines changed

Some content is hidden

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

41 files changed

+757
-81
lines changed

‎package-lock.json‎

Lines changed: 28 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/compiler/checker.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12255,9 +12255,9 @@ namespace ts {
1225512255
t.flags & TypeFlags.Intersection ? getApparentTypeOfIntersectionType(t as IntersectionType) :
1225612256
t.flags & TypeFlags.StringLike ? globalStringType :
1225712257
t.flags & TypeFlags.NumberLike ? globalNumberType :
12258-
t.flags & TypeFlags.BigIntLike ? getGlobalBigIntType(/*reportErrors*/ languageVersion >= ScriptTarget.ES2020) :
12258+
t.flags & TypeFlags.BigIntLike ? getGlobalBigIntType() :
1225912259
t.flags & TypeFlags.BooleanLike ? globalBooleanType :
12260-
t.flags & TypeFlags.ESSymbolLike ? getGlobalESSymbolType(/*reportErrors*/ languageVersion >= ScriptTarget.ES2015) :
12260+
t.flags & TypeFlags.ESSymbolLike ? getGlobalESSymbolType() :
1226112261
t.flags & TypeFlags.NonPrimitive ? emptyObjectType :
1226212262
t.flags & TypeFlags.Index ? keyofConstraintType :
1226312263
t.flags & TypeFlags.Unknown && !strictNullChecks ? emptyObjectType :
@@ -13983,8 +13983,8 @@ namespace ts {
1398313983
return deferredGlobalESSymbolConstructorTypeSymbol ||= getGlobalTypeSymbol("SymbolConstructor" as __String, reportErrors);
1398413984
}
1398513985

13986-
function getGlobalESSymbolType(reportErrors: boolean) {
13987-
return (deferredGlobalESSymbolType ||= getGlobalType("Symbol" as __String, /*arity*/ 0, reportErrors)) || emptyObjectType;
13986+
function getGlobalESSymbolType() {
13987+
return (deferredGlobalESSymbolType ||= getGlobalType("Symbol" as __String, /*arity*/ 0, /*reportErrors*/ false)) || emptyObjectType;
1398813988
}
1398913989

1399013990
function getGlobalPromiseType(reportErrors: boolean) {
@@ -14066,8 +14066,8 @@ namespace ts {
1406614066
return deferredGlobalAwaitedSymbol === unknownSymbol ? undefined : deferredGlobalAwaitedSymbol;
1406714067
}
1406814068

14069-
function getGlobalBigIntType(reportErrors: boolean) {
14070-
return (deferredGlobalBigIntType ||= getGlobalType("BigInt" as __String, /*arity*/ 0, reportErrors)) || emptyObjectType;
14069+
function getGlobalBigIntType() {
14070+
return (deferredGlobalBigIntType ||= getGlobalType("BigInt" as __String, /*arity*/ 0, /*reportErrors*/ false)) || emptyObjectType;
1407114071
}
1407214072

1407314073
/**
@@ -18510,7 +18510,7 @@ namespace ts {
1851018510
if ((globalStringType === source && stringType === target) ||
1851118511
(globalNumberType === source && numberType === target) ||
1851218512
(globalBooleanType === source && booleanType === target) ||
18513-
(getGlobalESSymbolType(/*reportErrors*/ false) === source && esSymbolType === target)) {
18513+
(getGlobalESSymbolType() === source && esSymbolType === target)) {
1851418514
reportError(Diagnostics._0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible, targetType, sourceType);
1851518515
}
1851618516
}

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3519,6 +3519,24 @@
35193519
</Str>
35203520
<Disp Icon="Str" />
35213521
</Item>
3522+
<Item ItemId=";Class_constructor_may_not_be_a_generator_1360" ItemType="0" PsrId="306" Leaf="true">
3523+
<Str Cat="Text">
3524+
<Val><![CDATA[Class constructor may not be a generator.]]></Val>
3525+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3526+
<Val><![CDATA[类构造函数可能不是生成器。]]></Val>
3527+
</Tgt>
3528+
</Str>
3529+
<Disp Icon="Str" />
3530+
</Item>
3531+
<Item ItemId=";Class_constructor_may_not_be_an_accessor_1341" ItemType="0" PsrId="306" Leaf="true">
3532+
<Str Cat="Text">
3533+
<Val><![CDATA[Class constructor may not be an accessor.]]></Val>
3534+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3535+
<Val><![CDATA[类构造函数可能不是访问器。]]></Val>
3536+
</Tgt>
3537+
</Str>
3538+
<Disp Icon="Str" />
3539+
</Item>
35223540
<Item ItemId=";Class_declaration_cannot_implement_overload_list_for_0_2813" ItemType="0" PsrId="306" Leaf="true">
35233541
<Str Cat="Text">
35243542
<Val><![CDATA[Class declaration cannot implement overload list for '{0}'.]]></Val>
@@ -13488,6 +13506,15 @@
1348813506
</Str>
1348913507
<Disp Icon="Str" />
1349013508
</Item>
13509+
<Item ItemId=";This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839" ItemType="0" PsrId="306" Leaf="true">
13510+
<Str Cat="Text">
13511+
<Val><![CDATA[This condition will always return '{0}' since JavaScript compares objects by reference, not value.]]></Val>
13512+
<Tgt Cat="Text" Stat="Loc" Orig="New">
13513+
<Val><![CDATA[此条件将始终返回“{0}”，因为 JavaScript 按引用而不是值比较对象。]]></Val>
13514+
</Tgt>
13515+
</Str>
13516+
<Disp Icon="Str" />
13517+
</Item>
1349113518
<Item ItemId=";This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap_2367" ItemType="0" PsrId="306" Leaf="true">
1349213519
<Str Cat="Text">
1349313520
<Val><![CDATA[This condition will always return '{0}' since the types '{1}' and '{2}' have no overlap.]]></Val>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3519,6 +3519,24 @@
35193519
</Str>
35203520
<Disp Icon="Str" />
35213521
</Item>
3522+
<Item ItemId=";Class_constructor_may_not_be_a_generator_1360" ItemType="0" PsrId="306" Leaf="true">
3523+
<Str Cat="Text">
3524+
<Val><![CDATA[Class constructor may not be a generator.]]></Val>
3525+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3526+
<Val><![CDATA[類別建構函式可能不是產生器。]]></Val>
3527+
</Tgt>
3528+
</Str>
3529+
<Disp Icon="Str" />
3530+
</Item>
3531+
<Item ItemId=";Class_constructor_may_not_be_an_accessor_1341" ItemType="0" PsrId="306" Leaf="true">
3532+
<Str Cat="Text">
3533+
<Val><![CDATA[Class constructor may not be an accessor.]]></Val>
3534+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3535+
<Val><![CDATA[類別建構函式可能不是存取子。]]></Val>
3536+
</Tgt>
3537+
</Str>
3538+
<Disp Icon="Str" />
3539+
</Item>
35223540
<Item ItemId=";Class_declaration_cannot_implement_overload_list_for_0_2813" ItemType="0" PsrId="306" Leaf="true">
35233541
<Str Cat="Text">
35243542
<Val><![CDATA[Class declaration cannot implement overload list for '{0}'.]]></Val>
@@ -13488,6 +13506,15 @@
1348813506
</Str>
1348913507
<Disp Icon="Str" />
1349013508
</Item>
13509+
<Item ItemId=";This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839" ItemType="0" PsrId="306" Leaf="true">
13510+
<Str Cat="Text">
13511+
<Val><![CDATA[This condition will always return '{0}' since JavaScript compares objects by reference, not value.]]></Val>
13512+
<Tgt Cat="Text" Stat="Loc" Orig="New">
13513+
<Val><![CDATA[此條件一律會傳回 '{0}'，因為 JavaScript 會依參照而非值比較物件。]]></Val>
13514+
</Tgt>
13515+
</Str>
13516+
<Disp Icon="Str" />
13517+
</Item>
1349113518
<Item ItemId=";This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap_2367" ItemType="0" PsrId="306" Leaf="true">
1349213519
<Str Cat="Text">
1349313520
<Val><![CDATA[This condition will always return '{0}' since the types '{1}' and '{2}' have no overlap.]]></Val>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3528,6 +3528,24 @@
35283528
</Str>
35293529
<Disp Icon="Str" />
35303530
</Item>
3531+
<Item ItemId=";Class_constructor_may_not_be_a_generator_1360" ItemType="0" PsrId="306" Leaf="true">
3532+
<Str Cat="Text">
3533+
<Val><![CDATA[Class constructor may not be a generator.]]></Val>
3534+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3535+
<Val><![CDATA[Konstruktor třídy nemůže být generátor.]]></Val>
3536+
</Tgt>
3537+
</Str>
3538+
<Disp Icon="Str" />
3539+
</Item>
3540+
<Item ItemId=";Class_constructor_may_not_be_an_accessor_1341" ItemType="0" PsrId="306" Leaf="true">
3541+
<Str Cat="Text">
3542+
<Val><![CDATA[Class constructor may not be an accessor.]]></Val>
3543+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3544+
<Val><![CDATA[Konstruktor třídy nemůže být přístupový objekt.]]></Val>
3545+
</Tgt>
3546+
</Str>
3547+
<Disp Icon="Str" />
3548+
</Item>
35313549
<Item ItemId=";Class_declaration_cannot_implement_overload_list_for_0_2813" ItemType="0" PsrId="306" Leaf="true">
35323550
<Str Cat="Text">
35333551
<Val><![CDATA[Class declaration cannot implement overload list for '{0}'.]]></Val>
@@ -13497,6 +13515,15 @@
1349713515
</Str>
1349813516
<Disp Icon="Str" />
1349913517
</Item>
13518+
<Item ItemId=";This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839" ItemType="0" PsrId="306" Leaf="true">
13519+
<Str Cat="Text">
13520+
<Val><![CDATA[This condition will always return '{0}' since JavaScript compares objects by reference, not value.]]></Val>
13521+
<Tgt Cat="Text" Stat="Loc" Orig="New">
13522+
<Val><![CDATA[Tato podmínka vždy vrátí „{0}“, protože JavaScript porovnává objekty pomocí odkazu, nikoli hodnoty.]]></Val>
13523+
</Tgt>
13524+
</Str>
13525+
<Disp Icon="Str" />
13526+
</Item>
1350013527
<Item ItemId=";This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap_2367" ItemType="0" PsrId="306" Leaf="true">
1350113528
<Str Cat="Text">
1350213529
<Val><![CDATA[This condition will always return '{0}' since the types '{1}' and '{2}' have no overlap.]]></Val>

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3516,6 +3516,24 @@
35163516
</Str>
35173517
<Disp Icon="Str" />
35183518
</Item>
3519+
<Item ItemId=";Class_constructor_may_not_be_a_generator_1360" ItemType="0" PsrId="306" Leaf="true">
3520+
<Str Cat="Text">
3521+
<Val><![CDATA[Class constructor may not be a generator.]]></Val>
3522+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3523+
<Val><![CDATA[Der Klassenkonstruktor darf kein Generator sein.]]></Val>
3524+
</Tgt>
3525+
</Str>
3526+
<Disp Icon="Str" />
3527+
</Item>
3528+
<Item ItemId=";Class_constructor_may_not_be_an_accessor_1341" ItemType="0" PsrId="306" Leaf="true">
3529+
<Str Cat="Text">
3530+
<Val><![CDATA[Class constructor may not be an accessor.]]></Val>
3531+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3532+
<Val><![CDATA[Der Klassenkonstruktor darf kein Accessor sein.]]></Val>
3533+
</Tgt>
3534+
</Str>
3535+
<Disp Icon="Str" />
3536+
</Item>
35193537
<Item ItemId=";Class_declaration_cannot_implement_overload_list_for_0_2813" ItemType="0" PsrId="306" Leaf="true">
35203538
<Str Cat="Text">
35213539
<Val><![CDATA[Class declaration cannot implement overload list for '{0}'.]]></Val>
@@ -13482,6 +13500,15 @@
1348213500
</Str>
1348313501
<Disp Icon="Str" />
1348413502
</Item>
13503+
<Item ItemId=";This_condition_will_always_return_0_since_JavaScript_compares_objects_by_reference_not_value_2839" ItemType="0" PsrId="306" Leaf="true">
13504+
<Str Cat="Text">
13505+
<Val><![CDATA[This condition will always return '{0}' since JavaScript compares objects by reference, not value.]]></Val>
13506+
<Tgt Cat="Text" Stat="Loc" Orig="New">
13507+
<Val><![CDATA[Diese Bedingung gibt immer „{0}“ zurück, da JavaScript Objekte nach Verweis und nicht nach Wert vergleicht.]]></Val>
13508+
</Tgt>
13509+
</Str>
13510+
<Disp Icon="Str" />
13511+
</Item>
1348513512
<Item ItemId=";This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap_2367" ItemType="0" PsrId="306" Leaf="true">
1348613513
<Str Cat="Text">
1348713514
<Val><![CDATA[This condition will always return '{0}' since the types '{1}' and '{2}' have no overlap.]]></Val>
@@ -16416,6 +16443,15 @@
1641616443
</Str>
1641716444
<Disp Icon="Str" />
1641816445
</Item>
16446+
<Item ItemId=";or_JSX_element_expected_1145" ItemType="0" PsrId="306" Leaf="true">
16447+
<Str Cat="Text">
16448+
<Val><![CDATA['{' or JSX element expected.]]></Val>
16449+
<Tgt Cat="Text" Stat="Loc" Orig="New">
16450+
<Val><![CDATA['{' oder JSX-Element erwartet.]]></Val>
16451+
</Tgt>
16452+
</Str>
16453+
<Disp Icon="Str" />
16454+
</Item>
1641916455
<Item ItemId=";or_expected_1144" ItemType="0" PsrId="306" Leaf="true">
1642016456
<Str Cat="Text">
1642116457
<Val><![CDATA['{' or ';' expected.]]></Val>

0 commit comments

Comments
 (0)