Skip to content

Commit

Permalink
Update LKG
Browse files Browse the repository at this point in the history
  • Loading branch information
typescript-bot committed Aug 11, 2021
1 parent c82ccf1 commit 11339d9
Show file tree
Hide file tree
Showing 6 changed files with 64 additions and 20 deletions.
4 changes: 2 additions & 2 deletions lib/tsc.js
Original file line number Diff line number Diff line change
Expand Up @@ -67113,8 +67113,8 @@ var ts;
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
}
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
if (hasOverride) {
return;
}
Expand Down
21 changes: 16 additions & 5 deletions lib/tsserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -80162,8 +80162,8 @@ var ts;
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
}
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
if (hasOverride) {
return;
}
Expand Down Expand Up @@ -137143,7 +137143,18 @@ var ts;
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
}
function isHintableExpression(node) {
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
switch (node.kind) {
case 217 /* PrefixUnaryExpression */:
return ts.isLiteralExpression(node.operand);
case 110 /* TrueKeyword */:
case 95 /* FalseKeyword */:
case 212 /* ArrowFunction */:
case 211 /* FunctionExpression */:
case 203 /* ObjectLiteralExpression */:
case 202 /* ArrayLiteralExpression */:
return true;
}
return ts.isLiteralExpression(node);
}
function visitFunctionDeclarationLikeForReturnType(decl) {
if (ts.isArrowFunction(decl)) {
Expand Down Expand Up @@ -167881,9 +167892,9 @@ var ts;
});
};
Session.prototype.provideInlayHints = function (args) {
var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
var hints = languageService.provideInlayHints(file, args, this.getPreferences(file));
var hints = project.getLanguageService().provideInlayHints(file, args, this.getPreferences(file));
return hints.map(function (hint) { return (__assign(__assign({}, hint), { position: scriptInfo.positionToLineOffset(hint.position) })); });
};
Session.prototype.setCompilerOptionsForInferredProjects = function (args) {
Expand Down
21 changes: 16 additions & 5 deletions lib/tsserverlibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -80356,8 +80356,8 @@ var ts;
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
}
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
if (hasOverride) {
return;
}
Expand Down Expand Up @@ -137725,7 +137725,18 @@ var ts;
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
}
function isHintableExpression(node) {
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
switch (node.kind) {
case 217 /* PrefixUnaryExpression */:
return ts.isLiteralExpression(node.operand);
case 110 /* TrueKeyword */:
case 95 /* FalseKeyword */:
case 212 /* ArrowFunction */:
case 211 /* FunctionExpression */:
case 203 /* ObjectLiteralExpression */:
case 202 /* ArrayLiteralExpression */:
return true;
}
return ts.isLiteralExpression(node);
}
function visitFunctionDeclarationLikeForReturnType(decl) {
if (ts.isArrowFunction(decl)) {
Expand Down Expand Up @@ -168075,9 +168086,9 @@ var ts;
});
};
Session.prototype.provideInlayHints = function (args) {
var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
var hints = languageService.provideInlayHints(file, args, this.getPreferences(file));
var hints = project.getLanguageService().provideInlayHints(file, args, this.getPreferences(file));
return hints.map(function (hint) { return (__assign(__assign({}, hint), { position: scriptInfo.positionToLineOffset(hint.position) })); });
};
Session.prototype.setCompilerOptionsForInferredProjects = function (args) {
Expand Down
17 changes: 14 additions & 3 deletions lib/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -80356,8 +80356,8 @@ var ts;
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
}
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
if (hasOverride) {
return;
}
Expand Down Expand Up @@ -137725,7 +137725,18 @@ var ts;
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
}
function isHintableExpression(node) {
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
switch (node.kind) {
case 217 /* PrefixUnaryExpression */:
return ts.isLiteralExpression(node.operand);
case 110 /* TrueKeyword */:
case 95 /* FalseKeyword */:
case 212 /* ArrowFunction */:
case 211 /* FunctionExpression */:
case 203 /* ObjectLiteralExpression */:
case 202 /* ArrayLiteralExpression */:
return true;
}
return ts.isLiteralExpression(node);
}
function visitFunctionDeclarationLikeForReturnType(decl) {
if (ts.isArrowFunction(decl)) {
Expand Down
17 changes: 14 additions & 3 deletions lib/typescriptServices.js
Original file line number Diff line number Diff line change
Expand Up @@ -80356,8 +80356,8 @@ var ts;
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
}
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
if (hasOverride) {
return;
}
Expand Down Expand Up @@ -137725,7 +137725,18 @@ var ts;
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
}
function isHintableExpression(node) {
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
switch (node.kind) {
case 217 /* PrefixUnaryExpression */:
return ts.isLiteralExpression(node.operand);
case 110 /* TrueKeyword */:
case 95 /* FalseKeyword */:
case 212 /* ArrowFunction */:
case 211 /* FunctionExpression */:
case 203 /* ObjectLiteralExpression */:
case 202 /* ArrayLiteralExpression */:
return true;
}
return ts.isLiteralExpression(node);
}
function visitFunctionDeclarationLikeForReturnType(decl) {
if (ts.isArrowFunction(decl)) {
Expand Down
4 changes: 2 additions & 2 deletions lib/typingsInstaller.js
Original file line number Diff line number Diff line change
Expand Up @@ -80151,8 +80151,8 @@ var ts;
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_Did_you_mean_1, baseClassName, symbolToString(suggestion)) :
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
}
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
if (hasOverride) {
return;
}
Expand Down

0 comments on commit 11339d9

Please sign in to comment.