Skip to content

Commit 288e38f

Browse files
committed
merge with master
2 parents ad42afc + 02fbc07 commit 288e38f

File tree

1,547 files changed

+94588
-8149
lines changed

Some content is hidden

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

1,547 files changed

+94588
-8149
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,4 @@ scripts/word2md.js
4343
scripts/ior.js
4444
scripts/*.js.map
4545
coverage/
46+
internal/

bin/tsc.js

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

bin/typescript.d.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,11 @@ declare module "typescript" {
283283
ThisNodeOrAnySubNodesHasError = 32,
284284
HasAggregatedChildData = 64,
285285
}
286+
const enum RelationComparisonResult {
287+
Succeeded = 1,
288+
Failed = 2,
289+
FailedAndReported = 3,
290+
}
286291
interface Node extends TextRange {
287292
kind: SyntaxKind;
288293
flags: NodeFlags;
@@ -994,11 +999,15 @@ declare module "typescript" {
994999
Union = 16384,
9951000
Anonymous = 32768,
9961001
FromSignature = 65536,
997-
Unwidened = 131072,
1002+
ObjectLiteral = 131072,
1003+
ContainsUndefinedOrNull = 262144,
1004+
ContainsObjectLiteral = 524288,
9981005
Intrinsic = 127,
1006+
Primitive = 510,
9991007
StringLike = 258,
10001008
NumberLike = 132,
10011009
ObjectType = 48128,
1010+
RequiresWidening = 786432,
10021011
}
10031012
interface Type {
10041013
flags: TypeFlags;
@@ -1123,6 +1132,7 @@ declare module "typescript" {
11231132
diagnostics?: boolean;
11241133
emitBOM?: boolean;
11251134
help?: boolean;
1135+
listFiles?: boolean;
11261136
locale?: string;
11271137
mapRoot?: string;
11281138
module?: ModuleKind;
@@ -1136,6 +1146,7 @@ declare module "typescript" {
11361146
out?: string;
11371147
outDir?: string;
11381148
preserveConstEnums?: boolean;
1149+
project?: string;
11391150
removeComments?: boolean;
11401151
sourceMap?: boolean;
11411152
sourceRoot?: string;
@@ -1168,6 +1179,7 @@ declare module "typescript" {
11681179
interface CommandLineOption {
11691180
name: string;
11701181
type: string | Map<number>;
1182+
isFilePath?: boolean;
11711183
shortName?: string;
11721184
description?: DiagnosticMessage;
11731185
paramType?: DiagnosticMessage;
@@ -1428,6 +1440,7 @@ declare module "typescript" {
14281440
isOpen: boolean;
14291441
version: string;
14301442
scriptSnapshot: IScriptSnapshot;
1443+
nameTable: Map<string>;
14311444
getNamedDeclarations(): Declaration[];
14321445
}
14331446
/**
@@ -1470,6 +1483,7 @@ declare module "typescript" {
14701483
}
14711484
interface LanguageServiceHost extends Logger {
14721485
getCompilationSettings(): CompilerOptions;
1486+
getNewLine?(): string;
14731487
getScriptFileNames(): string[];
14741488
getScriptVersion(fileName: string): string;
14751489
getScriptIsOpen(fileName: string): boolean;

bin/typescriptServices.d.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,11 @@ declare module ts {
283283
ThisNodeOrAnySubNodesHasError = 32,
284284
HasAggregatedChildData = 64,
285285
}
286+
const enum RelationComparisonResult {
287+
Succeeded = 1,
288+
Failed = 2,
289+
FailedAndReported = 3,
290+
}
286291
interface Node extends TextRange {
287292
kind: SyntaxKind;
288293
flags: NodeFlags;
@@ -994,11 +999,15 @@ declare module ts {
994999
Union = 16384,
9951000
Anonymous = 32768,
9961001
FromSignature = 65536,
997-
Unwidened = 131072,
1002+
ObjectLiteral = 131072,
1003+
ContainsUndefinedOrNull = 262144,
1004+
ContainsObjectLiteral = 524288,
9981005
Intrinsic = 127,
1006+
Primitive = 510,
9991007
StringLike = 258,
10001008
NumberLike = 132,
10011009
ObjectType = 48128,
1010+
RequiresWidening = 786432,
10021011
}
10031012
interface Type {
10041013
flags: TypeFlags;
@@ -1123,6 +1132,7 @@ declare module ts {
11231132
diagnostics?: boolean;
11241133
emitBOM?: boolean;
11251134
help?: boolean;
1135+
listFiles?: boolean;
11261136
locale?: string;
11271137
mapRoot?: string;
11281138
module?: ModuleKind;
@@ -1136,6 +1146,7 @@ declare module ts {
11361146
out?: string;
11371147
outDir?: string;
11381148
preserveConstEnums?: boolean;
1149+
project?: string;
11391150
removeComments?: boolean;
11401151
sourceMap?: boolean;
11411152
sourceRoot?: string;
@@ -1168,6 +1179,7 @@ declare module ts {
11681179
interface CommandLineOption {
11691180
name: string;
11701181
type: string | Map<number>;
1182+
isFilePath?: boolean;
11711183
shortName?: string;
11721184
description?: DiagnosticMessage;
11731185
paramType?: DiagnosticMessage;
@@ -1428,6 +1440,7 @@ declare module ts {
14281440
isOpen: boolean;
14291441
version: string;
14301442
scriptSnapshot: IScriptSnapshot;
1443+
nameTable: Map<string>;
14311444
getNamedDeclarations(): Declaration[];
14321445
}
14331446
/**
@@ -1470,6 +1483,7 @@ declare module ts {
14701483
}
14711484
interface LanguageServiceHost extends Logger {
14721485
getCompilationSettings(): CompilerOptions;
1486+
getNewLine?(): string;
14731487
getScriptFileNames(): string[];
14741488
getScriptVersion(fileName: string): string;
14751489
getScriptIsOpen(fileName: string): boolean;

0 commit comments

Comments
 (0)