Skip to content

Commit 7c397a5

Browse files
committed
Bump version to 3.1.7 and LKG
1 parent 84485ed commit 7c397a5

File tree

8 files changed

+101
-8
lines changed

8 files changed

+101
-8
lines changed

lib/tsc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
6060
var ts;
6161
(function (ts) {
6262
ts.versionMajorMinor = "3.1";
63-
ts.version = ts.versionMajorMinor + ".6";
63+
ts.version = ts.versionMajorMinor + ".7";
6464
})(ts || (ts = {}));
6565
(function (ts) {
6666
ts.emptyArray = [];

lib/tsserver.js

+22-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var ts;
8888
// If changing the text in this section, be sure to test `configureNightly` too.
8989
ts.versionMajorMinor = "3.1";
9090
/** The version of the TypeScript compiler release */
91-
ts.version = ts.versionMajorMinor + ".6";
91+
ts.version = ts.versionMajorMinor + ".7";
9292
})(ts || (ts = {}));
9393
(function (ts) {
9494
/* @internal */
@@ -11130,9 +11130,11 @@ var ts;
1113011130
secondAccessor = member;
1113111131
}
1113211132
if (member.kind === 156 /* GetAccessor */ && !getAccessor) {
11133+
// tslint:disable-next-line no-unnecessary-type-assertion
1113311134
getAccessor = member;
1113411135
}
1113511136
if (member.kind === 157 /* SetAccessor */ && !setAccessor) {
11137+
// tslint:disable-next-line no-unnecessary-type-assertion
1113611138
setAccessor = member;
1113711139
}
1113811140
}
@@ -22684,12 +22686,15 @@ var ts;
2268422686
context.hasNoDefaultLib = true;
2268522687
}
2268622688
else if (arg.arguments.types) {
22689+
// tslint:disable-next-line no-unnecessary-type-assertion
2268722690
typeReferenceDirectives_1.push({ pos: arg.arguments.types.pos, end: arg.arguments.types.end, fileName: arg.arguments.types.value });
2268822691
}
2268922692
else if (arg.arguments.lib) {
22693+
// tslint:disable-next-line no-unnecessary-type-assertion
2269022694
libReferenceDirectives_1.push({ pos: arg.arguments.lib.pos, end: arg.arguments.lib.end, fileName: arg.arguments.lib.value });
2269122695
}
2269222696
else if (arg.arguments.path) {
22697+
// tslint:disable-next-line no-unnecessary-type-assertion
2269322698
referencedFiles_1.push({ pos: arg.arguments.path.pos, end: arg.arguments.path.end, fileName: arg.arguments.path.value });
2269422699
}
2269522700
else {
@@ -28932,6 +28937,7 @@ var ts;
2893228937
// If this is a property-parameter, then also declare the property symbol into the
2893328938
// containing class.
2893428939
if (ts.isParameterPropertyDeclaration(node)) {
28940+
// tslint:disable-next-line no-unnecessary-type-assertion
2893528941
var classDeclaration = node.parent.parent;
2893628942
declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
2893728943
}
@@ -38616,6 +38622,7 @@ var ts;
3861638622
break;
3861738623
}
3861838624
}
38625+
// tslint:disable-next-line no-unnecessary-type-assertion
3861938626
return links.resolvedType; // TODO: GH#18217
3862038627
}
3862138628
function createIndexedAccessType(objectType, indexType) {
@@ -53033,7 +53040,9 @@ var ts;
5303353040
if (node.kind === 235 /* VariableDeclaration */ || node.kind === 184 /* BindingElement */) {
5303453041
checkVarDeclaredNamesNotShadowed(node);
5303553042
}
53043+
// tslint:disable-next-line no-unnecessary-type-assertion
5303653044
checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
53045+
// tslint:disable-next-line no-unnecessary-type-assertion
5303753046
checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
5303853047
}
5303953048
}
@@ -57180,9 +57189,11 @@ var ts;
5718057189
node.kind === 194 /* FunctionExpression */ ||
5718157190
node.kind === 154 /* MethodDeclaration */);
5718257191
if (node.flags & 4194304 /* Ambient */) {
57192+
// tslint:disable-next-line no-unnecessary-type-assertion
5718357193
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
5718457194
}
5718557195
if (!node.body) {
57196+
// tslint:disable-next-line no-unnecessary-type-assertion
5718657197
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
5718757198
}
5718857199
}
@@ -57219,6 +57230,7 @@ var ts;
5721957230
}
5722057231
// Modifiers are never allowed on properties except for 'async' on a method declaration
5722157232
if (prop.modifiers) {
57233+
// tslint:disable-next-line no-unnecessary-type-assertion
5722257234
for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
5722357235
var mod = _c[_b];
5722457236
if (mod.kind !== 120 /* AsyncKeyword */ || prop.kind !== 154 /* MethodDeclaration */) {
@@ -57566,13 +57578,16 @@ var ts;
5756657578
var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
5756757579
if (isConstOrReadonly && !node.type) {
5756857580
if (isInvalidInitializer) {
57581+
// tslint:disable-next-line no-unnecessary-type-assertion
5756957582
return grammarErrorOnNode(node.initializer, ts.Diagnostics.A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_reference);
5757057583
}
5757157584
}
5757257585
else {
57586+
// tslint:disable-next-line no-unnecessary-type-assertion
5757357587
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
5757457588
}
5757557589
if (!isConstOrReadonly || isInvalidInitializer) {
57590+
// tslint:disable-next-line no-unnecessary-type-assertion
5757657591
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
5757757592
}
5757857593
}
@@ -80492,6 +80507,7 @@ var ts;
8049280507
ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
8049380508
printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], /* bundleInfopath*/ undefined, declarationPrinter, declarationSourceMap);
8049480509
if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 277 /* SourceFile */) {
80510+
// tslint:disable-next-line no-unnecessary-type-assertion
8049580511
var sourceFile = declarationTransform.transformed[0];
8049680512
exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
8049780513
}
@@ -86828,6 +86844,7 @@ var ts;
8682886844
if (useOldState) {
8682986845
// Verify the sanity of old state
8683086846
if (!oldState.currentChangedFilePath) {
86847+
// tslint:disable-next-line no-unnecessary-type-assertion
8683186848
ts.Debug.assert(!oldState.affectedFiles && (!oldState.currentAffectedFilesSignatures || !oldState.currentAffectedFilesSignatures.size), "Cannot reuse if only few affected files of currentChangedFile were iterated");
8683286849
}
8683386850
if (canCopySemanticDiagnostics) {
@@ -118935,6 +118952,10 @@ var ts;
118935118952
Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
118936118953
var _this = this;
118937118954
this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
118955+
if (ts.parsePackageName(pluginConfigEntry.name).rest) {
118956+
this.projectService.logger.info("kipped loading plugin " + pluginConfigEntry.name + " because only package name is allowed plugin name");
118957+
return;
118958+
}
118938118959
var log = function (message) {
118939118960
_this.projectService.logger.info(message);
118940118961
};

lib/tsserverlibrary.js

+22-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ var ts;
8484
// If changing the text in this section, be sure to test `configureNightly` too.
8585
ts.versionMajorMinor = "3.1";
8686
/** The version of the TypeScript compiler release */
87-
ts.version = ts.versionMajorMinor + ".6";
87+
ts.version = ts.versionMajorMinor + ".7";
8888
})(ts || (ts = {}));
8989
(function (ts) {
9090
/* @internal */
@@ -11126,9 +11126,11 @@ var ts;
1112611126
secondAccessor = member;
1112711127
}
1112811128
if (member.kind === 156 /* GetAccessor */ && !getAccessor) {
11129+
// tslint:disable-next-line no-unnecessary-type-assertion
1112911130
getAccessor = member;
1113011131
}
1113111132
if (member.kind === 157 /* SetAccessor */ && !setAccessor) {
11133+
// tslint:disable-next-line no-unnecessary-type-assertion
1113211134
setAccessor = member;
1113311135
}
1113411136
}
@@ -22680,12 +22682,15 @@ var ts;
2268022682
context.hasNoDefaultLib = true;
2268122683
}
2268222684
else if (arg.arguments.types) {
22685+
// tslint:disable-next-line no-unnecessary-type-assertion
2268322686
typeReferenceDirectives_1.push({ pos: arg.arguments.types.pos, end: arg.arguments.types.end, fileName: arg.arguments.types.value });
2268422687
}
2268522688
else if (arg.arguments.lib) {
22689+
// tslint:disable-next-line no-unnecessary-type-assertion
2268622690
libReferenceDirectives_1.push({ pos: arg.arguments.lib.pos, end: arg.arguments.lib.end, fileName: arg.arguments.lib.value });
2268722691
}
2268822692
else if (arg.arguments.path) {
22693+
// tslint:disable-next-line no-unnecessary-type-assertion
2268922694
referencedFiles_1.push({ pos: arg.arguments.path.pos, end: arg.arguments.path.end, fileName: arg.arguments.path.value });
2269022695
}
2269122696
else {
@@ -28928,6 +28933,7 @@ var ts;
2892828933
// If this is a property-parameter, then also declare the property symbol into the
2892928934
// containing class.
2893028935
if (ts.isParameterPropertyDeclaration(node)) {
28936+
// tslint:disable-next-line no-unnecessary-type-assertion
2893128937
var classDeclaration = node.parent.parent;
2893228938
declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
2893328939
}
@@ -38612,6 +38618,7 @@ var ts;
3861238618
break;
3861338619
}
3861438620
}
38621+
// tslint:disable-next-line no-unnecessary-type-assertion
3861538622
return links.resolvedType; // TODO: GH#18217
3861638623
}
3861738624
function createIndexedAccessType(objectType, indexType) {
@@ -53029,7 +53036,9 @@ var ts;
5302953036
if (node.kind === 235 /* VariableDeclaration */ || node.kind === 184 /* BindingElement */) {
5303053037
checkVarDeclaredNamesNotShadowed(node);
5303153038
}
53039+
// tslint:disable-next-line no-unnecessary-type-assertion
5303253040
checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
53041+
// tslint:disable-next-line no-unnecessary-type-assertion
5303353042
checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
5303453043
}
5303553044
}
@@ -57176,9 +57185,11 @@ var ts;
5717657185
node.kind === 194 /* FunctionExpression */ ||
5717757186
node.kind === 154 /* MethodDeclaration */);
5717857187
if (node.flags & 4194304 /* Ambient */) {
57188+
// tslint:disable-next-line no-unnecessary-type-assertion
5717957189
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
5718057190
}
5718157191
if (!node.body) {
57192+
// tslint:disable-next-line no-unnecessary-type-assertion
5718257193
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
5718357194
}
5718457195
}
@@ -57215,6 +57226,7 @@ var ts;
5721557226
}
5721657227
// Modifiers are never allowed on properties except for 'async' on a method declaration
5721757228
if (prop.modifiers) {
57229+
// tslint:disable-next-line no-unnecessary-type-assertion
5721857230
for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
5721957231
var mod = _c[_b];
5722057232
if (mod.kind !== 120 /* AsyncKeyword */ || prop.kind !== 154 /* MethodDeclaration */) {
@@ -57562,13 +57574,16 @@ var ts;
5756257574
var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
5756357575
if (isConstOrReadonly && !node.type) {
5756457576
if (isInvalidInitializer) {
57577+
// tslint:disable-next-line no-unnecessary-type-assertion
5756557578
return grammarErrorOnNode(node.initializer, ts.Diagnostics.A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_reference);
5756657579
}
5756757580
}
5756857581
else {
57582+
// tslint:disable-next-line no-unnecessary-type-assertion
5756957583
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
5757057584
}
5757157585
if (!isConstOrReadonly || isInvalidInitializer) {
57586+
// tslint:disable-next-line no-unnecessary-type-assertion
5757257587
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
5757357588
}
5757457589
}
@@ -80488,6 +80503,7 @@ var ts;
8048880503
ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
8048980504
printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], /* bundleInfopath*/ undefined, declarationPrinter, declarationSourceMap);
8049080505
if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 277 /* SourceFile */) {
80506+
// tslint:disable-next-line no-unnecessary-type-assertion
8049180507
var sourceFile = declarationTransform.transformed[0];
8049280508
exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
8049380509
}
@@ -86824,6 +86840,7 @@ var ts;
8682486840
if (useOldState) {
8682586841
// Verify the sanity of old state
8682686842
if (!oldState.currentChangedFilePath) {
86843+
// tslint:disable-next-line no-unnecessary-type-assertion
8682786844
ts.Debug.assert(!oldState.affectedFiles && (!oldState.currentAffectedFilesSignatures || !oldState.currentAffectedFilesSignatures.size), "Cannot reuse if only few affected files of currentChangedFile were iterated");
8682886845
}
8682986846
if (canCopySemanticDiagnostics) {
@@ -119109,6 +119126,10 @@ var ts;
119109119126
Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
119110119127
var _this = this;
119111119128
this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
119129+
if (ts.parsePackageName(pluginConfigEntry.name).rest) {
119130+
this.projectService.logger.info("kipped loading plugin " + pluginConfigEntry.name + " because only package name is allowed plugin name");
119131+
return;
119132+
}
119112119133
var log = function (message) {
119113119134
_this.projectService.logger.info(message);
119114119135
};

0 commit comments

Comments
 (0)