Skip to content

Commit f949c50

Browse files
JsonFreemanJsonFreeman
committed
Merge branch 'master' into typeWriter
Conflicts: src/compiler/types.ts
2 parents a8c2f82 + 840d6d0 commit f949c50

222 files changed

Lines changed: 4531 additions & 7545 deletions

File tree

Some content is hidden

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

‎bin/lib.core.d.ts‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -956,11 +956,24 @@ declare var JSON: JSON;
956956
/////////////////////////////
957957

958958
interface Array<T> {
959+
/**
960+
* Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
961+
*/
962+
length: number;
959963
/**
960964
* Returns a string representation of an array.
961965
*/
962966
toString(): string;
963967
toLocaleString(): string;
968+
/**
969+
* Appends new elements to an array, and returns the new length of the array.
970+
* @param items New elements of the Array.
971+
*/
972+
push(...items: T[]): number;
973+
/**
974+
* Removes the last element from an array and returns it.
975+
*/
976+
pop(): T;
964977
/**
965978
* Combines two or more arrays.
966979
* @param items Additional items to add to the end of array1.
@@ -976,15 +989,6 @@ interface Array<T> {
976989
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
977990
*/
978991
join(separator?: string): string;
979-
/**
980-
* Removes the last element from an array and returns it.
981-
*/
982-
pop(): T;
983-
/**
984-
* Appends new elements to an array, and returns the new length of the array.
985-
* @param items New elements of the Array.
986-
*/
987-
push(...items: T[]): number;
988992
/**
989993
* Reverses the elements in an Array.
990994
*/
@@ -1101,11 +1105,6 @@ interface Array<T> {
11011105
*/
11021106
reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
11031107

1104-
/**
1105-
* Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
1106-
*/
1107-
length: number;
1108-
11091108
[n: number]: T;
11101109
}
11111110
declare var Array: {

‎bin/lib.d.ts‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -956,11 +956,24 @@ declare var JSON: JSON;
956956
/////////////////////////////
957957

958958
interface Array<T> {
959+
/**
960+
* Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
961+
*/
962+
length: number;
959963
/**
960964
* Returns a string representation of an array.
961965
*/
962966
toString(): string;
963967
toLocaleString(): string;
968+
/**
969+
* Appends new elements to an array, and returns the new length of the array.
970+
* @param items New elements of the Array.
971+
*/
972+
push(...items: T[]): number;
973+
/**
974+
* Removes the last element from an array and returns it.
975+
*/
976+
pop(): T;
964977
/**
965978
* Combines two or more arrays.
966979
* @param items Additional items to add to the end of array1.
@@ -976,15 +989,6 @@ interface Array<T> {
976989
* @param separator A string used to separate one element of an array from the next in the resulting String. If omitted, the array elements are separated with a comma.
977990
*/
978991
join(separator?: string): string;
979-
/**
980-
* Removes the last element from an array and returns it.
981-
*/
982-
pop(): T;
983-
/**
984-
* Appends new elements to an array, and returns the new length of the array.
985-
* @param items New elements of the Array.
986-
*/
987-
push(...items: T[]): number;
988992
/**
989993
* Reverses the elements in an Array.
990994
*/
@@ -1101,11 +1105,6 @@ interface Array<T> {
11011105
*/
11021106
reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
11031107

1104-
/**
1105-
* Gets or sets the length of the array. This is a number one higher than the highest element defined in an array.
1106-
*/
1107-
length: number;
1108-
11091108
[n: number]: T;
11101109
}
11111110
declare var Array: {

‎bin/tsc.js‎

Lines changed: 839 additions & 520 deletions
Large diffs are not rendered by default.

‎bin/typescriptServices.js‎

Lines changed: 1098 additions & 693 deletions
Large diffs are not rendered by default.

‎src/compiler/diagnosticInformationMap.generated.ts‎

Lines changed: 270 additions & 306 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)