8000 Merge branch 'master' into tscJsFiles · cloudpeng/TypeScript@0496bfe · GitHub
[go: up one dir, main page]
Skip to content

Commit 0496bfe

Browse files
sheetalkamatsheetalkamat
committed
Merge branch 'master' into tscJsFiles
2 parents acf7de7 + 28c2887 commit 0496bfe

File tree

85 files changed

+28677
-24655
lines changed

Some content is hidden

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

85 files changed

+28677
-24655
lines changed

‎CONTRIBUTING.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,33 @@ e.g. to run all compiler baseline tests:
4747
jake runtests tests=compiler
4848
```
4949

50-
or to run specifc test: `tests\cases\compiler\2dArrays.ts`
50+
or to run a specific test: `tests\cases\compiler\2dArrays.ts`
5151

5252
```Shell
5353
jake runtests tests=2dArrays
5454
```
5555

56+
## Debugging the tests
57+
58+
To debug the tests, invoke the runtests-browser using jake.
59+
You will probably only want to debug one test at a time:
60+
61+
```Shell
62+
jake runtests-browser tests=2dArrays
63+
```
64+
65+
You can specify which browser to use for debugging. Currently Chrome and IE are supported:
66+
67+
```Shell
68+
jake runtests-browser tests=2dArrays browser=chrome
69+
```
70+
71+
You can debug with VS Code or Node instead with `jake runtests debug=true`:
72+
73+
```Shell
74+
jake runtests tests=2dArrays debug=true
75+
```
76+
5677
## Adding a Test
5778
To add a new testcase, simply place a `.ts` file in `tests\cases\compiler` containing code that exemplifies the bugfix or change you are making.
5879

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3965,7 +3965,34 @@ interface ObjectConstructor {
39653965
* Copy the values of all of the enumerable own properties from one or more source objects to a
39663966
* target object. Returns the target object.
39673967
* @param target The target object to copy to.
3968-
* @param sources One or more source objects to copy properties from.
3968+
* @param source The source object from which to copy properties.
3969+
*/
3970+
assign<T, U>(target: T, source: U): T & U;
3971+
3972+
/**
3973+
* Copy the values of all of the enumerable own properties from one or more source objects to a
3974+
* target object. Returns the target object.
3975+
* @param target The target object to copy to.
3976+
* @param source1 The first source object from which to copy properties.
3977+
* @param source2 The second source object from which to copy properties.
3978+
*/
3979+
assign<T, U, V>(target: T, source1: U, source2: V): T & U & V;
3980+
3981+
/**
3982+
* Copy the values of all of the enumerable own properties from one or more source objects to a
3983+
* target object. Returns the target object.
3984+
* @param target The target object to copy to.
3985+
* @param source1 The first source object from which to copy properties.
3986+
* @param source2 The second source object from which to copy properties.
3987+
* @param source3 The third source object from which to copy properties.
3988+
*/
3989+
assign<T, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
3990+
3991+
/**
3992+
* Copy the values of all of the enumerable own properties from one or more source objects to a
3993+
* target object. Returns the target object.
3994+
* @param target The target object to copy to.
3995+
* @param sources One or more source objects from which to copy properties
39693996
*/
39703997
assign(target: any, ...sources: any[]): any;
39713998

‎lib/lib.d.ts

Lines changed: 27 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -4243,8 +4243,8 @@ interface AnalyserNode extends AudioNode {
42434243
smoothingTimeConstant: number;
42444244
getByteFrequencyData(array: Uint8Array): void;
42454245
getByteTimeDomainData(array: Uint8Array): void;
4246-
getFloatFrequencyData(array: any): void;
4247-
getFloatTimeDomainData(array: any): void;
4246+
getFloatFrequencyData(array: Float32Array): void;
4247+
getFloatTimeDomainData(array: Float32Array): void;
42484248
}
42494249

42504250
declare var AnalyserNode: {
@@ -4331,7 +4331,7 @@ interface AudioBuffer {
43314331
length: number;
43324332
numberOfChannels: number;
43334333
sampleRate: number;
4334-
getChannelData(channel: number): any;
4334+
getChannelData(channel: number): Float32Array;
43354335
}
43364336

43374337
declare var AudioBuffer: {
@@ -4375,7 +4375,7 @@ interface AudioContext extends EventTarget {
43754375
createMediaElementSource(mediaElement: HTMLMediaElement): MediaElementAudioSourceNode;
43764376
createOscillator(): OscillatorNode;
43774377
createPanner(): PannerNode;
4378-
createPeriodicWave(real: any, imag: any): PeriodicWave;
4378+
createPeriodicWave(real: Float32Array, imag: Float32Array): PeriodicWave;
43794379
createScriptProcessor(bufferSize?: number, numberOfInputChannels?: number, numberOfOutputChannels?: number): ScriptProcessorNode;
43804380
createStereoPanner(): StereoPannerNode;
43814381
createWaveShaper(): WaveShaperNode;
@@ -4433,7 +4433,7 @@ interface AudioParam {
44334433
linearRampToValueAtTime(value: number, endTime: number): void;
44344434
setTargetAtTime(target: number, startTime: number, timeConstant: number): void;
44354435
setValueAtTime(value: number, startTime: number): void;
4436-
setValueCurveAtTime(values: any, startTime: number, duration: number): void;
4436+
setValueCurveAtTime(values: Float32Array, startTime: number, duration: number): void;
44374437
}
44384438

44394439
declare var AudioParam: {
@@ -4509,7 +4509,7 @@ interface BiquadFilterNode extends AudioNode {
45094509
frequency: AudioParam;
45104510
gain: AudioParam;
45114511
type: string;
4512-
getFrequencyResponse(frequencyHz: any, magResponse: any, phaseResponse: any): void;
4512+
getFrequencyResponse(frequencyHz: Float32Array, magResponse: Float32Array, phaseResponse: Float32Array): void;
45134513
}
45144514

45154515
declare var BiquadFilterNode: {
@@ -5108,7 +5108,7 @@ declare var CanvasPattern: {
51085108

51095109
interface CanvasRenderingContext2D {
51105110
canvas: HTMLCanvasElement;
5111-
fillStyle: any;
5111+
fillStyle: string | CanvasGradient | CanvasPattern;
51125112
font: string;
51135113
globalAlpha: number;
51145114
globalCompositeOperation: string;
@@ -5123,7 +5123,7 @@ interface CanvasRenderingContext2D {
51235123
shadowColor: string;
51245124
shadowOffsetX: number;
51255125
shadowOffsetY: number;
5126-
strokeStyle: any;
5126+
strokeStyle: string | CanvasGradient | CanvasPattern;
51275127
textAlign: string;
51285128
textBaseline: string;
51295129
arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
@@ -6491,8 +6491,6 @@ interface Document extends Node, GlobalEventHandlers, NodeSelector, DocumentEven
64916491
importNode(importedNode: Node, deep: boolean): Node;
64926492
msElementsFromPoint(x: number, y: number): NodeList;
64936493
msElementsFromRect(left: number, top: number, width: number, height: number): NodeList;
6494-
msGetPrintDocumentForNamedFlow(flowName: string): Document;
6495-
msSetPrintDocumentUriForNamedFlow(flowName: string, uri: string): void;
64966494
/**
64976495
* Opens a new window and loads a document specified by a given URL. Also, opens a new window that uses the url parameter and the name parameter to collect the output of the write method and the writeln method.
64986496
* @param url Specifies a MIME type for the document.
@@ -11314,27 +11312,6 @@ declare var MSHTMLWebViewElement: {
1131411312
new(): MSHTMLWebViewElement;
1131511313
}
1131611314

11317-
interface MSHeaderFooter {
11318-
URL: string;
11319-
dateLong: string;
11320-
dateShort: string;
11321-
font: string;
11322-
htmlFoot: string;
11323-
htmlHead: string;
11324-
page: number;
11325-
pageTotal: number;
11326-
textFoot: string;
11327-
textHead: string;
11328-
timeLong: string;
11329-
timeShort: string;
11330-
title: string;
11331-
}
11332-
11333-
declare var MSHeaderFooter: {
11334-
prototype: MSHeaderFooter;
11335-
new(): MSHeaderFooter;
11336-
}
11337-
1133811315
interface MSInputMethodContext extends EventTarget {
1133911316
compositionEndOffset: number;
1134011317
compositionStartOffset: number;
@@ -11493,24 +11470,6 @@ declare var MSPointerEvent: {
1149311470
new(typeArg: string, eventInitDict?: PointerEventInit): MSPointerEvent;
1149411471
}
1149511472

11496-
interface MSPrintManagerTemplatePrinter extends MSTemplatePrinter, EventTarget {
11497-
percentScale: number;
11498-
showHeaderFooter: boolean;
11499-
shrinkToFit: boolean;
11500-
drawPreviewPage(element: HTMLElement, pageNumber: number): void;
11501-
endPrint(): void;
11502-
getPrintTaskOptionValue(key: string): any;
11503-
invalidatePreview(): void;
11504-
setPageCount(pageCount: number): void;
11505-
startPrint(): void;
11506-
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
11507-
}
11508-
11509-
declare var MSPrintManagerTemplatePrinter: {
11510-
prototype: MSPrintManagerTemplatePrinter;
11511-
new(): MSPrintManagerTemplatePrinter;
11512-
}
11513-
1151411473
interface MSRangeCollection {
1151511474
length: number;
1151611475
item(index: number): Range;
@@ -11558,63 +11517,6 @@ declare var MSStreamReader: {
1155811517
new(): MSStreamReader;
1155911518
}
1156011519

11561-
interface MSTemplatePrinter {
11562-
collate: boolean;
11563-
copies: number;
11564-
currentPage: boolean;
11565-
currentPageAvail: boolean;
11566-
duplex: boolean;
11567-
footer: string;
11568-
frameActive: boolean;
11569-
frameActiveEnabled: boolean;
11570-
frameAsShown: boolean;
11571-
framesetDocument: boolean;
11572-
header: string;
11573-
headerFooterFont: string;
11574-
marginBottom: number;
11575-
marginLeft: number;
11576-
marginRight: number;
11577-
marginTop: number;
11578-
orientation: string;
11579-
pageFrom: number;
11580-
pageHeight: number;
11581-
pageTo: number;
11582-
pageWidth: number;
11583-
selectedPages: boolean;
11584-
selection: boolean;
11585-
selectionEnabled: boolean;
11586-
unprintableBottom: number;
11587-
unprintableLeft: number;
11588-
unprintableRight: number;
11589-
unprintableTop: number;
11590-
usePrinterCopyCollate: boolean;
11591-
createHeaderFooter(): MSHeaderFooter;
11592-
deviceSupports(property: string): any;
11593-
ensurePrintDialogDefaults(): boolean;
11594-
getPageMarginBottom(pageRule: CSSPageRule, pageWidth: number, pageHeight: number): any;
11595-
getPageMarginBottomImportant(pageRule: CSSPageRule): boolean;
11596-
getPageMarginLeft(pageRule: CSSPageRule, pageWidth: number, pageHeight: number): any;
11597-
getPageMarginLeftImportant(pageRule: CSSPageRule): boolean;
11598-
getPageMarginRight(pageRule: CSSPageRule, pageWidth: number, pageHeight: number): any;
11599-
getPageMarginRightImportant(pageRule: CSSPageRule): boolean;
11600-
getPageMarginTop(pageRule: CSSPageRule, pageWidth: number, pageHeight: number): any;
11601-
getPageMarginTopImportant(pageRule: CSSPageRule): boolean;
11602-
printBlankPage(): void;
11603-
printNonNative(document: any): boolean;
11604-
printNonNativeFrames(document: any, activeFrame: boolean): void;
11605-
printPage(element: HTMLElement): void;
11606-
showPageSetupDialog(): boolean;
11607-
showPrintDialog(): boolean;
11608-
startDoc(title: string): boolean;
11609-
stopDoc(): void;
11610-
updatePageStatus(status: number): void;
11611-
}
11612-
11613-
declare var MSTemplatePrinter: {
11614-
prototype: MSTemplatePrinter;
11615-
new(): MSTemplatePrinter;
11616-
}
11617-
1161811520
interface MSWebViewAsyncOperation extends EventTarget {
1161911521
error: DOMError;
1162011522
oncomplete: (ev: Event) => any;
@@ -12032,6 +11934,10 @@ declare var Node: {
1203211934
}
1203311935

1203411936
interface NodeFilter {
11937+
acceptNode(n: Node): number;
11938+
}
11939+
11940+
declare var NodeFilter: {
1203511941
FILTER_ACCEPT: number;
1203611942
FILTER_REJECT: number;
1203711943
FILTER_SKIP: number;
@@ -12049,7 +11955,6 @@ interface NodeFilter {
1204911955
SHOW_PROCESSING_INSTRUCTION: number;
1205011956
SHOW_TEXT: number;
1205111957
}
12052-
declare var NodeFilter: NodeFilter;
1205311958

1205411959
interface NodeIterator {
1205511960
expandEntityReferences: boolean;
@@ -12759,7 +12664,6 @@ declare var SVGDescElement: {
1275912664

1276012665
interface SVGElement extends Element {
1276112666
id: string;
12762-
className: any;
1276312667
onclick: (ev: MouseEvent) => any;
1276412668
ondblclick: (ev: MouseEvent) => any;
1276512669
onfocusin: (ev: FocusEvent) => any;
@@ -12773,6 +12677,7 @@ interface SVGElement extends Element {
1277312677
ownerSVGElement: SVGSVGElement;
1277412678
viewportElement: SVGElement;
1277512679
xmlbase: string;
12680+
className: any;
1277612681
addEventListener(type: "MSGestureChange", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
1277712682
addEventListener(type: "MSGestureDoubleTap", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
1277812683
addEventListener(type: "MSGestureEnd", listener: (ev: MSGestureEvent) => any, useCapture?: boolean): void;
@@ -14934,7 +14839,7 @@ declare var WEBGL_depth_texture: {
1493414839
}
1493514840

1493614841
interface WaveShaperNode extends AudioNode {
14937-
curve: any;
14842+
curve: Float32Array;
1493814843
oversample: string;
1493914844
}
1494014845

@@ -15121,34 +15026,34 @@ interface WebGLRenderingContext {
1512115026
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, video: HTMLVideoElement): void;
1512215027
texSubImage2D(target: number, level: number, xoffset: number, yoffset: number, format: number, type: number, pixels: ImageData): void;
1512315028
uniform1f(location: WebGLUniformLocation, x: number): void;
15124-
uniform1fv(location: WebGLUniformLocation, v: any): void;
15029+
uniform1fv(location: WebGLUniformLocation, v: Float32Array): void;
1512515030
uniform1i(location: WebGLUniformLocation, x: number): void;
1512615031
uniform1iv(location: WebGLUniformLocation, v: Int32Array): void;
1512715032
uniform2f(location: WebGLUniformLocation, x: number, y: number): void;
15128-
uniform2fv(location: WebGLUniformLocation, v: any): void;
15033+
uniform2fv(location: WebGLUniformLocation, v: Float32Array): void;
1512915034
uniform2i(location: WebGLUniformLocation, x: number, y: number): void;
1513015035
uniform2iv(location: WebGLUniformLocation, v: Int32Array): void;
1513115036
uniform3f(location: WebGLUniformLocation, x: number, y: number, z: number): void;
15132-
uniform3fv(location: WebGLUniformLocation, v: any): void;
15037+
uniform3fv(location: WebGLUniformLocation, v: Float32Array): void;
1513315038
uniform3i(location: WebGLUniformLocation, x: number, y: number, z: number): void;
1513415039
uniform3iv(location: WebGLUniformLocation, v: Int32Array): void;
1513515040
uniform4f(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
15136-
uniform4fv(location: WebGLUniformLocation, v: any): void;
15041+
uniform4fv(location: WebGLUniformLocation, v: Float32Array): void;
1513715042
uniform4i(location: WebGLUniformLocation, x: number, y: number, z: number, w: number): void;
1513815043
uniform4iv(location: WebGLUniformLocation, v: Int32Array): void;
15139-
uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: any): void;
15140-
uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: any): void;
15141-
uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: any): void;
15044+
uniformMatrix2fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
15045+
uniformMatrix3fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
15046+
uniformMatrix4fv(location: WebGLUniformLocation, transpose: boolean, value: Float32Array): void;
1514215047
useProgram(program: WebGLProgram): void;
1514315048
validateProgram(program: WebGLProgram): void;
1514415049
vertexAttrib1f(indx: number, x: number): void;
15145-
vertexAttrib1fv(indx: number, values: any): void;
15050+
vertexAttrib1fv(indx: number, values: Float32Array): void;
1514615051
vertexAttrib2f(indx: number, x: number, y: number): void;
15147-
vertexAttrib2fv(indx: number, values: any): void;
15052+
vertexAttrib2fv(indx: number, values: Float32Array): void;
1514815053
vertexAttrib3f(indx: number, x: number, y: number, z: number): void;
15149-
vertexAttrib3fv(indx: number, values: any): void;
15054+
vertexAttrib3fv(indx: number, values: Float32Array): void;
1515015055
vertexAttrib4f(indx: number, x: number, y: number, z: number, w: number): void;
15151-
vertexAttrib4fv(indx: number, values: any): void;
15056+
vertexAttrib4fv(indx: number, values: Float32Array): void;
1515215057
vertexAttribPointer(indx: number, size: number, type: number, normalized: boolean, stride: number, offset: number): void;
1515315058
viewport(x: number, y: number, width: number, height: number): void;
1515415059
ACTIVE_ATTRIBUTES: number;
@@ -15912,7 +15817,6 @@ interface Window extends EventTarget, WindowTimers, WindowSessionStorage, Window
1591215817
locationbar: BarProp;
1591315818
menubar: BarProp;
1591415819
msAnimationStartTime: number;
15915-
msTemplatePrinter: MSTemplatePrinter;
1591615820
name: string;
1591715821
navigator: Navigator;
1591815822
offscreenBuffering: string | boolean;
@@ -16649,7 +16553,6 @@ interface XMLHttpRequestEventTarget {
1664916553
addEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean): void;
1665016554
}
1665116555

16652-
1665316556
interface NodeListOf<TNode extends Node> extends NodeList {
1665416557
length: number;
1665516558
item(index: number): TNode;
@@ -16670,8 +16573,6 @@ interface EventListenerObject {
1667016573
handleEvent(evt: Event): void;
1667116574
}
1667216575

16673-
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
16674-
1667516576
interface MessageEventInit extends EventInit {
1667616577
data?: any;
1667716578
origin?: string;
@@ -16687,6 +16588,8 @@ interface ProgressEventInit extends EventInit {
1668716588
total?: number;
1668816589
}
1668916590

16591+
declare type EventListenerOrEventListenerObject = EventListener | EventListenerObject;
16592+
1669016593
interface ErrorEventHandler {
1669116594
(message: string, filename?: string, lineno?: number, colno?: number, error?:Error): void;
1669216595
}
@@ -16747,7 +16650,6 @@ declare var location: Location;
1674716650
declare var locationbar: BarProp;
1674816651
declare var menubar: BarProp;
1674916652
declare var msAnimationStartTime: number;
16750-
declare var msTemplatePrinter: MSTemplatePrinter;
1675116653
declare var name: string;
1675216654
declare var navigator: Navigator;
1675316655
declare var offscreenBuffering: string | boolean;

0 commit comments

Comments
 (0)
0