Skip to content

Commit 87d43aa

Browse files
ahejlsbergahejlsberg
committed
Merge branch 'master' into circularInstantiatedTypes
Conflicts: src/compiler/checker.ts src/compiler/types.ts
2 parents dd8f3c4 + 4fd3bcf commit 87d43aa

File tree

287 files changed

+13721
-5168
lines changed

Some content is hidden

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

287 files changed

+13721
-5168
lines changed

Diff for: ‎.gitattributes

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
*.js linguist-language=TypeScript
1+
*.js linguist-language=TypeScript
2+
* -text

Diff for: ‎bin/lib.core.es6.d.ts

+5-8
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,11 @@ interface Array<T> {
15021502
copyWithin(target: number, start: number, end?: number): T[];
15031503
}
15041504

1505+
interface IArguments {
1506+
/** Iterator */
1507+
[Symbol.iterator](): IterableIterator<any>;
1508+
}
1509+
15051510
interface ArrayConstructor {
15061511
/**
15071512
* Creates an array from an array-like object.
@@ -1686,14 +1691,6 @@ interface GeneratorFunctionConstructor {
16861691
}
16871692
declare var GeneratorFunction: GeneratorFunctionConstructor;
16881693

1689-
interface Generator<T> extends IterableIterator<T> {
1690-
next(value?: any): IteratorResult<T>;
1691-
throw(exception: any): IteratorResult<T>;
1692-
return(value: T): IteratorResult<T>;
1693-
[Symbol.iterator](): Generator<T>;
1694-
[Symbol.toStringTag]: string;
1695-
}
1696-
16971694
interface Math {
16981695
/**
16991696
* Returns the number of leading zero bits in the 32-bit binary representation of a number.

Diff for: ‎bin/lib.d.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -3552,10 +3552,10 @@ declare module Intl {
35523552
resolvedOptions(): ResolvedNumberFormatOptions;
35533553
}
35543554
var NumberFormat: {
3555-
new (locales?: string[], options?: NumberFormatOptions): Collator;
3556-
new (locale?: string, options?: NumberFormatOptions): Collator;
3557-
(locales?: string[], options?: NumberFormatOptions): Collator;
3558-
(locale?: string, options?: NumberFormatOptions): Collator;
3555+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
3556+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
3557+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
3558+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
35593559
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
35603560
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
35613561
}
@@ -3597,10 +3597,10 @@ declare module Intl {
35973597
resolvedOptions(): ResolvedDateTimeFormatOptions;
35983598
}
35993599
var DateTimeFormat: {
3600-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
3601-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
3602-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
3603-
(locale?: string, options?: DateTimeFormatOptions): Collator;
3600+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
3601+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
3602+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
3603+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
36043604
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
36053605
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
36063606
}

Diff for: ‎bin/lib.dom.d.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -2382,10 +2382,10 @@ declare module Intl {
23822382
resolvedOptions(): ResolvedNumberFormatOptions;
23832383
}
23842384
var NumberFormat: {
2385-
new (locales?: string[], options?: NumberFormatOptions): Collator;
2386-
new (locale?: string, options?: NumberFormatOptions): Collator;
2387-
(locales?: string[], options?: NumberFormatOptions): Collator;
2388-
(locale?: string, options?: NumberFormatOptions): Collator;
2385+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
2386+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
2387+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
2388+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
23892389
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
23902390
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
23912391
}
@@ -2427,10 +2427,10 @@ declare module Intl {
24272427
resolvedOptions(): ResolvedDateTimeFormatOptions;
24282428
}
24292429
var DateTimeFormat: {
2430-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
2431-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
2432-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
2433-
(locale?: string, options?: DateTimeFormatOptions): Collator;
2430+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2431+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
2432+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2433+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
24342434
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
24352435
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
24362436
}

Diff for: ‎bin/lib.es6.d.ts

+13-16
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,11 @@ interface Array<T> {
15021502
copyWithin(target: number, start: number, end?: number): T[];
15031503
}
15041504

1505+
interface IArguments {
1506+
/** Iterator */
1507+
[Symbol.iterator](): IterableIterator<any>;
1508+
}
1509+
15051510
interface ArrayConstructor {
15061511
/**
15071512
* Creates an array from an array-like object.
@@ -1686,14 +1691,6 @@ interface GeneratorFunctionConstructor {
16861691
}
16871692
declare var GeneratorFunction: GeneratorFunctionConstructor;
16881693

1689-
interface Generator<T> extends IterableIterator<T> {
1690-
next(value?: any): IteratorResult<T>;
1691-
throw(exception: any): IteratorResult<T>;
1692-
return(value: T): IteratorResult<T>;
1693-
[Symbol.iterator](): Generator<T>;
1694-
[Symbol.toStringTag]: string;
1695-
}
1696-
16971694
interface Math {
16981695
/**
16991696
* Returns the number of leading zero bits in the 32-bit binary representation of a number.
@@ -4933,10 +4930,10 @@ declare module Intl {
49334930
resolvedOptions(): ResolvedNumberFormatOptions;
49344931
}
49354932
var NumberFormat: {
4936-
new (locales?: string[], options?: NumberFormatOptions): Collator;
4937-
new (locale?: string, options?: NumberFormatOptions): Collator;
4938-
(locales?: string[], options?: NumberFormatOptions): Collator;
4939-
(locale?: string, options?: NumberFormatOptions): Collator;
4933+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
4934+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
4935+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
4936+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
49404937
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
49414938
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
49424939
}
@@ -4978,10 +4975,10 @@ declare module Intl {
49784975
resolvedOptions(): ResolvedDateTimeFormatOptions;
49794976
}
49804977
var DateTimeFormat: {
4981-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
4982-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
4983-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
4984-
(locale?: string, options?: DateTimeFormatOptions): Collator;
4978+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
4979+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
4980+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
4981+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
49854982
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
49864983
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
49874984
}

Diff for: ‎bin/lib.webworker.d.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -2382,10 +2382,10 @@ declare module Intl {
23822382
resolvedOptions(): ResolvedNumberFormatOptions;
23832383
}
23842384
var NumberFormat: {
2385-
new (locales?: string[], options?: NumberFormatOptions): Collator;
2386-
new (locale?: string, options?: NumberFormatOptions): Collator;
2387-
(locales?: string[], options?: NumberFormatOptions): Collator;
2388-
(locale?: string, options?: NumberFormatOptions): Collator;
2385+
new (locales?: string[], options?: NumberFormatOptions): NumberFormat;
2386+
new (locale?: string, options?: NumberFormatOptions): NumberFormat;
2387+
(locales?: string[], options?: NumberFormatOptions): NumberFormat;
2388+
(locale?: string, options?: NumberFormatOptions): NumberFormat;
23892389
supportedLocalesOf(locales: string[], options?: NumberFormatOptions): string[];
23902390
supportedLocalesOf(locale: string, options?: NumberFormatOptions): string[];
23912391
}
@@ -2427,10 +2427,10 @@ declare module Intl {
24272427
resolvedOptions(): ResolvedDateTimeFormatOptions;
24282428
}
24292429
var DateTimeFormat: {
2430-
new (locales?: string[], options?: DateTimeFormatOptions): Collator;
2431-
new (locale?: string, options?: DateTimeFormatOptions): Collator;
2432-
(locales?: string[], options?: DateTimeFormatOptions): Collator;
2433-
(locale?: string, options?: DateTimeFormatOptions): Collator;
2430+
new (locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2431+
new (locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
2432+
(locales?: string[], options?: DateTimeFormatOptions): DateTimeFormat;
2433+
(locale?: string, options?: DateTimeFormatOptions): DateTimeFormat;
24342434
supportedLocalesOf(locales: string[], options?: DateTimeFormatOptions): string[];
24352435
supportedLocalesOf(locale: string, options?: DateTimeFormatOptions): string[];
24362436
}

0 commit comments

Comments
 (0)