Skip to content

Commit 9a39f9c

Browse files
committed
Merge branch 'release-2.0'
2 parents 94f2169 + 4768286 commit 9a39f9c

19 files changed

+7938
-6706
lines changed

lib/lib.d.ts

Lines changed: 1989 additions & 1996 deletions
Large diffs are not rendered by default.

lib/lib.dom.d.ts

Lines changed: 1969 additions & 1969 deletions
Large diffs are not rendered by default.

lib/lib.es5.d.ts

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,33 +1271,13 @@ declare type PromiseConstructorLike = new <T>(executor: (resolve: (value?: T | P
12711271

12721272
interface PromiseLike<T> {
12731273
/**
1274-
* Attaches callbacks for the resolution and/or rejection of the Promise.
1275-
* @param onfulfilled The callback to execute when the Promise is resolved.
1276-
* @param onrejected The callback to execute when the Promise is rejected.
1277-
* @returns A Promise for the completion of which ever callback is executed.
1278-
*/
1279-
then<TResult1, TResult2>(onfulfilled: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): PromiseLike<TResult1 | TResult2>;
1280-
1281-
/**
1282-
* Attaches callbacks for the resolution and/or rejection of the Promise.
1283-
* @param onfulfilled The callback to execute when the Promise is resolved.
1284-
* @param onrejected The callback to execute when the Promise is rejected.
1285-
* @returns A Promise for the completion of which ever callback is executed.
1286-
*/
1287-
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
1288-
1289-
/**
1290-
* Attaches callbacks for the resolution and/or rejection of the Promise.
1291-
* @param onfulfilled The callback to execute when the Promise is resolved.
1292-
* @returns A Promise for the completion of which ever callback is executed.
1293-
*/
1294-
then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
1295-
1296-
/**
1297-
* Creates a new Promise with the same internal state of this Promise.
1298-
* @returns A Promise.
1299-
*/
1300-
then(): PromiseLike<T>;
1274+
* Attaches callbacks for the resolution and/or rejection of the Promise.
1275+
* @param onfulfilled The callback to execute when the Promise is resolved.
1276+
* @param onrejected The callback to execute when the Promise is rejected.
1277+
* @returns A Promise for the completion of which ever callback is executed.
1278+
*/
1279+
then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => TResult | PromiseLike<TResult>): PromiseLike<TResult>;
1280+
then<TResult>(onfulfilled?: (value: T) => TResult | PromiseLike<TResult>, onrejected?: (reason: any) => void): PromiseLike<TResult>;
13011281
}
13021282

13031283
interface ArrayLike<T> {

lib/lib.es6.d.ts

Lines changed: 1989 additions & 1996 deletions
Large diffs are not rendered by default.

lib/lib.scripthost.d.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,3 +292,16 @@ interface VBArrayConstructor {
292292
}
293293

294294
declare var VBArray: VBArrayConstructor;
295+
296+
/**
297+
* Automation date (VT_DATE)
298+
*/
299+
interface VarDate { }
300+
301+
interface DateConstructor {
302+
new (vd: VarDate): Date;
303+
}
304+
305+
interface Date {
306+
getVarDate: () => VarDate;
307+
}

lib/lib.webworker.d.ts

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

lib/tsc.js

Lines changed: 267 additions & 109 deletions
Large diffs are not rendered by default.

lib/tsserver.js

Lines changed: 321 additions & 126 deletions
Large diffs are not rendered by default.

lib/tsserverlibrary.d.ts

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ declare namespace ts {
403403
hasTrailingComma?: boolean;
404404
}
405405
interface ModifiersArray extends NodeArray<Modifier> {
406-
flags: number;
406+
flags: NodeFlags;
407407
}
408408
interface Modifier extends Node {
409409
}
@@ -1437,6 +1437,7 @@ declare namespace ts {
14371437
BlockScoped = 418,
14381438
PropertyOrAccessor = 98308,
14391439
Export = 7340032,
1440+
ClassMember = 106500,
14401441
Classifiable = 788448,
14411442
}
14421443
interface Symbol {
@@ -1453,7 +1454,7 @@ declare namespace ts {
14531454
parent?: Symbol;
14541455
exportSymbol?: Symbol;
14551456
constEnumOnlyModule?: boolean;
1456-
hasReference?: boolean;
1457+
isReferenced?: boolean;
14571458
}
14581459
interface SymbolLinks {
14591460
target?: Symbol;
@@ -1734,6 +1735,7 @@ declare namespace ts {
17341735
declaration?: boolean;
17351736
declarationDir?: string;
17361737
diagnostics?: boolean;
1738+
disableSizeLimit?: boolean;
17371739
emitBOM?: boolean;
17381740
emitDecoratorMetadata?: boolean;
17391741
experimentalDecorators?: boolean;
@@ -1749,6 +1751,7 @@ declare namespace ts {
17491751
listFiles?: boolean;
17501752
locale?: string;
17511753
mapRoot?: string;
1754+
maxNodeModuleJsDepth?: number;
17521755
module?: ModuleKind;
17531756
moduleResolution?: ModuleResolutionKind;
17541757
newLine?: NewLineKind;
@@ -1787,7 +1790,6 @@ declare namespace ts {
17871790
suppressOutputPathCheck?: boolean;
17881791
target?: ScriptTarget;
17891792
traceResolution?: boolean;
1790-
disableSizeLimit?: boolean;
17911793
types?: string[];
17921794
typeRoots?: string[];
17931795
version?: boolean;
@@ -5752,6 +5754,12 @@ declare namespace ts {
57525754
key: string;
57535755
message: string;
57545756
};
5757+
File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: {
5758+
code: number;
5759+
category: DiagnosticCategory;
5760+
key: string;
5761+
message: string;
5762+
};
57555763
Concatenate_and_emit_output_to_single_file: {
57565764
code: number;
57575765
category: DiagnosticCategory;
@@ -6460,6 +6468,18 @@ declare namespace ts {
64606468
key: string;
64616469
message: string;
64626470
};
6471+
The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: {
6472+
code: number;
6473+
category: DiagnosticCategory;
6474+
key: string;
6475+
message: string;
6476+
};
6477+
No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: {
6478+
code: number;
6479+
category: DiagnosticCategory;
6480+
key: string;
6481+
message: string;
6482+
};
64636483
Variable_0_implicitly_has_an_1_type: {
64646484
code: number;
64656485
category: DiagnosticCategory;
@@ -6793,6 +6813,7 @@ declare namespace ts {
67936813
scanJsxToken(): SyntaxKind;
67946814
scanJSDocToken(): SyntaxKind;
67956815
scan(): SyntaxKind;
6816+
getText(): string;
67966817
setText(text: string, start?: number, length?: number): void;
67976818
setOnError(onError: ErrorCallback): void;
67986819
setScriptTarget(scriptTarget: ScriptTarget): void;
@@ -6815,6 +6836,7 @@ declare namespace ts {
68156836
};
68166837
function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
68176838
function isWhiteSpace(ch: number): boolean;
6839+
function isWhiteSpaceSingleLine(ch: number): boolean;
68186840
function isLineBreak(ch: number): boolean;
68196841
function isOctalDigit(ch: number): boolean;
68206842
function couldStartTrivia(text: string, pos: number): boolean;
@@ -6875,6 +6897,7 @@ declare namespace ts {
68756897
}
68766898
interface EmitHost extends ScriptReferenceHost {
68776899
getSourceFiles(): SourceFile[];
6900+
isSourceFileFromExternalLibrary(file: SourceFile): boolean;
68786901
getCommonSourceDirectory(): string;
68796902
getCanonicalFileName(fileName: string): string;
68806903
getNewLine(): string;
@@ -7341,6 +7364,7 @@ declare namespace ts.formatting {
73417364
readTokenInfo(n: Node): TokenInfo;
73427365
getCurrentLeadingTrivia(): TextRangeWithKind[];
73437366
lastTrailingTriviaWasNewLine(): boolean;
7367+
skipToEndOf(node: Node): void;
73447368
close(): void;
73457369
}
73467370
function getFormattingScanner(sourceFile: SourceFile, startPos: number, endPos: number): FormattingScanner;
@@ -7548,6 +7572,10 @@ declare namespace ts.formatting {
75487572
SpaceAfterTemplateHeadAndMiddle: Rule;
75497573
NoSpaceBeforeTemplateMiddleAndTail: Rule;
75507574
SpaceBeforeTemplateMiddleAndTail: Rule;
7575+
NoSpaceAfterOpenBraceInJsxExpression: Rule;
7576+
SpaceAfterOpenBraceInJsxExpression: Rule;
7577+
NoSpaceBeforeCloseBraceInJsxExpression: Rule;
7578+
SpaceBeforeCloseBraceInJsxExpression: Rule;
75517579
constructor();
75527580
static IsForContext(context: FormattingContext): boolean;
75537581
static IsNotForContext(context: FormattingContext): boolean;
@@ -7575,6 +7603,8 @@ declare namespace ts.formatting {
75757603
static IsNextTokenNotCloseBracket(context: FormattingContext): boolean;
75767604
static IsArrowFunctionContext(context: FormattingContext): boolean;
75777605
static IsNonJsxSameLineTokenContext(context: FormattingContext): boolean;
7606+
static isNonJsxElementContext(context: FormattingContext): boolean;
7607+
static isJsxExpressionContext(context: FormattingContext): boolean;
75787608
static IsNotBeforeBlockInFunctionDeclarationContext(context: FormattingContext): boolean;
75797609
static IsEndOfDecoratorContextOnSameLine(context: FormattingContext): boolean;
75807610
static NodeIsInDecoratorContext(node: Node): boolean;
@@ -7948,6 +7978,7 @@ declare namespace ts {
79487978
InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
79497979
InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
79507980
InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: boolean;
7981+
InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
79517982
PlaceOpenBraceOnNewLineForFunctions: boolean;
79527983
PlaceOpenBraceOnNewLineForControlBlocks: boolean;
79537984
[s: string]: boolean | number | string | undefined;
@@ -8763,6 +8794,7 @@ declare namespace ts {
87638794
getDocCommentTemplateAtPosition(fileName: string, position: number): string;
87648795
isValidBraceCompletionAtPosition(fileName: string, position: number, openingBrace: number): string;
87658796
getEmitOutput(fileName: string): string;
8797+
getEmitOutputObject(fileName: string): EmitOutput;
87668798
}
87678799
interface ClassifierShim extends Shim {
87688800
getEncodedLexicalClassifications(text: string, lexState: EndOfLineState, syntacticClassifierAbsent?: boolean): string;

0 commit comments

Comments
 (0)