Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3dda1c0

Browse files
Merge branch 'master' into textSpan
Conflicts: src/compiler/checker.ts src/compiler/emitter.ts src/compiler/parser.ts src/compiler/utilities.ts src/harness/typeWriter.ts src/services/breakpoints.ts src/services/formatting/formatting.ts src/services/outliningElementsCollector.ts src/services/services.ts
2 parents 4bfa290 + 28c9ff1 commit 3dda1c0

File tree

6,126 files changed

+283519
-76236
lines changed

Some content is hidden

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

6,126 files changed

+283519
-76236
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ scripts/*.js.map
4646
coverage/
4747
internal/
4848
**/.DS_Store
49+
.settings/

.npmignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ scripts
44
src
55
tests
66
Jakefile
7-
.travis.yml
7+
.travis.yml
8+
.settings/

Jakefile renamed to Jakefile.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ var harnessSources = [
127127
"services/documentRegistry.ts",
128128
"services/preProcessFile.ts",
129129
"services/patternMatcher.ts",
130-
"versionCache.ts"
130+
"versionCache.ts",
131+
"convertToBase64.ts"
131132
].map(function (f) {
132133
return path.join(unittestsDirectory, f);
133134
})).concat([

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

+54-20
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
*/
@@ -1237,11 +1237,41 @@ interface SymbolConstructor {
12371237
isConcatSpreadable: symbol;
12381238

12391239
/**
1240-
* A method that returns the default iterator for an object.Called by the semantics of the
1240+
* A method that returns the default iterator for an object. Called by the semantics of the
12411241
* for-of statement.
12421242
*/
12431243
iterator: symbol;
12441244

1245+
/**
1246+
* A regular expression method that matches the regular expression against a string. Called
1247+
* by the String.prototype.match method.
1248+
*/
1249+
match: symbol;
1250+
1251+
/**
1252+
* A regular expression method that replaces matched substrings of a string. Called by the
1253+
* String.prototype.replace method.
1254+
*/
1255+
replace: symbol;
1256+
1257+
/**
1258+
* A regular expression method that returns the index within a string that matches the
1259+
* regular expression. Called by the String.prototype.search method.
1260+
*/
1261+
search: symbol;
1262+
1263+
/**
1264+
* A function valued property that is the constructor function that is used to create
1265+
* derived objects.
1266+
*/
1267+
species: symbol;
1268+
1269+
/**
1270+
* A regular expression method that splits a string at the indices that match the regular
1271+
* expression. Called by the String.prototype.split method.
1272+
*/
1273+
split: symbol;
1274+
12451275
/**
12461276
* A method that converts an object to a corresponding primitive value.Called by the ToPrimitive
12471277
* abstract operation.
@@ -1628,7 +1658,7 @@ interface IteratorResult<T> {
16281658
}
16291659

16301660
interface Iterator<T> {
1631-
next(): IteratorResult<T>;
1661+
next(value?: any): IteratorResult<T>;
16321662
return?(value?: any): IteratorResult<T>;
16331663
throw?(e?: any): IteratorResult<T>;
16341664
}
@@ -4728,6 +4758,16 @@ declare module Reflect {
47284758
function setPrototypeOf(target: any, proto: any): boolean;
47294759
}
47304760

4761+
interface PromiseLike<T> {
4762+
/**
4763+
* Attaches callbacks for the resolution and/or rejection of the Promise.
4764+
* @param onfulfilled The callback to execute when the Promise is resolved.
4765+
* @param onrejected The callback to execute when the Promise is rejected.
4766+
* @returns A Promise for the completion of which ever callback is executed.
4767+
*/
4768+
then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
4769+
}
4770+
47314771
/**
47324772
* Represents the completion of an asynchronous operation
47334773
*/
@@ -4738,14 +4778,16 @@ interface Promise<T> {
47384778
* @param onrejected The callback to execute when the Promise is rejected.
47394779
* @returns A Promise for the completion of which ever callback is executed.
47404780
*/
4741-
then<TResult>(onfulfilled?: (value: T) => TResult | Promise<TResult>, onrejected?: (reason: any) => TResult | Promise<TResult>): Promise<TResult>;
4781+
then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): Promise<TResult>;
47424782

47434783
/**
47444784
* Attaches a callback for only the rejection of the Promise.
47454785
* @param onrejected The callback to execute when the Promise is rejected.
47464786
* @returns A Promise for the completion of the callback.
47474787
*/
4748-
catch(onrejected?: (reason: any) => T | Promise<T>): Promise<T>;
4788+
catch(onrejected?: (reason: any) => T | PromiseLike<T>): Promise<T>;
4789+
4790+
[Symbol.toStringTag]: string;
47494791
}
47504792

47514793
interface PromiseConstructor {
@@ -4756,37 +4798,27 @@ interface PromiseConstructor {
47564798

47574799
/**
47584800
* Creates a new Promise.
4759-
* @param init A callback used to initialize the promise. This callback is passed two arguments:
4801+
* @param executor A callback used to initialize the promise. This callback is passed two arguments:
47604802
* a resolve callback used resolve the promise with a value or the result of another promise,
47614803
* and a reject callback used to reject the promise with a provided reason or error.
47624804
*/
4763-
new <T>(init: (resolve: (value?: T | Promise<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
4764-
4765-
<T>(init: (resolve: (value?: T | Promise<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
4805+
new <T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): Promise<T>;
47664806

47674807
/**
47684808
* Creates a Promise that is resolved with an array of results when all of the provided Promises
47694809
* resolve, or rejected when any Promise is rejected.
47704810
* @param values An array of Promises.
47714811
* @returns A new Promise.
47724812
*/
4773-
all<T>(values: (T | Promise<T>)[]): Promise<T[]>;
4774-
4775-
/**
4776-
* Creates a Promise that is resolved with an array of results when all of the provided Promises
4777-
* resolve, or rejected when any Promise is rejected.
4778-
* @param values An array of values.
4779-
* @returns A new Promise.
4780-
*/
4781-
all(values: Promise<void>[]): Promise<void>;
4813+
all<T>(values: Iterable<T | PromiseLike<T>>): Promise<T[]>;
47824814

47834815
/**
47844816
* Creates a Promise that is resolved or rejected when any of the provided Promises are resolved
47854817
* or rejected.
47864818
* @param values An array of Promises.
47874819
* @returns A new Promise.
47884820
*/
4789-
race<T>(values: (T | Promise<T>)[]): Promise<T>;
4821+
race<T>(values: Iterable<T | PromiseLike<T>>): Promise<T>;
47904822

47914823
/**
47924824
* Creates a new rejected promise for the provided reason.
@@ -4807,13 +4839,15 @@ interface PromiseConstructor {
48074839
* @param value A promise.
48084840
* @returns A promise whose internal state matches the provided promise.
48094841
*/
4810-
resolve<T>(value: T | Promise<T>): Promise<T>;
4842+
resolve<T>(value: T | PromiseLike<T>): Promise<T>;
48114843

48124844
/**
48134845
* Creates a new resolved promise .
48144846
* @returns A resolved promise.
48154847
*/
48164848
resolve(): Promise<void>;
4849+
4850+
[Symbol.species]: Function;
48174851
}
48184852

48194853
declare var Promise: PromiseConstructor;

0 commit comments

Comments
 (0)