Skip to content

Commit 4163fc7

Browse files
jeffy-gjeffy-g
committed
Merge branch 'master' of https://github.com/microsoft/TypeScript into completions_fix-broken-regex
2 parents 8a28986 + a1c8608 commit 4163fc7

26 files changed

+806
-412
lines changed

‎src/compiler/emitter.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4296,7 +4296,7 @@ namespace ts {
42964296
// JsxText will be written with its leading whitespace, so don't add more manually.
42974297
return 0;
42984298
}
4299-
if (!positionIsSynthesized(parentNode.pos) && !nodeIsSynthesized(firstChild) && firstChild.parent === parentNode) {
4299+
if (!positionIsSynthesized(parentNode.pos) && !nodeIsSynthesized(firstChild) && (!firstChild.parent || firstChild.parent === parentNode)) {
43004300
if (preserveSourceNewlines) {
43014301
return getEffectiveLines(
43024302
includeComments => getLinesBetweenPositionAndPrecedingNonWhitespaceCharacter(
@@ -4353,7 +4353,7 @@ namespace ts {
43534353
if (lastChild === undefined) {
43544354
return rangeIsOnSingleLine(parentNode, currentSourceFile!) ? 0 : 1;
43554355
}
4356-
if (!positionIsSynthesized(parentNode.pos) && !nodeIsSynthesized(lastChild) && lastChild.parent === parentNode) {
4356+
if (!positionIsSynthesized(parentNode.pos) && !nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) {
43574357
if (preserveSourceNewlines) {
43584358
return getEffectiveLines(
43594359
includeComments => getLinesBetweenPositionAndNextNonWhitespaceCharacter(

‎src/lib/dom.generated.d.ts‎

Lines changed: 0 additions & 158 deletions
Large diffs are not rendered by default.

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,9 @@
10981098
<Item ItemId=";Add_class_tag_95102" ItemType="0" PsrId="306" Leaf="true">
10991099
<Str Cat="Text">
11001100
<Val><![CDATA[Add '@class' tag]]></Val>
1101+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1102+
<Val><![CDATA[添加“@类”标记]]></Val>
1103+
</Tgt>
11011104
</Str>
11021105
<Disp Icon="Str" />
11031106
</Item>
@@ -1281,12 +1284,18 @@
12811284
<Item ItemId=";Add_this_parameter_95104" ItemType="0" PsrId="306" Leaf="true">
12821285
<Str Cat="Text">
12831286
<Val><![CDATA[Add 'this' parameter.]]></Val>
1287+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1288+
<Val><![CDATA[添加“此”参数。]]></Val>
1289+
</Tgt>
12841290
</Str>
12851291
<Disp Icon="Str" />
12861292
</Item>
12871293
<Item ItemId=";Add_this_tag_95103" ItemType="0" PsrId="306" Leaf="true">
12881294
<Str Cat="Text">
12891295
<Val><![CDATA[Add '@this' tag]]></Val>
1296+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1297+
<Val><![CDATA[添加“@此”标记]]></Val>
1298+
</Tgt>
12901299
</Str>
12911300
<Disp Icon="Str" />
12921301
</Item>
@@ -3318,6 +3327,9 @@
33183327
<Item ItemId=";Convert_all_invalid_characters_to_HTML_entity_code_95101" ItemType="0" PsrId="306" Leaf="true">
33193328
<Str Cat="Text">
33203329
<Val><![CDATA[Convert all invalid characters to HTML entity code]]></Val>
3330+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3331+
<Val><![CDATA[将所有无效字符转换为 HTML 实体代码]]></Val>
3332+
</Tgt>
33213333
</Str>
33223334
<Disp Icon="Str" />
33233335
</Item>
@@ -3396,12 +3408,18 @@
33963408
<Item ItemId=";Convert_function_declaration_0_to_arrow_function_95106" ItemType="0" PsrId="306" Leaf="true">
33973409
<Str Cat="Text">
33983410
<Val><![CDATA[Convert function declaration '{0}' to arrow function]]></Val>
3411+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3412+
<Val><![CDATA[将函数声明“{0}”转换为箭头函数]]></Val>
3413+
</Tgt>
33993414
</Str>
34003415
<Disp Icon="Str" />
34013416
</Item>
34023417
<Item ItemId=";Convert_function_expression_0_to_arrow_function_95105" ItemType="0" PsrId="306" Leaf="true">
34033418
<Str Cat="Text">
34043419
<Val><![CDATA[Convert function expression '{0}' to arrow function]]></Val>
3420+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3421+
<Val><![CDATA[将函数表达式 "{0}" 转换为箭头函数]]></Val>
3422+
</Tgt>
34053423
</Str>
34063424
<Disp Icon="Str" />
34073425
</Item>
@@ -3552,6 +3570,9 @@
35523570
<Item ItemId=";Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231" ItemType="0" PsrId="306" Leaf="true">
35533571
<Str Cat="Text">
35543572
<Val><![CDATA[Could not resolve the path '{0}' with the extensions: {1}.]]></Val>
3573+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3574+
<Val><![CDATA[无法解析具有表达式的路径“{0}”: {1}。]]></Val>
3575+
</Tgt>
35553576
</Str>
35563577
<Disp Icon="Str" />
35573578
</Item>
@@ -5070,6 +5091,9 @@
50705091
<Item ItemId=";Fix_all_implicit_this_errors_95107" ItemType="0" PsrId="306" Leaf="true">
50715092
<Str Cat="Text">
50725093
<Val><![CDATA[Fix all implicit-'this' errors]]></Val>
5094+
<Tgt Cat="Text" Stat="Loc" Orig="New">
5095+
<Val><![CDATA[修复所有 implicit-'this' 错误]]></Val>
5096+
</Tgt>
50735097
</Str>
50745098
<Disp Icon="Str" />
50755099
</Item>
@@ -10461,6 +10485,9 @@
1046110485
<Item ItemId=";This_spread_always_overwrites_this_property_2785" ItemType="0" PsrId="306" Leaf="true">
1046210486
<Str Cat="Text">
1046310487
<Val><![CDATA[This spread always overwrites this property.]]></Val>
10488+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10489+
<Val><![CDATA[此扩张将始终覆盖此属性。]]></Val>
10490+
</Tgt>
1046410491
</Str>
1046510492
<Disp Icon="Str" />
1046610493
</Item>
@@ -11676,6 +11703,9 @@
1167611703
<Item ItemId=";Wrap_all_invalid_characters_in_an_expression_container_95109" ItemType="0" PsrId="306" Leaf="true">
1167711704
<Str Cat="Text">
1167811705
<Val><![CDATA[Wrap all invalid characters in an expression container]]></Val>
11706+
<Tgt Cat="Text" Stat="Loc" Orig="New">
11707+
<Val><![CDATA[包装表达式容器中的所有无效字符]]></Val>
11708+
</Tgt>
1167911709
</Str>
1168011710
<Disp Icon="Str" />
1168111711
</Item>
@@ -12339,6 +12369,9 @@
1233912369
<Item ItemId=";constructor_cannot_be_used_as_a_parameter_property_name_2398" ItemType="0" PsrId="306" Leaf="true">
1234012370
<Str Cat="Text">
1234112371
<Val><![CDATA['constructor' cannot be used as a parameter property name.]]></Val>
12372+
<Tgt Cat="Text" Stat="Loc" Orig="New">
12373+
<Val><![CDATA[“构造函数”不能用作参数属性名称。]]></Val>
12374+
</Tgt>
1234212375
</Str>
1234312376
<Disp Icon="Str" />
1234412377
</Item>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,9 @@
10981098
<Item ItemId=";Add_class_tag_95102" ItemType="0" PsrId="306" Leaf="true">
10991099
<Str Cat="Text">
11001100
<Val><![CDATA[Add '@class' tag]]></Val>
1101+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1102+
<Val><![CDATA[新增 '@class' 標籤]]></Val>
1103+
</Tgt>
11011104
</Str>
11021105
<Disp Icon="Str" />
11031106
</Item>
@@ -1281,12 +1284,18 @@
12811284
<Item ItemId=";Add_this_parameter_95104" ItemType="0" PsrId="306" Leaf="true">
12821285
<Str Cat="Text">
12831286
<Val><![CDATA[Add 'this' parameter.]]></Val>
1287+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1288+
<Val><![CDATA[新增 'this' 參數。]]></Val>
1289+
</Tgt>
12841290
</Str>
12851291
<Disp Icon="Str" />
12861292
</Item>
12871293
<Item ItemId=";Add_this_tag_95103" ItemType="0" PsrId="306" Leaf="true">
12881294
<Str Cat="Text">
12891295
<Val><![CDATA[Add '@this' tag]]></Val>
1296+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1297+
<Val><![CDATA[新增 '@this' 標籤]]></Val>
1298+
</Tgt>
12901299
</Str>
12911300
<Disp Icon="Str" />
12921301
</Item>
@@ -3318,6 +3327,9 @@
33183327
<Item ItemId=";Convert_all_invalid_characters_to_HTML_entity_code_95101" ItemType="0" PsrId="306" Leaf="true">
33193328
<Str Cat="Text">
33203329
<Val><![CDATA[Convert all invalid characters to HTML entity code]]></Val>
3330+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3331+
<Val><![CDATA[將所有無效字元轉換為 HTML 實體代碼]]></Val>
3332+
</Tgt>
33213333
</Str>
33223334
<Disp Icon="Str" />
33233335
</Item>
@@ -3396,12 +3408,18 @@
33963408
<Item ItemId=";Convert_function_declaration_0_to_arrow_function_95106" ItemType="0" PsrId="306" Leaf="true">
33973409
<Str Cat="Text">
33983410
<Val><![CDATA[Convert function declaration '{0}' to arrow function]]></Val>
3411+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3412+
<Val><![CDATA[將函式宣告 '{0}' 轉換為箭號函式]]></Val>
3413+
</Tgt>
33993414
</Str>
34003415
<Disp Icon="Str" />
34013416
</Item>
34023417
<Item ItemId=";Convert_function_expression_0_to_arrow_function_95105" ItemType="0" PsrId="306" Leaf="true">
34033418
<Str Cat="Text">
34043419
<Val><![CDATA[Convert function expression '{0}' to arrow function]]></Val>
3420+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3421+
<Val><![CDATA[將函式運算式 '{0}' 轉換為箭號函式]]></Val>
3422+
</Tgt>
34053423
</Str>
34063424
<Disp Icon="Str" />
34073425
</Item>
@@ -3552,6 +3570,9 @@
35523570
<Item ItemId=";Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231" ItemType="0" PsrId="306" Leaf="true">
35533571
<Str Cat="Text">
35543572
<Val><![CDATA[Could not resolve the path '{0}' with the extensions: {1}.]]></Val>
3573+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3574+
<Val><![CDATA[無法解析具有下列延伸模組的路徑 '{0}': {1}。]]></Val>
3575+
</Tgt>
35553576
</Str>
35563577
<Disp Icon="Str" />
35573578
</Item>
@@ -5070,6 +5091,9 @@
50705091
<Item ItemId=";Fix_all_implicit_this_errors_95107" ItemType="0" PsrId="306" Leaf="true">
50715092
<Str Cat="Text">
50725093
<Val><![CDATA[Fix all implicit-'this' errors]]></Val>
5094+
<Tgt Cat="Text" Stat="Loc" Orig="New">
5095+
<Val><![CDATA[修正所有隱含 'this' 的錯誤]]></Val>
5096+
</Tgt>
50735097
</Str>
50745098
<Disp Icon="Str" />
50755099
</Item>
@@ -10461,6 +10485,9 @@
1046110485
<Item ItemId=";This_spread_always_overwrites_this_property_2785" ItemType="0" PsrId="306" Leaf="true">
1046210486
<Str Cat="Text">
1046310487
<Val><![CDATA[This spread always overwrites this property.]]></Val>
10488+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10489+
<Val><![CDATA[此展開會永遠覆寫此屬性。]]></Val>
10490+
</Tgt>
1046410491
</Str>
1046510492
<Disp Icon="Str" />
1046610493
</Item>
@@ -11676,6 +11703,9 @@
1167611703
<Item ItemId=";Wrap_all_invalid_characters_in_an_expression_container_95109" ItemType="0" PsrId="306" Leaf="true">
1167711704
<Str Cat="Text">
1167811705
<Val><![CDATA[Wrap all invalid characters in an expression container]]></Val>
11706+
<Tgt Cat="Text" Stat="Loc" Orig="New">
11707+
<Val><![CDATA[將所有無效字元包裝在運算式容器中]]></Val>
11708+
</Tgt>
1167911709
</Str>
1168011710
<Disp Icon="Str" />
1168111711
</Item>
@@ -12339,6 +12369,9 @@
1233912369
<Item ItemId=";constructor_cannot_be_used_as_a_parameter_property_name_2398" ItemType="0" PsrId="306" Leaf="true">
1234012370
<Str Cat="Text">
1234112371
<Val><![CDATA['constructor' cannot be used as a parameter property name.]]></Val>
12372+
<Tgt Cat="Text" Stat="Loc" Orig="New">
12373+
<Val><![CDATA['constructor' 不能作為參數屬性名稱使用。]]></Val>
12374+
</Tgt>
1234212375
</Str>
1234312376
<Disp Icon="Str" />
1234412377
</Item>

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,6 +1107,9 @@
11071107
<Item ItemId=";Add_class_tag_95102" ItemType="0" PsrId="306" Leaf="true">
11081108
<Str Cat="Text">
11091109
<Val><![CDATA[Add '@class' tag]]></Val>
1110+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1111+
<Val><![CDATA[Agregar la etiqueta "@class"]]></Val>
1112+
</Tgt>
11101113
</Str>
11111114
<Disp Icon="Str" />
11121115
</Item>
@@ -1293,12 +1296,18 @@
12931296
<Item ItemId=";Add_this_parameter_95104" ItemType="0" PsrId="306" Leaf="true">
12941297
<Str Cat="Text">
12951298
<Val><![CDATA[Add 'this' parameter.]]></Val>
1299+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1300+
<Val><![CDATA[Agregue el parámetro "this".]]></Val>
1301+
</Tgt>
12961302
</Str>
12971303
<Disp Icon="Str" />
12981304
</Item>
12991305
<Item ItemId=";Add_this_tag_95103" ItemType="0" PsrId="306" Leaf="true">
13001306
<Str Cat="Text">
13011307
<Val><![CDATA[Add '@this' tag]]></Val>
1308+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1309+
<Val><![CDATA[Agregar la etiqueta "@this"]]></Val>
1310+
</Tgt>
13021311
</Str>
13031312
<Disp Icon="Str" />
13041313
</Item>
@@ -3330,6 +3339,9 @@
33303339
<Item ItemId=";Convert_all_invalid_characters_to_HTML_entity_code_95101" ItemType="0" PsrId="306" Leaf="true">
33313340
<Str Cat="Text">
33323341
<Val><![CDATA[Convert all invalid characters to HTML entity code]]></Val>
3342+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3343+
<Val><![CDATA[Convertir todos los caracteres no válidos al código de entidad HTML]]></Val>
3344+
</Tgt>
33333345
</Str>
33343346
<Disp Icon="Str" />
33353347
</Item>
@@ -3408,12 +3420,18 @@
34083420
<Item ItemId=";Convert_function_declaration_0_to_arrow_function_95106" ItemType="0" PsrId="306" Leaf="true">
34093421
<Str Cat="Text">
34103422
<Val><![CDATA[Convert function declaration '{0}' to arrow function]]></Val>
3423+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3424+
<Val><![CDATA[Convertir la declaración de función "{0}" en función de flecha]]></Val>
3425+
</Tgt>
34113426
</Str>
34123427
<Disp Icon="Str" />
34133428
</Item>
34143429
<Item ItemId=";Convert_function_expression_0_to_arrow_function_95105" ItemType="0" PsrId="306" Leaf="true">
34153430
<Str Cat="Text">
34163431
<Val><![CDATA[Convert function expression '{0}' to arrow function]]></Val>
3432+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3433+
<Val><![CDATA[Convertir la expresión de función "{0}" en función de flecha]]></Val>
3434+
</Tgt>
34173435
</Str>
34183436
<Disp Icon="Str" />
34193437
</Item>
@@ -3564,6 +3582,9 @@
35643582
<Item ItemId=";Could_not_resolve_the_path_0_with_the_extensions_Colon_1_6231" ItemType="0" PsrId="306" Leaf="true">
35653583
<Str Cat="Text">
35663584
<Val><![CDATA[Could not resolve the path '{0}' with the extensions: {1}.]]></Val>
3585+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3586+
<Val><![CDATA[No se pudo resolver la ruta de acceso "{0}" con las extensiones: {1}.]]></Val>
3587+
</Tgt>
35673588
</Str>
35683589
<Disp Icon="Str" />
35693590
</Item>
@@ -5082,6 +5103,9 @@
50825103
<Item ItemId=";Fix_all_implicit_this_errors_95107" ItemType="0" PsrId="306" Leaf="true">
50835104
<Str Cat="Text">
50845105
<Val><![CDATA[Fix all implicit-'this' errors]]></Val>
5106+
<Tgt Cat="Text" Stat="Loc" Orig="New">
5107+
<Val><![CDATA[Corregir todos los errores de "this" implícitos]]></Val>
5108+
</Tgt>
50855109
</Str>
50865110
<Disp Icon="Str" />
50875111
</Item>
@@ -10473,6 +10497,9 @@
1047310497
<Item ItemId=";This_spread_always_overwrites_this_property_2785" ItemType="0" PsrId="306" Leaf="true">
1047410498
<Str Cat="Text">
1047510499
<Val><![CDATA[This spread always overwrites this property.]]></Val>
10500+
<Tgt Cat="Text" Stat="Loc" Orig="New">
10501+
<Val><![CDATA[Este elemento de propagación siempre sobrescribe esta propiedad.]]></Val>
10502+
</Tgt>
1047610503
</Str>
1047710504
<Disp Icon="Str" />
1047810505
</Item>
@@ -11688,6 +11715,9 @@
1168811715
<Item ItemId=";Wrap_all_invalid_characters_in_an_expression_container_95109" ItemType="0" PsrId="306" Leaf="true">
1168911716
<Str Cat="Text">
1169011717
<Val><![CDATA[Wrap all invalid characters in an expression container]]></Val>
11718+
<Tgt Cat="Text" Stat="Loc" Orig="New">
11719+
<Val><![CDATA[Encapsular todos los caracteres no válidos en un contenedor de expresiones]]></Val>
11720+
</Tgt>
1169111721
</Str>
1169211722
<Disp Icon="Str" />
1169311723
</Item>
@@ -12351,6 +12381,9 @@
1235112381
<Item ItemId=";constructor_cannot_be_used_as_a_parameter_property_name_2398" ItemType="0" PsrId="306" Leaf="true">
1235212382
<Str Cat="Text">
1235312383
<Val><![CDATA['constructor' cannot be used as a parameter property name.]]></Val>
12384+
<Tgt Cat="Text" Stat="Loc" Orig="New">
12385+
<Val><![CDATA[El elemento "constructor" no se puede usar como nombre de propiedad de parámetro.]]></Val>
12386+
</Tgt>
1235412387
</Str>
1235512388
<Disp Icon="Str" />
1235612389
</Item>

0 commit comments

Comments
 (0)