Skip to content

Commit

Permalink
Bump version to 3.1.7 and LKG
Browse files Browse the repository at this point in the history
  • Loading branch information
minestarks committed Jan 5, 2021
1 parent 84485ed commit 7c397a5
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 8 deletions.
2 changes: 1 addition & 1 deletion lib/tsc.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cook
var ts;
(function (ts) {
ts.versionMajorMinor = "3.1";
ts.version = ts.versionMajorMinor + ".6";
ts.version = ts.versionMajorMinor + ".7";
})(ts || (ts = {}));
(function (ts) {
ts.emptyArray = [];
Expand Down
23 changes: 22 additions & 1 deletion lib/tsserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "3.1";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".6";
ts.version = ts.versionMajorMinor + ".7";
})(ts || (ts = {}));
(function (ts) {
/* @internal */
Expand Down Expand Up @@ -11130,9 +11130,11 @@ var ts;
secondAccessor = member;
}
if (member.kind === 156 /* GetAccessor */ && !getAccessor) {
// tslint:disable-next-line no-unnecessary-type-assertion
getAccessor = member;
}
if (member.kind === 157 /* SetAccessor */ && !setAccessor) {
// tslint:disable-next-line no-unnecessary-type-assertion
setAccessor = member;
}
}
Expand Down Expand Up @@ -22684,12 +22686,15 @@ var ts;
context.hasNoDefaultLib = true;
}
else if (arg.arguments.types) {
// tslint:disable-next-line no-unnecessary-type-assertion
typeReferenceDirectives_1.push({ pos: arg.arguments.types.pos, end: arg.arguments.types.end, fileName: arg.arguments.types.value });
}
else if (arg.arguments.lib) {
// tslint:disable-next-line no-unnecessary-type-assertion
libReferenceDirectives_1.push({ pos: arg.arguments.lib.pos, end: arg.arguments.lib.end, fileName: arg.arguments.lib.value });
}
else if (arg.arguments.path) {
// tslint:disable-next-line no-unnecessary-type-assertion
referencedFiles_1.push({ pos: arg.arguments.path.pos, end: arg.arguments.path.end, fileName: arg.arguments.path.value });
}
else {
Expand Down Expand Up @@ -28932,6 +28937,7 @@ var ts;
// If this is a property-parameter, then also declare the property symbol into the
// containing class.
if (ts.isParameterPropertyDeclaration(node)) {
// tslint:disable-next-line no-unnecessary-type-assertion
var classDeclaration = node.parent.parent;
declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
}
Expand Down Expand Up @@ -38616,6 +38622,7 @@ var ts;
break;
}
}
// tslint:disable-next-line no-unnecessary-type-assertion
return links.resolvedType; // TODO: GH#18217
}
function createIndexedAccessType(objectType, indexType) {
Expand Down Expand Up @@ -53033,7 +53040,9 @@ var ts;
if (node.kind === 235 /* VariableDeclaration */ || node.kind === 184 /* BindingElement */) {
checkVarDeclaredNamesNotShadowed(node);
}
// tslint:disable-next-line no-unnecessary-type-assertion
checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
// tslint:disable-next-line no-unnecessary-type-assertion
checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
}
}
Expand Down Expand Up @@ -57180,9 +57189,11 @@ var ts;
node.kind === 194 /* FunctionExpression */ ||
node.kind === 154 /* MethodDeclaration */);
if (node.flags & 4194304 /* Ambient */) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
}
if (!node.body) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
}
}
Expand Down Expand Up @@ -57219,6 +57230,7 @@ var ts;
}
// Modifiers are never allowed on properties except for 'async' on a method declaration
if (prop.modifiers) {
// tslint:disable-next-line no-unnecessary-type-assertion
for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
var mod = _c[_b];
if (mod.kind !== 120 /* AsyncKeyword */ || prop.kind !== 154 /* MethodDeclaration */) {
Expand Down Expand Up @@ -57566,13 +57578,16 @@ var ts;
var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
if (isConstOrReadonly && !node.type) {
if (isInvalidInitializer) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.initializer, ts.Diagnostics.A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_reference);
}
}
else {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
}
if (!isConstOrReadonly || isInvalidInitializer) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
}
}
Expand Down Expand Up @@ -80492,6 +80507,7 @@ var ts;
ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], /* bundleInfopath*/ undefined, declarationPrinter, declarationSourceMap);
if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 277 /* SourceFile */) {
// tslint:disable-next-line no-unnecessary-type-assertion
var sourceFile = declarationTransform.transformed[0];
exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
}
Expand Down Expand Up @@ -86828,6 +86844,7 @@ var ts;
if (useOldState) {
// Verify the sanity of old state
if (!oldState.currentChangedFilePath) {
// tslint:disable-next-line no-unnecessary-type-assertion
ts.Debug.assert(!oldState.affectedFiles && (!oldState.currentAffectedFilesSignatures || !oldState.currentAffectedFilesSignatures.size), "Cannot reuse if only few affected files of currentChangedFile were iterated");
}
if (canCopySemanticDiagnostics) {
Expand Down Expand Up @@ -118935,6 +118952,10 @@ var ts;
Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
var _this = this;
this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
if (ts.parsePackageName(pluginConfigEntry.name).rest) {
this.projectService.logger.info("kipped loading plugin " + pluginConfigEntry.name + " because only package name is allowed plugin name");
return;
}
var log = function (message) {
_this.projectService.logger.info(message);
};
Expand Down
23 changes: 22 additions & 1 deletion lib/tsserverlibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ var ts;
// If changing the text in this section, be sure to test `configureNightly` too.
ts.versionMajorMinor = "3.1";
/** The version of the TypeScript compiler release */
ts.version = ts.versionMajorMinor + ".6";
ts.version = ts.versionMajorMinor + ".7";
})(ts || (ts = {}));
(function (ts) {
/* @internal */
Expand Down Expand Up @@ -11126,9 +11126,11 @@ var ts;
secondAccessor = member;
}
if (member.kind === 156 /* GetAccessor */ && !getAccessor) {
// tslint:disable-next-line no-unnecessary-type-assertion
getAccessor = member;
}
if (member.kind === 157 /* SetAccessor */ && !setAccessor) {
// tslint:disable-next-line no-unnecessary-type-assertion
setAccessor = member;
}
}
Expand Down Expand Up @@ -22680,12 +22682,15 @@ var ts;
context.hasNoDefaultLib = true;
}
else if (arg.arguments.types) {
// tslint:disable-next-line no-unnecessary-type-assertion
typeReferenceDirectives_1.push({ pos: arg.arguments.types.pos, end: arg.arguments.types.end, fileName: arg.arguments.types.value });
}
else if (arg.arguments.lib) {
// tslint:disable-next-line no-unnecessary-type-assertion
libReferenceDirectives_1.push({ pos: arg.arguments.lib.pos, end: arg.arguments.lib.end, fileName: arg.arguments.lib.value });
}
else if (arg.arguments.path) {
// tslint:disable-next-line no-unnecessary-type-assertion
referencedFiles_1.push({ pos: arg.arguments.path.pos, end: arg.arguments.path.end, fileName: arg.arguments.path.value });
}
else {
Expand Down Expand Up @@ -28928,6 +28933,7 @@ var ts;
// If this is a property-parameter, then also declare the property symbol into the
// containing class.
if (ts.isParameterPropertyDeclaration(node)) {
// tslint:disable-next-line no-unnecessary-type-assertion
var classDeclaration = node.parent.parent;
declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */ | (node.questionToken ? 16777216 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
}
Expand Down Expand Up @@ -38612,6 +38618,7 @@ var ts;
break;
}
}
// tslint:disable-next-line no-unnecessary-type-assertion
return links.resolvedType; // TODO: GH#18217
}
function createIndexedAccessType(objectType, indexType) {
Expand Down Expand Up @@ -53029,7 +53036,9 @@ var ts;
if (node.kind === 235 /* VariableDeclaration */ || node.kind === 184 /* BindingElement */) {
checkVarDeclaredNamesNotShadowed(node);
}
// tslint:disable-next-line no-unnecessary-type-assertion
checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
// tslint:disable-next-line no-unnecessary-type-assertion
checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
}
}
Expand Down Expand Up @@ -57176,9 +57185,11 @@ var ts;
node.kind === 194 /* FunctionExpression */ ||
node.kind === 154 /* MethodDeclaration */);
if (node.flags & 4194304 /* Ambient */) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
}
if (!node.body) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
}
}
Expand Down Expand Up @@ -57215,6 +57226,7 @@ var ts;
}
// Modifiers are never allowed on properties except for 'async' on a method declaration
if (prop.modifiers) {
// tslint:disable-next-line no-unnecessary-type-assertion
for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
var mod = _c[_b];
if (mod.kind !== 120 /* AsyncKeyword */ || prop.kind !== 154 /* MethodDeclaration */) {
Expand Down Expand Up @@ -57562,13 +57574,16 @@ var ts;
var isConstOrReadonly = ts.isDeclarationReadonly(node) || ts.isVariableDeclaration(node) && ts.isVarConst(node);
if (isConstOrReadonly && !node.type) {
if (isInvalidInitializer) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.initializer, ts.Diagnostics.A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_reference);
}
}
else {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
}
if (!isConstOrReadonly || isInvalidInitializer) {
// tslint:disable-next-line no-unnecessary-type-assertion
return grammarErrorOnNode(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
}
}
Expand Down Expand Up @@ -80488,6 +80503,7 @@ var ts;
ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], /* bundleInfopath*/ undefined, declarationPrinter, declarationSourceMap);
if (emitOnlyDtsFiles && declarationTransform.transformed[0].kind === 277 /* SourceFile */) {
// tslint:disable-next-line no-unnecessary-type-assertion
var sourceFile = declarationTransform.transformed[0];
exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
}
Expand Down Expand Up @@ -86824,6 +86840,7 @@ var ts;
if (useOldState) {
// Verify the sanity of old state
if (!oldState.currentChangedFilePath) {
// tslint:disable-next-line no-unnecessary-type-assertion
ts.Debug.assert(!oldState.affectedFiles && (!oldState.currentAffectedFilesSignatures || !oldState.currentAffectedFilesSignatures.size), "Cannot reuse if only few affected files of currentChangedFile were iterated");
}
if (canCopySemanticDiagnostics) {
Expand Down Expand Up @@ -119109,6 +119126,10 @@ var ts;
Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
var _this = this;
this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
if (ts.parsePackageName(pluginConfigEntry.name).rest) {
this.projectService.logger.info("kipped loading plugin " + pluginConfigEntry.name + " because only package name is allowed plugin name");
return;
}
var log = function (message) {
_this.projectService.logger.info(message);
};
Expand Down

0 comments on commit 7c397a5

Please sign in to comment.