Skip to content

Commit 4d91fff

Browse files
saschanazsaschanaz
committed
Merge https://github.com/Microsoft/TypeScript into blockFormParameterIndentation
2 parents 910079a + 45cf145 commit 4d91fff

757 files changed

Lines changed: 27154 additions & 7425 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.

‎.gitattributes‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
*.js linguist-language=TypeScript
1+
*.js linguist-language=TypeScript
2+
* -text

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ tests/services/baselines/local/*
2121
tests/baselines/prototyping/local/*
2222
tests/baselines/rwc/*
2323
tests/baselines/test262/*
24+
tests/baselines/reference/projectOutput/*
2425
tests/baselines/local/projectOutput/*
2526
tests/services/baselines/prototyping/local/*
2627
tests/services/browser/typescriptServices.js
@@ -46,4 +47,5 @@ scripts/*.js.map
4647
coverage/
4748
internal/
4849
**/.DS_Store
49-
.settings/
50+
.settings/*
51+
!.settings/tasks.json

‎.settings/tasks.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// Available variables which can be used inside of strings.
2+
// ${workspaceRoot}: the root folder of the team
3+
// ${file}: the current opened file
4+
// ${fileBasename}: the current opened file's basename
5+
// ${fileDirname}: the current opened file's dirname
6+
// ${fileExtname}: the current opened file's extension
7+
// ${cwd}: the current working directory of the spawned process
8+
{
9+
"version": "0.1.0",
10+
"command": "jake",
11+
"isShellCommand": true,
12+
"showOutput": "silent",
13+
"tasks": [
14+
{
15+
"taskName": "local",
16+
"isBuildCommand": true,
17+
"showOutput": "silent",
18+
"problemMatcher": [
19+
"$tsc"
20+
]
21+
}
22+
]
23+
}

‎Jakefile.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ var harnessSources = [
123123
return path.join(harnessDirectory, f);
124124
}).concat([
125125
"incrementalParser.ts",
126+
"jsDocParsing.ts",
126127
"services/colorization.ts",
127128
"services/documentRegistry.ts",
128129
"services/preProcessFile.ts",
129130
"services/patternMatcher.ts",
130131
"versionCache.ts",
131-
"convertToBase64.ts"
132+
"convertToBase64.ts",
133+
"transpile.ts"
132134
].map(function (f) {
133135
return path.join(unittestsDirectory, f);
134136
})).concat([
@@ -505,7 +507,7 @@ function cleanTestDirs() {
505507
// used to pass data from jake command line directly to run.js
506508
function writeTestConfigFile(tests, testConfigFile) {
507509
console.log('Running test(s): ' + tests);
508-
var testConfigContents = '{\n' + '\ttest: [\'' + tests + '\']\n}';
510+
var testConfigContents = JSON.stringify({ test: [tests]});
509511
fs.writeFileSync('test.config', testConfigContents);
510512
}
511513

@@ -688,4 +690,4 @@ task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function
688690
complete();
689691
});
690692
ex.run();
691-
}, { async: true });
693+
}, { async: true });

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
[![Downloads](http://img.shields.io/npm/dm/TypeScript.svg)](https://npmjs.org/package/typescript)
66

77
# TypeScript
8+
9+
[![Join the chat at https://gitter.im/Microsoft/TypeScript](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Microsoft/TypeScript?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
810

911
[TypeScript](http://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types, classes, and modules to JavaScript. TypeScript supports tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](http://www.typescriptlang.org/Playground), and stay up to date via [our blog](http://blogs.msdn.com/typescript) and [twitter account](https://twitter.com/typescriptlang).
1012

@@ -29,7 +31,7 @@ There are many ways to [contribute](https://github.com/Microsoft/TypeScript/blob
2931

3032
## Building
3133

32-
In order to build the TypeScript compiler, ensure that you have [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/) installed.
34+
In order to build the TypeScript compiler, ensure that you have [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/) installed. Note that you need to have autocrlf off as we track whitespace changes (`git config --global core.autocrlf false`).
3335

3436
Clone a copy of the repo:
3537

‎bin/lib.core.es6.d.ts‎

Lines changed: 5 additions & 8 deletions
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.

‎bin/lib.d.ts‎

Lines changed: 22 additions & 14 deletions
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
}
@@ -11335,10 +11335,10 @@ declare var MediaQueryList: {
1133511335
interface MediaSource extends EventTarget {
1133611336
activeSourceBuffers: SourceBufferList;
1133711337
duration: number;
11338-
readyState: string;
11338+
readyState: number;
1133911339
sourceBuffers: SourceBufferList;
1134011340
addSourceBuffer(type: string): SourceBuffer;
11341-
endOfStream(error?: string): void;
11341+
endOfStream(error?: number): void;
1134211342
removeSourceBuffer(sourceBuffer: SourceBuffer): void;
1134311343
}
1134411344

@@ -12067,7 +12067,7 @@ declare var PopStateEvent: {
1206712067

1206812068
interface Position {
1206912069
coords: Coordinates;
12070-
timestamp: Date;
12070+
timestamp: number;
1207112071
}
1207212072

1207312073
declare var Position: {
@@ -14748,9 +14748,17 @@ interface WebGLRenderingContext {
1474814748
stencilMaskSeparate(face: number, mask: number): void;
1474914749
stencilOp(fail: number, zfail: number, zpass: number): void;
1475014750
stencilOpSeparate(face: number, fail: number, zfail: number, zpass: number): void;
14751+
texImage2D(target: number, level: number, internalformat: number, width: number, height: number, border: number, format: number, type: number, pixels: ArrayBufferView): void;
14752+
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, image: HTMLImageElement): void;
14753+
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, canvas: HTMLCanvasElement): void;
14754+
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, video: HTMLVideoElement): void;
1475114755
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, pixels: ImageData): void;
1475214756
texParameterf(target: number, pname: number, param: number): void;
1475314757
texParameteri(target: number, pname: number, param: number): void;
14758+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView): void;
14759+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, image: HTMLImageElement): void;
14760+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, canvas: HTMLCanvasElement): void;
14761+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
1475414762
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
1475514763
uniform1f(location: WebGLUniformLocation, x: number): void;
1475614764
uniform1fv(location: WebGLUniformLocation, v: any): void;
@@ -15990,10 +15998,11 @@ interface DocumentEvent {
1599015998
createEvent(eventInterface:"AriaRequestEvent"): AriaRequestEvent;
1599115999
createEvent(eventInterface:"AudioProcessingEvent"): AudioProcessingEvent;
1599216000
createEvent(eventInterface:"BeforeUnloadEvent"): BeforeUnloadEvent;
16001+
createEvent(eventInterface:"ClipboardEvent"): ClipboardEvent;
1599316002
createEvent(eventInterface:"CloseEvent"): CloseEvent;
1599416003
createEvent(eventInterface:"CommandEvent"): CommandEvent;
1599516004
createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
15996-
createEvent(eventInterface: "CustomEvent"): CustomEvent;
16005+
createEvent(eventInterface:"CustomEvent"): CustomEvent;
1599716006
createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent;
1599816007
createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent;
1599916008
createEvent(eventInterface:"DragEvent"): DragEvent;
@@ -16016,8 +16025,6 @@ interface DocumentEvent {
1601616025
createEvent(eventInterface:"MouseEvent"): MouseEvent;
1601716026
createEvent(eventInterface:"MouseEvents"): MouseEvent;
1601816027
createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent;
16019-
createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent;
16020-
createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent;
1602116028
createEvent(eventInterface:"MutationEvent"): MutationEvent;
1602216029
createEvent(eventInterface:"MutationEvents"): MutationEvent;
1602316030
createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent;
@@ -16630,6 +16637,7 @@ declare function addEventListener(type: "volumechange", listener: (ev: Event) =>
1663016637
declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
1663116638
declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
1663216639
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
16640+
1663316641
/////////////////////////////
1663416642
/// WorkerGlobalScope APIs
1663516643
/////////////////////////////

‎bin/lib.dom.d.ts‎

Lines changed: 22 additions & 15 deletions
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
}
@@ -10165,10 +10165,10 @@ declare var MediaQueryList: {
1016510165
interface MediaSource extends EventTarget {
1016610166
activeSourceBuffers: SourceBufferList;
1016710167
duration: number;
10168-
readyState: string;
10168+
readyState: number;
1016910169
sourceBuffers: SourceBufferList;
1017010170
addSourceBuffer(type: string): SourceBuffer;
10171-
endOfStream(error?: string): void;
10171+
endOfStream(error?: number): void;
1017210172
removeSourceBuffer(sourceBuffer: SourceBuffer): void;
1017310173
}
1017410174

@@ -10897,7 +10897,7 @@ declare var PopStateEvent: {
1089710897

1089810898
interface Position {
1089910899
coords: Coordinates;
10900-
timestamp: Date;
10900+
timestamp: number;
1090110901
}
1090210902

1090310903
declare var Position: {
@@ -13578,9 +13578,17 @@ interface WebGLRenderingContext {
1357813578
stencilMaskSeparate(face: number, mask: number): void;
1357913579
stencilOp(fail: number, zfail: number, zpass: number): void;
1358013580
stencilOpSeparate(face: number, fail: number, zfail: number, zpass: number): void;
13581+
texImage2D(target: number, level: number, internalformat: number, width: number, height: number, border: number, format: number, type: number, pixels: ArrayBufferView): void;
13582+
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, image: HTMLImageElement): void;
13583+
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, canvas: HTMLCanvasElement): void;
13584+
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, video: HTMLVideoElement): void;
1358113585
texImage2D(target: number, level: number, internalformat: number, format: number, type: number, pixels: ImageData): void;
1358213586
texParameterf(target: number, pname: number, param: number): void;
1358313587
texParameteri(target: number, pname: number, param: number): void;
13588+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, width: number, height: number, format: number, type: number, pixels: ArrayBufferView): void;
13589+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, image: HTMLImageElement): void;
13590+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, canvas: HTMLCanvasElement): void;
13591+
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
1358413592
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
1358513593
uniform1f(location: WebGLUniformLocation, x: number): void;
1358613594
uniform1fv(location: WebGLUniformLocation, v: any): void;
@@ -14820,10 +14828,11 @@ interface DocumentEvent {
1482014828
createEvent(eventInterface:"AriaRequestEvent"): AriaRequestEvent;
1482114829
createEvent(eventInterface:"AudioProcessingEvent"): AudioProcessingEvent;
1482214830
createEvent(eventInterface:"BeforeUnloadEvent"): BeforeUnloadEvent;
14831+
createEvent(eventInterface:"ClipboardEvent"): ClipboardEvent;
1482314832
createEvent(eventInterface:"CloseEvent"): CloseEvent;
1482414833
createEvent(eventInterface:"CommandEvent"): CommandEvent;
1482514834
createEvent(eventInterface:"CompositionEvent"): CompositionEvent;
14826-
createEvent(eventInterface: "CustomEvent"): CustomEvent;
14835+
createEvent(eventInterface:"CustomEvent"): CustomEvent;
1482714836
createEvent(eventInterface:"DeviceMotionEvent"): DeviceMotionEvent;
1482814837
createEvent(eventInterface:"DeviceOrientationEvent"): DeviceOrientationEvent;
1482914838
createEvent(eventInterface:"DragEvent"): DragEvent;
@@ -14846,8 +14855,6 @@ interface DocumentEvent {
1484614855
createEvent(eventInterface:"MouseEvent"): MouseEvent;
1484714856
createEvent(eventInterface:"MouseEvents"): MouseEvent;
1484814857
createEvent(eventInterface:"MouseWheelEvent"): MouseWheelEvent;
14849-
createEvent(eventInterface:"MSGestureEvent"): MSGestureEvent;
14850-
createEvent(eventInterface:"MSPointerEvent"): MSPointerEvent;
1485114858
createEvent(eventInterface:"MutationEvent"): MutationEvent;
1485214859
createEvent(eventInterface:"MutationEvents"): MutationEvent;
1485314860
createEvent(eventInterface:"NavigationCompletedEvent"): NavigationCompletedEvent;
@@ -15459,4 +15466,4 @@ declare function addEventListener(type: "unload", listener: (ev: Event) => any,
1545915466
declare function addEventListener(type: "volumechange", listener: (ev: Event) => any, useCapture?: boolean): void;
1546015467
declare function addEventListener(type: "waiting", listener: (ev: Event) => any, useCapture?: boolean): void;
1546115468
declare function addEventListener(type: "wheel", listener: (ev: WheelEvent) => any, useCapture?: boolean): void;
15462-
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
15469+
declare function addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;

0 commit comments

Comments
 (0)