Skip to content

Commit e01ea0e

Browse files
committed
Merge branch 'release-2.3' of https://github.com/Microsoft/TypeScript into release-2.3
2 parents 930e4c5 + 4dc00a2 commit e01ea0e

File tree

222 files changed

+8095
-3133
lines changed

Some content is hidden

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

222 files changed

+8095
-3133
lines changed

debug.log

Lines changed: 0 additions & 8 deletions
This file was deleted.

lib/tsc.js

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

lib/tsserver.js

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

lib/tsserverlibrary.d.ts

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,11 @@ declare namespace ts {
482482
type DeclarationName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | BindingPattern;
483483
interface Declaration extends Node {
484484
_declarationBrand: any;
485+
}
486+
interface NamedDeclaration extends Declaration {
485487
name?: DeclarationName;
486488
}
487-
interface DeclarationStatement extends Declaration, Statement {
489+
interface DeclarationStatement extends NamedDeclaration, Statement {
488490
name?: Identifier | StringLiteral | NumericLiteral;
489491
}
490492
interface ComputedPropertyName extends Node {
@@ -495,15 +497,15 @@ declare namespace ts {
495497
kind: SyntaxKind.Decorator;
496498
expression: LeftHandSideExpression;
497499
}
498-
interface TypeParameterDeclaration extends Declaration {
500+
interface TypeParameterDeclaration extends NamedDeclaration {
499501
kind: SyntaxKind.TypeParameter;
500502
parent?: DeclarationWithTypeParameters;
501503
name: Identifier;
502504
constraint?: TypeNode;
503505
default?: TypeNode;
504506
expression?: Expression;
505507
}
506-
interface SignatureDeclaration extends Declaration {
508+
interface SignatureDeclaration extends NamedDeclaration {
507509
name?: PropertyName;
508510
typeParameters?: NodeArray<TypeParameterDeclaration>;
509511
parameters: NodeArray<ParameterDeclaration>;
@@ -516,7 +518,7 @@ declare namespace ts {
516518
kind: SyntaxKind.ConstructSignature;
517519
}
518520
type BindingName = Identifier | BindingPattern;
519-
interface VariableDeclaration extends Declaration {
521+
interface VariableDeclaration extends NamedDeclaration {
520522
kind: SyntaxKind.VariableDeclaration;
521523
parent?: VariableDeclarationList | CatchClause;
522524
name: BindingName;
@@ -528,7 +530,7 @@ declare namespace ts {
528530
parent?: VariableStatement | ForStatement | ForOfStatement | ForInStatement;
529531
declarations: NodeArray<VariableDeclaration>;
530532
}
531-
interface ParameterDeclaration extends Declaration {
533+
interface ParameterDeclaration extends NamedDeclaration {
532534
kind: SyntaxKind.Parameter;
533535
parent?: SignatureDeclaration;
534536
dotDotDotToken?: DotDotDotToken;
@@ -537,7 +539,7 @@ declare namespace ts {
537539
type?: TypeNode;
538540
initializer?: Expression;
539541
}
540-
interface BindingElement extends Declaration {
542+
interface BindingElement extends NamedDeclaration {
541543
kind: SyntaxKind.BindingElement;
542544
parent?: BindingPattern;
543545
propertyName?: PropertyName;
@@ -559,7 +561,7 @@ declare namespace ts {
559561
type?: TypeNode;
560562
initializer?: Expression;
561563
}
562-
interface ObjectLiteralElement extends Declaration {
564+
interface ObjectLiteralElement extends NamedDeclaration {
563565
_objectLiteralBrandBrand: any;
564566
name?: PropertyName;
565567
}
@@ -581,15 +583,15 @@ declare namespace ts {
581583
kind: SyntaxKind.SpreadAssignment;
582584
expression: Expression;
583585
}
584-
interface VariableLikeDeclaration extends Declaration {
586+
interface VariableLikeDeclaration extends NamedDeclaration {
585587
propertyName?: PropertyName;
586588
dotDotDotToken?: DotDotDotToken;
587589
name: DeclarationName;
588590
questionToken?: QuestionToken;
589591
type?: TypeNode;
590592
initializer?: Expression;
591593
}
592-
interface PropertyLikeDeclaration extends Declaration {
594+
interface PropertyLikeDeclaration extends NamedDeclaration {
593595
name: PropertyName;
594596
}
595597
interface ObjectBindingPattern extends Node {
@@ -926,7 +928,7 @@ declare namespace ts {
926928
}
927929
type EntityNameExpression = Identifier | PropertyAccessEntityNameExpression | ParenthesizedExpression;
928930
type EntityNameOrEntityNameExpression = EntityName | EntityNameExpression;
929-
interface PropertyAccessExpression extends MemberExpression, Declaration {
931+
interface PropertyAccessExpression extends MemberExpression, NamedDeclaration {
930932
kind: SyntaxKind.PropertyAccessExpression;
931933
expression: LeftHandSideExpression;
932934
name: Identifier;
@@ -1172,7 +1174,7 @@ declare namespace ts {
11721174
block: Block;
11731175
}
11741176
type DeclarationWithTypeParameters = SignatureDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration;
1175-
interface ClassLikeDeclaration extends Declaration {
1177+
interface ClassLikeDeclaration extends NamedDeclaration {
11761178
name?: Identifier;
11771179
typeParameters?: NodeArray<TypeParameterDeclaration>;
11781180
heritageClauses?: NodeArray<HeritageClause>;
@@ -1185,11 +1187,11 @@ declare namespace ts {
11851187
interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
11861188
kind: SyntaxKind.ClassExpression;
11871189
}
1188-
interface ClassElement extends Declaration {
1190+
interface ClassElement extends NamedDeclaration {
11891191
_classElementBrand: any;
11901192
name?: PropertyName;
11911193
}
1192-
interface TypeElement extends Declaration {
1194+
interface TypeElement extends NamedDeclaration {
11931195
_typeElementBrand: any;
11941196
name?: PropertyName;
11951197
questionToken?: QuestionToken;
@@ -1213,7 +1215,7 @@ declare namespace ts {
12131215
typeParameters?: NodeArray<TypeParameterDeclaration>;
12141216
type: TypeNode;
12151217
}
1216-
interface EnumMember extends Declaration {
1218+
interface EnumMember extends NamedDeclaration {
12171219
kind: SyntaxKind.EnumMember;
12181220
parent?: EnumDeclaration;
12191221
name: PropertyName;
@@ -1266,13 +1268,13 @@ declare namespace ts {
12661268
moduleSpecifier: Expression;
12671269
}
12681270
type NamedImportBindings = NamespaceImport | NamedImports;
1269-
interface ImportClause extends Declaration {
1271+
interface ImportClause extends NamedDeclaration {
12701272
kind: SyntaxKind.ImportClause;
12711273
parent?: ImportDeclaration;
12721274
name?: Identifier;
12731275
namedBindings?: NamedImportBindings;
12741276
}
1275-
interface NamespaceImport extends Declaration {
1277+
interface NamespaceImport extends NamedDeclaration {
12761278
kind: SyntaxKind.NamespaceImport;
12771279
parent?: ImportClause;
12781280
name: Identifier;
@@ -1298,13 +1300,13 @@ declare namespace ts {
12981300
elements: NodeArray<ExportSpecifier>;
12991301
}
13001302
type NamedImportsOrExports = NamedImports | NamedExports;
1301-
interface ImportSpecifier extends Declaration {
1303+
interface ImportSpecifier extends NamedDeclaration {
13021304
kind: SyntaxKind.ImportSpecifier;
13031305
parent?: NamedImports;
13041306
propertyName?: Identifier;
13051307
name: Identifier;
13061308
}
1307-
interface ExportSpecifier extends Declaration {
1309+
interface ExportSpecifier extends NamedDeclaration {
13081310
kind: SyntaxKind.ExportSpecifier;
13091311
parent?: NamedExports;
13101312
propertyName?: Identifier;
@@ -1435,7 +1437,7 @@ declare namespace ts {
14351437
kind: SyntaxKind.JSDocTypeTag;
14361438
typeExpression: JSDocTypeExpression;
14371439
}
1438-
interface JSDocTypedefTag extends JSDocTag, Declaration {
1440+
interface JSDocTypedefTag extends JSDocTag, NamedDeclaration {
14391441
kind: SyntaxKind.JSDocTypedefTag;
14401442
fullName?: JSDocNamespaceDeclaration | Identifier;
14411443
name?: Identifier;
@@ -2195,14 +2197,15 @@ declare namespace ts {
21952197
HelperName = 4096,
21962198
ExportName = 8192,
21972199
LocalName = 16384,
2198-
Indented = 32768,
2199-
NoIndentation = 65536,
2200-
AsyncFunctionBody = 131072,
2201-
ReuseTempVariableScope = 262144,
2202-
CustomPrologue = 524288,
2203-
NoHoisting = 1048576,
2204-
HasEndOfDeclarationMarker = 2097152,
2205-
Iterator = 4194304,
2200+
InternalName = 32768,
2201+
Indented = 65536,
2202+
NoIndentation = 131072,
2203+
AsyncFunctionBody = 262144,
2204+
ReuseTempVariableScope = 524288,
2205+
CustomPrologue = 1048576,
2206+
NoHoisting = 2097152,
2207+
HasEndOfDeclarationMarker = 4194304,
2208+
Iterator = 8388608,
22062209
}
22072210
interface EmitHelper {
22082211
readonly name: string;
@@ -2271,7 +2274,7 @@ declare namespace ts {
22712274
}
22722275
}
22732276
declare namespace ts {
2274-
const version = "2.3.1";
2277+
const version = "2.3.3";
22752278
}
22762279
declare function setTimeout(handler: (...args: any[]) => void, timeout: number): any;
22772280
declare function clearTimeout(handle: any): void;
@@ -4483,6 +4486,7 @@ declare namespace ts.server {
44834486
protected logger: Logger;
44844487
private canUseEvents;
44854488
constructor(opts: SessionOptions);
4489+
constructor(host: ServerHost, cancellationToken: ServerCancellationToken, useSingleInferredProject: boolean, typingsInstaller: ITypingsInstaller, byteLength: (buf: string, encoding?: string) => number, hrtime: (start?: number[]) => number[], logger: server.Logger, canUseEvents: boolean, eventHandler?: ProjectServiceEventHandler, throttleWaitMilliseconds?: number);
44864490
private sendRequestCompletedEvent(requestId);
44874491
private defaultEventHandler(event);
44884492
logError(err: Error, cmd: string): void;

0 commit comments

Comments
 (0)