Skip to content

Commit 11339d9

Browse files
typescript-bottypescript-bot
committed
Update LKG
1 parent c82ccf1 commit 11339d9

File tree

6 files changed

+64
-20
lines changed

6 files changed

+64
-20
lines changed

‎lib/tsc.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67113,8 +67113,8 @@ var ts;
6711367113
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)) :
6711467114
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
6711567115
}
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); });
6711867118
if (hasOverride) {
6711967119
return;
6712067120
}

‎lib/tsserver.js‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80162,8 +80162,8 @@ var ts;
8016280162
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)) :
8016380163
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
8016480164
}
80165-
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80166-
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
80165+
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80166+
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
8016780167
if (hasOverride) {
8016880168
return;
8016980169
}
@@ -137143,7 +137143,18 @@ var ts;
137143137143
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
137144137144
}
137145137145
function isHintableExpression(node) {
137146-
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
137146+
switch (node.kind) {
137147+
case 217 /* PrefixUnaryExpression */:
137148+
return ts.isLiteralExpression(node.operand);
137149+
case 110 /* TrueKeyword */:
137150+
case 95 /* FalseKeyword */:
137151+
case 212 /* ArrowFunction */:
137152+
case 211 /* FunctionExpression */:
137153+
case 203 /* ObjectLiteralExpression */:
137154+
case 202 /* ArrayLiteralExpression */:
137155+
return true;
137156+
}
137157+
return ts.isLiteralExpression(node);
137147137158
}
137148137159
function visitFunctionDeclarationLikeForReturnType(decl) {
137149137160
if (ts.isArrowFunction(decl)) {
@@ -167881,9 +167892,9 @@ var ts;
167881167892
});
167882167893
};
167883167894
Session.prototype.provideInlayHints = function (args) {
167884-
var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
167895+
var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
167885167896
var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
167886-
var hints = languageService.provideInlayHints(file, args, this.getPreferences(file));
167897+
var hints = project.getLanguageService().provideInlayHints(file, args, this.getPreferences(file));
167887167898
return hints.map(function (hint) { return (__assign(__assign({}, hint), { position: scriptInfo.positionToLineOffset(hint.position) })); });
167888167899
};
167889167900
Session.prototype.setCompilerOptionsForInferredProjects = function (args) {

‎lib/tsserverlibrary.js‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80356,8 +80356,8 @@ var ts;
8035680356
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)) :
8035780357
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
8035880358
}
80359-
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80360-
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
80359+
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80360+
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
8036180361
if (hasOverride) {
8036280362
return;
8036380363
}
@@ -137725,7 +137725,18 @@ var ts;
137725137725
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
137726137726
}
137727137727
function isHintableExpression(node) {
137728-
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
137728+
switch (node.kind) {
137729+
case 217 /* PrefixUnaryExpression */:
137730+
return ts.isLiteralExpression(node.operand);
137731+
case 110 /* TrueKeyword */:
137732+
case 95 /* FalseKeyword */:
137733+
case 212 /* ArrowFunction */:
137734+
case 211 /* FunctionExpression */:
137735+
case 203 /* ObjectLiteralExpression */:
137736+
case 202 /* ArrayLiteralExpression */:
137737+
return true;
137738+
}
137739+
return ts.isLiteralExpression(node);
137729137740
}
137730137741
function visitFunctionDeclarationLikeForReturnType(decl) {
137731137742
if (ts.isArrowFunction(decl)) {
@@ -168075,9 +168086,9 @@ var ts;
168075168086
});
168076168087
};
168077168088
Session.prototype.provideInlayHints = function (args) {
168078-
var _a = this.getFileAndLanguageServiceForSyntacticOperation(args), file = _a.file, languageService = _a.languageService;
168089+
var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
168079168090
var scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file);
168080-
var hints = languageService.provideInlayHints(file, args, this.getPreferences(file));
168091+
var hints = project.getLanguageService().provideInlayHints(file, args, this.getPreferences(file));
168081168092
return hints.map(function (hint) { return (__assign(__assign({}, hint), { position: scriptInfo.positionToLineOffset(hint.position) })); });
168082168093
};
168083168094
Session.prototype.setCompilerOptionsForInferredProjects = function (args) {

‎lib/typescript.js‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80356,8 +80356,8 @@ var ts;
8035680356
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)) :
8035780357
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
8035880358
}
80359-
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80360-
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
80359+
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80360+
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
8036180361
if (hasOverride) {
8036280362
return;
8036380363
}
@@ -137725,7 +137725,18 @@ var ts;
137725137725
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
137726137726
}
137727137727
function isHintableExpression(node) {
137728-
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
137728+
switch (node.kind) {
137729+
case 217 /* PrefixUnaryExpression */:
137730+
return ts.isLiteralExpression(node.operand);
137731+
case 110 /* TrueKeyword */:
137732+
case 95 /* FalseKeyword */:
137733+
case 212 /* ArrowFunction */:
137734+
case 211 /* FunctionExpression */:
137735+
case 203 /* ObjectLiteralExpression */:
137736+
case 202 /* ArrayLiteralExpression */:
137737+
return true;
137738+
}
137739+
return ts.isLiteralExpression(node);
137729137740
}
137730137741
function visitFunctionDeclarationLikeForReturnType(decl) {
137731137742
if (ts.isArrowFunction(decl)) {

‎lib/typescriptServices.js‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80356,8 +80356,8 @@ var ts;
8035680356
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)) :
8035780357
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
8035880358
}
80359-
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80360-
var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
80359+
else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.declarations) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
80360+
var baseHasAbstract = ts.some(baseProp.declarations, function (d) { return ts.hasAbstractModifier(d); });
8036180361
if (hasOverride) {
8036280362
return;
8036380363
}
@@ -137725,7 +137725,18 @@ var ts;
137725137725
return ts.some(ranges, function (range) { return regex.test(sourceFileText.substring(range.pos, range.end)); });
137726137726
}
137727137727
function isHintableExpression(node) {
137728-
return ts.isLiteralExpression(node) || ts.isBooleanLiteral(node) || ts.isArrowFunction(node) || ts.isFunctionExpression(node) || ts.isObjectLiteralExpression(node) || ts.isArrayLiteralExpression(node);
137728+
switch (node.kind) {
137729+
case 217 /* PrefixUnaryExpression */:
137730+
return ts.isLiteralExpression(node.operand);
137731+
case 110 /* TrueKeyword */:
137732+
case 95 /* FalseKeyword */:
137733+
case 212 /* ArrowFunction */:
137734+
case 211 /* FunctionExpression */:
137735+
case 203 /* ObjectLiteralExpression */:
137736+
case 202 /* ArrayLiteralExpression */:
137737+
return true;
137738+
}
137739+
return ts.isLiteralExpression(node);
137729137740
}
137730137741
function visitFunctionDeclarationLikeForReturnType(decl) {
137731137742
if (ts.isArrowFunction(decl)) {

‎lib/typingsInstaller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80151,8 +80151,8 @@ var ts;
8015180151
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)) :
8015280152
error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
8015380153
}
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); });
8015680156
if (hasOverride) {
8015780157
return;
8015880158
}

0 commit comments

Comments
 (0)