Update LKG

typescript-bot · typescript-bot · commit 11339d945f65 · 2021-08-11T06:41:16.000Z
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;
                         }

Original file line number	Diff line number	Diff line change
`@@ -67113,8 +67113,8 @@ var ts;`
`67113`	`67113`	`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)) :`
`67114`	`67114`	`error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);`
`67115`	`67115`	`}`
`67116`		`- else if (prop && (baseProp === null \|\| baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {`
`67117`		`- var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);`
	`67116`	`+ else if (prop && (baseProp === null \|\| baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {`
	`67117`	`+ var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });`
`67118`	`67118`	`if (hasOverride) {`
`67119`	`67119`	`return;`
`67120`	`67120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80151,8 +80151,8 @@ var ts;`
`80151`	`80151`	`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)) :`
`80152`	`80152`	`error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);`
`80153`	`80153`	`}`
`80154`		`- else if (prop && (baseProp === null \|\| baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {`
`80155`		`- var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);`
	`80154`	`+ else if (prop && (baseProp === null \|\| baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {`
	`80155`	`+ var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });`
`80156`	`80156`	`if (hasOverride) {`
`80157`	`80157`	`return;`
`80158`	`80158`	`}`