Skip to content

Commit 508226e

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into serverModeRename
2 parents e8d798d + 7f4e1b6 commit 508226e

27 files changed

+726
-16
lines changed

‎.github/workflows/update-lkg.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Update LKG
2+
3+
on:
4+
workflow_dispatch: {}
5+
6+
jobs:
7+
build:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v2
12+
- name: Use node version 12
13+
uses: actions/setup-node@v1
14+
with:
15+
node-version: 12
16+
registry-url: https://registry.npmjs.org/
17+
18+
- name: Configure Git and Update LKG
19+
run: |
20+
git config user.email "[email protected]"
21+
git config user.name "TypeScript Bot"
22+
npm install
23+
gulp LKG
24+
npm test
25+
git diff
26+
git add ./lib
27+
git commit -m "Update LKG"
28+
git push

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "typescript",
33
"author": "Microsoft Corp.",
44
"homepage": "https://www.typescriptlang.org/",
5-
"version": "4.0.0",
5+
"version": "4.1.0",
66
"license": "Apache-2.0",
77
"description": "TypeScript is a language for application scale JavaScript development",
88
"keywords": [

‎src/compiler/corePublic.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace ts {
22
// WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values.
33
// If changing the text in this section, be sure to test `configurePrerelease` too.
4-
export const versionMajorMinor = "4.0";
4+
export const versionMajorMinor = "4.1";
55
/** The version of the TypeScript compiler release */
66
export const version = `${versionMajorMinor}.0-dev`;
77

‎src/compiler/parser.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7217,7 +7217,8 @@ namespace ts {
72177217
let state = JSDocState.SawAsterisk;
72187218
let margin: number | undefined;
72197219
// + 4 for leading '/** '
7220-
let indent = start - Math.max(content.lastIndexOf("\n", start), 0) + 4;
7220+
// + 1 because the last index of \n is always one index before the first character in the line and coincidentally, if there is no \n before start, it is -1, which is also one index before the first character
7221+
let indent = start - (content.lastIndexOf("\n", start) + 1) + 4;
72217222
function pushComment(text: string) {
72227223
if (!margin) {
72237224
margin = indent;
@@ -7273,7 +7274,7 @@ namespace ts {
72737274
comments.push(whitespace);
72747275
}
72757276
else if (margin !== undefined && indent + whitespace.length > margin) {
7276-
comments.push(whitespace.slice(margin - indent - 1));
7277+
comments.push(whitespace.slice(margin - indent));
72777278
}
72787279
indent += whitespace.length;
72797280
break;

‎src/compiler/resolutionCache.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ namespace ts {
568568
}
569569
else {
570570
resolution.refCount = 1;
571-
Debug.assert(resolution.files === undefined);
571+
Debug.assert(length(resolution.files) === 0); // This resolution shouldnt be referenced by any file yet
572572
if (isExternalModuleNameRelative(name)) {
573573
watchFailedLookupLocationOfResolution(resolution);
574574
}

‎src/lib/es5.d.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,7 +1946,7 @@ interface Int8Array {
19461946
interface Int8ArrayConstructor {
19471947
readonly prototype: Int8Array;
19481948
new(length: number): Int8Array;
1949-
new(array: ArrayLike<number>): Int8Array;
1949+
new(array: ArrayLike<number> | ArrayBufferLike): Int8Array;
19501950
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Int8Array;
19511951

19521952
/**
@@ -2229,7 +2229,7 @@ interface Uint8Array {
22292229
interface Uint8ArrayConstructor {
22302230
readonly prototype: Uint8Array;
22312231
new(length: number): Uint8Array;
2232-
new(array: ArrayLike<number>): Uint8Array;
2232+
new(array: ArrayLike<number> | ArrayBufferLike): Uint8Array;
22332233
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint8Array;
22342234

22352235
/**
@@ -2511,7 +2511,7 @@ interface Uint8ClampedArray {
25112511
interface Uint8ClampedArrayConstructor {
25122512
readonly prototype: Uint8ClampedArray;
25132513
new(length: number): Uint8ClampedArray;
2514-
new(array: ArrayLike<number>): Uint8ClampedArray;
2514+
new(array: ArrayLike<number> | ArrayBufferLike): Uint8ClampedArray;
25152515
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint8ClampedArray;
25162516

25172517
/**
@@ -2791,7 +2791,7 @@ interface Int16Array {
27912791
interface Int16ArrayConstructor {
27922792
readonly prototype: Int16Array;
27932793
new(length: number): Int16Array;
2794-
new(array: ArrayLike<number>): Int16Array;
2794+
new(array: ArrayLike<number> | ArrayBufferLike): Int16Array;
27952795
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Int16Array;
27962796

27972797
/**
@@ -3074,7 +3074,7 @@ interface Uint16Array {
30743074
interface Uint16ArrayConstructor {
30753075
readonly prototype: Uint16Array;
30763076
new(length: number): Uint16Array;
3077-
new(array: ArrayLike<number>): Uint16Array;
3077+
new(array: ArrayLike<number> | ArrayBufferLike): Uint16Array;
30783078
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint16Array;
30793079

30803080
/**
@@ -3356,7 +3356,7 @@ interface Int32Array {
33563356
interface Int32ArrayConstructor {
33573357
readonly prototype: Int32Array;
33583358
new(length: number): Int32Array;
3359-
new(array: ArrayLike<number>): Int32Array;
3359+
new(array: ArrayLike<number> | ArrayBufferLike): Int32Array;
33603360
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Int32Array;
33613361

33623362
/**
@@ -3637,7 +3637,7 @@ interface Uint32Array {
36373637
interface Uint32ArrayConstructor {
36383638
readonly prototype: Uint32Array;
36393639
new(length: number): Uint32Array;
3640-
new(array: ArrayLike<number>): Uint32Array;
3640+
new(array: ArrayLike<number> | ArrayBufferLike): Uint32Array;
36413641
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Uint32Array;
36423642

36433643
/**
@@ -3919,7 +3919,7 @@ interface Float32Array {
39193919
interface Float32ArrayConstructor {
39203920
readonly prototype: Float32Array;
39213921
new(length: number): Float32Array;
3922-
new(array: ArrayLike<number>): Float32Array;
3922+
new(array: ArrayLike<number> | ArrayBufferLike): Float32Array;
39233923
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Float32Array;
39243924

39253925
/**
@@ -4193,7 +4193,7 @@ interface Float64Array {
41934193
interface Float64ArrayConstructor {
41944194
readonly prototype: Float64Array;
41954195
new(length: number): Float64Array;
4196-
new(array: ArrayLike<number>): Float64Array;
4196+
new(array: ArrayLike<number> | ArrayBufferLike): Float64Array;
41974197
new(buffer: ArrayBufferLike, byteOffset?: number, length?: number): Float64Array;
41984198

41994199
/**

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,6 +2169,9 @@
21692169
<Item ItemId=";Arguments_for_the_rest_parameter_0_were_not_provided_6236" ItemType="0" PsrId="306" Leaf="true">
21702170
<Str Cat="Text">
21712171
<Val><![CDATA[Arguments for the rest parameter '{0}' were not provided.]]></Val>
2172+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2173+
<Val><![CDATA[未提供 rest 形参“{0}”的实参。]]></Val>
2174+
</Tgt>
21722175
</Str>
21732176
<Disp Icon="Str" />
21742177
</Item>
@@ -2622,6 +2625,9 @@
26222625
<Item ItemId=";Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_th_2792" ItemType="0" PsrId="306" Leaf="true">
26232626
<Str Cat="Text">
26242627
<Val><![CDATA[Cannot find module '{0}'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?]]></Val>
2628+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2629+
<Val><![CDATA[找不到模块“{0}”。你的意思是要将 "moduleResolution" 选项设置为 "node"，还是要将别名添加到 "paths" 选项中?]]></Val>
2630+
</Tgt>
26252631
</Str>
26262632
<Disp Icon="Str" />
26272633
</Item>

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,6 +2169,9 @@
21692169
<Item ItemId=";Arguments_for_the_rest_parameter_0_were_not_provided_6236" ItemType="0" PsrId="306" Leaf="true">
21702170
<Str Cat="Text">
21712171
<Val><![CDATA[Arguments for the rest parameter '{0}' were not provided.]]></Val>
2172+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2173+
<Val><![CDATA[未提供其餘參數 '{0}' 的引數。]]></Val>
2174+
</Tgt>
21722175
</Str>
21732176
<Disp Icon="Str" />
21742177
</Item>
@@ -2403,6 +2406,9 @@
24032406
<Item ItemId=";Can_only_convert_logical_AND_access_chains_95142" ItemType="0" PsrId="306" Leaf="true">
24042407
<Str Cat="Text">
24052408
<Val><![CDATA[Can only convert logical AND access chains]]></Val>
2409+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2410+
<Val><![CDATA[只可轉換邏輯 AND 存取鏈結]]></Val>
2411+
</Tgt>
24062412
</Str>
24072413
<Disp Icon="Str" />
24082414
</Item>
@@ -2619,6 +2625,9 @@
26192625
<Item ItemId=";Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_th_2792" ItemType="0" PsrId="306" Leaf="true">
26202626
<Str Cat="Text">
26212627
<Val><![CDATA[Cannot find module '{0}'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?]]></Val>
2628+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2629+
<Val><![CDATA[找不到模組 '{0}'。您是要將 'moduleResolution' 選項設為 'node'，或是要將別名新增至 'paths' 選項嗎?]]></Val>
2630+
</Tgt>
26222631
</Str>
26232632
<Disp Icon="Str" />
26242633
</Item>
@@ -3390,12 +3399,18 @@
33903399
<Item ItemId=";Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386" ItemType="0" PsrId="306" Leaf="true">
33913400
<Str Cat="Text">
33923401
<Val><![CDATA[Constructor type notation must be parenthesized when used in a union type.]]></Val>
3402+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3403+
<Val><![CDATA[在等位型別中使用建構函式類型標記法時，必須括以括弧。]]></Val>
3404+
</Tgt>
33933405
</Str>
33943406
<Disp Icon="Str" />
33953407
</Item>
33963408
<Item ItemId=";Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1388" ItemType="0" PsrId="306" Leaf="true">
33973409
<Str Cat="Text">
33983410
<Val><![CDATA[Constructor type notation must be parenthesized when used in an intersection type.]]></Val>
3411+
<Tgt Cat="Text" Stat="Loc" Orig="New">
3412+
<Val><![CDATA[在交集型別中使用建構函式類型標記法時，必須括以括弧。]]></Val>
3413+
</Tgt>
33993414
</Str>
34003415
<Disp Icon="Str" />
34013416
</Item>
@@ -4176,6 +4191,9 @@
41764191
<Item ItemId=";Disable_loading_referenced_projects_6235" ItemType="0" PsrId="306" Leaf="true">
41774192
<Str Cat="Text">
41784193
<Val><![CDATA[Disable loading referenced projects.]]></Val>
4194+
<Tgt Cat="Text" Stat="Loc" Orig="New">
4195+
<Val><![CDATA[停用載入參考的專案。]]></Val>
4196+
</Tgt>
41794197
</Str>
41804198
<Disp Icon="Str" />
41814199
</Item>
@@ -5550,12 +5568,18 @@
55505568
<Item ItemId=";Function_type_notation_must_be_parenthesized_when_used_in_a_union_type_1385" ItemType="0" PsrId="306" Leaf="true">
55515569
<Str Cat="Text">
55525570
<Val><![CDATA[Function type notation must be parenthesized when used in a union type.]]></Val>
5571+
<Tgt Cat="Text" Stat="Loc" Orig="New">
5572+
<Val><![CDATA[在等位型別中使用函式類型標記法時，必須括以括弧。]]></Val>
5573+
</Tgt>
55535574
</Str>
55545575
<Disp Icon="Str" />
55555576
</Item>
55565577
<Item ItemId=";Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387" ItemType="0" PsrId="306" Leaf="true">
55575578
<Str Cat="Text">
55585579
<Val><![CDATA[Function type notation must be parenthesized when used in an intersection type.]]></Val>
5580+
<Tgt Cat="Text" Stat="Loc" Orig="New">
5581+
<Val><![CDATA[在交集型別中使用函式類型標記法時，必須括以括弧。]]></Val>
5582+
</Tgt>
55595583
</Str>
55605584
<Disp Icon="Str" />
55615585
</Item>
@@ -13164,6 +13188,9 @@
1316413188
<Item ItemId=";extends_clause_of_exported_class_has_or_is_using_private_name_0_4021" ItemType="0" PsrId="306" Leaf="true">
1316513189
<Str Cat="Text">
1316613190
<Val><![CDATA['extends' clause of exported class has or is using private name '{0}'.]]></Val>
13191+
<Tgt Cat="Text" Stat="Loc" Orig="New">
13192+
<Val><![CDATA[匯出類別的 'extends' 子句包含或使用了私人名稱 '{0}'。]]></Val>
13193+
</Tgt>
1316713194
</Str>
1316813195
<Disp Icon="Str" />
1316913196
</Item>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2178,6 +2178,9 @@
21782178
<Item ItemId=";Arguments_for_the_rest_parameter_0_were_not_provided_6236" ItemType="0" PsrId="306" Leaf="true">
21792179
<Str Cat="Text">
21802180
<Val><![CDATA[Arguments for the rest parameter '{0}' were not provided.]]></Val>
2181+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2182+
<Val><![CDATA[Nezadaly se argumenty pro parametr rest {0}.]]></Val>
2183+
</Tgt>
21812184
</Str>
21822185
<Disp Icon="Str" />
21832186
</Item>
@@ -2631,6 +2634,9 @@
26312634
<Item ItemId=";Cannot_find_module_0_Did_you_mean_to_set_the_moduleResolution_option_to_node_or_to_add_aliases_to_th_2792" ItemType="0" PsrId="306" Leaf="true">
26322635
<Str Cat="Text">
26332636
<Val><![CDATA[Cannot find module '{0}'. Did you mean to set the 'moduleResolution' option to 'node', or to add aliases to the 'paths' option?]]></Val>
2637+
<Tgt Cat="Text" Stat="Loc" Orig="New">
2638+
<Val><![CDATA[Nepovedlo se najít modul {0}. Nechtěli jste nastavit možnost moduleResolution na node nebo přidat do možnosti paths aliasy?]]></Val>
2639+
</Tgt>
26342640
</Str>
26352641
<Disp Icon="Str" />
26362642
</Item>

0 commit comments

Comments
 (0)