Skip to content

Commit f53e6a8

Browse files
committed
Merge pull request #2897 from Microsoft/fixThisInDecoratorHelpers
Fix this in decorator helpers
2 parents 3907cae + 983b82d commit f53e6a8

Some content is hidden

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

51 files changed

+773
-649
lines changed

bin/lib.core.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ interface Math {
561561
*/
562562
atan(x: number): number;
563563
/**
564-
* Returns the angle (in radians) from the X axis to a point (y,x).
564+
* Returns the angle (in radians) from the X axis to a point.
565565
* @param y A numeric expression representing the cartesian y-coordinate.
566566
* @param x A numeric expression representing the cartesian x-coordinate.
567567
*/

bin/lib.core.es6.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ interface Math {
561561
*/
562562
atan(x: number): number;
563563
/**
564-
* Returns the angle (in radians) from the X axis to a point (y,x).
564+
* Returns the angle (in radians) from the X axis to a point.
565565
* @param y A numeric expression representing the cartesian y-coordinate.
566566
* @param x A numeric expression representing the cartesian x-coordinate.
567567
*/
@@ -1628,7 +1628,7 @@ interface IteratorResult<T> {
16281628
}
16291629

16301630
interface Iterator<T> {
1631-
next(): IteratorResult<T>;
1631+
next(value?: any): IteratorResult<T>;
16321632
return?(value?: any): IteratorResult<T>;
16331633
throw?(e?: any): IteratorResult<T>;
16341634
}

bin/lib.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ interface Math {
561561
*/
562562
atan(x: number): number;
563563
/**
564-
* Returns the angle (in radians) from the X axis to a point (y,x).
564+
* Returns the angle (in radians) from the X axis to a point.
565565
* @param y A numeric expression representing the cartesian y-coordinate.
566566
* @param x A numeric expression representing the cartesian x-coordinate.
567567
*/

bin/lib.es6.d.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ interface Math {
561561
*/
562562
atan(x: number): number;
563563
/**
564-
* Returns the angle (in radians) from the X axis to a point (y,x).
564+
* Returns the angle (in radians) from the X axis to a point.
565565
* @param y A numeric expression representing the cartesian y-coordinate.
566566
* @param x A numeric expression representing the cartesian x-coordinate.
567567
*/
@@ -1628,7 +1628,7 @@ interface IteratorResult<T> {
16281628
}
16291629

16301630
interface Iterator<T> {
1631-
next(): IteratorResult<T>;
1631+
next(value?: any): IteratorResult<T>;
16321632
return?(value?: any): IteratorResult<T>;
16331633
throw?(e?: any): IteratorResult<T>;
16341634
}

bin/tsc.js

+120-90
Large diffs are not rendered by default.

bin/tsserver.js

+124-94
Large diffs are not rendered by default.

bin/typescript.d.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ declare module "typescript" {
597597
interface ForStatement extends IterationStatement {
598598
initializer?: VariableDeclarationList | Expression;
599599
condition?: Expression;
600-
iterator?: Expression;
600+
incrementor?: Expression;
601601
}
602602
interface ForInStatement extends IterationStatement {
603603
initializer: VariableDeclarationList | Expression;
@@ -1005,15 +1005,17 @@ declare module "typescript" {
10051005
}
10061006
interface InterfaceType extends ObjectType {
10071007
typeParameters: TypeParameter[];
1008+
}
1009+
interface InterfaceTypeWithBaseTypes extends InterfaceType {
1010+
baseTypes: ObjectType[];
1011+
}
1012+
interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
10081013
declaredProperties: Symbol[];
10091014
declaredCallSignatures: Signature[];
10101015
declaredConstructSignatures: Signature[];
10111016
declaredStringIndexType: Type;
10121017
declaredNumberIndexType: Type;
10131018
}
1014-
interface InterfaceTypeWithBaseTypes extends InterfaceType {
1015-
baseTypes: ObjectType[];
1016-
}
10171019
interface TypeReference extends ObjectType {
10181020
target: GenericType;
10191021
typeArguments: Type[];
@@ -1110,6 +1112,7 @@ declare module "typescript" {
11101112
None = 0,
11111113
CommonJS = 1,
11121114
AMD = 2,
1115+
UMD = 3,
11131116
}
11141117
interface LineAndCharacter {
11151118
line: number;

bin/typescript.js

+124-101
Large diffs are not rendered by default.

bin/typescriptServices.d.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ declare module ts {
597597
interface ForStatement extends IterationStatement {
598598
initializer?: VariableDeclarationList | Expression;
599599
condition?: Expression;
600-
iterator?: Expression;
600+
incrementor?: Expression;
601601
}
602602
interface ForInStatement extends IterationStatement {
603603
initializer: VariableDeclarationList | Expression;
@@ -1005,15 +1005,17 @@ declare module ts {
10051005
}
10061006
interface InterfaceType extends ObjectType {
10071007
typeParameters: TypeParameter[];
1008+
}
1009+
interface InterfaceTypeWithBaseTypes extends InterfaceType {
1010+
baseTypes: ObjectType[];
1011+
}
1012+
interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
10081013
declaredProperties: Symbol[];
10091014
declaredCallSignatures: Signature[];
10101015
declaredConstructSignatures: Signature[];
10111016
declaredStringIndexType: Type;
10121017
declaredNumberIndexType: Type;
10131018
}
1014-
interface InterfaceTypeWithBaseTypes extends InterfaceType {
1015-
baseTypes: ObjectType[];
1016-
}
10171019
interface TypeReference extends ObjectType {
10181020
target: GenericType;
10191021
typeArguments: Type[];
@@ -1110,6 +1112,7 @@ declare module ts {
11101112
None = 0,
11111113
CommonJS = 1,
11121114
AMD = 2,
1115+
UMD = 3,
11131116
}
11141117
interface LineAndCharacter {
11151118
line: number;

0 commit comments

Comments
 (0)