From 11339d945f65a4d5432accb910c02d17b43898f8 Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Wed, 11 Aug 2021 06:41:16 +0000 Subject: [PATCH] Update LKG --- lib/tsc.js | 4 ++-- lib/tsserver.js | 21 ++++++++++++++++----- lib/tsserverlibrary.js | 21 ++++++++++++++++----- lib/typescript.js | 17 ++++++++++++++--- lib/typescriptServices.js | 17 ++++++++++++++--- lib/typingsInstaller.js | 4 ++-- 6 files changed, 64 insertions(+), 20 deletions(-) diff --git a/lib/tsc.js b/lib/tsc.js index 3e8a8c06a149e..dbfdc1cac0475 100644 --- a/lib/tsc.js +++ b/lib/tsc.js @@ -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; } diff --git a/lib/tsserver.js b/lib/tsserver.js index 75db08f8c044c..75b1593464a10 100644 --- a/lib/tsserver.js +++ b/lib/tsserver.js @@ -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; } @@ -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)) { @@ -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) { diff --git a/lib/tsserverlibrary.js b/lib/tsserverlibrary.js index be5c8a231b024..2841c88fd57b3 100644 --- a/lib/tsserverlibrary.js +++ b/lib/tsserverlibrary.js @@ -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; } @@ -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)) { @@ -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) { diff --git a/lib/typescript.js b/lib/typescript.js index ba1516419babb..a017a2df83c17 100644 --- a/lib/typescript.js +++ b/lib/typescript.js @@ -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; } @@ -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)) { diff --git a/lib/typescriptServices.js b/lib/typescriptServices.js index c2280dade8508..caea5c94199f5 100644 --- a/lib/typescriptServices.js +++ b/lib/typescriptServices.js @@ -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; } @@ -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)) { diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js index 8567982beaf7e..d0c28ce72dd57 100644 --- a/lib/typingsInstaller.js +++ b/lib/typingsInstaller.js @@ -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; }