microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-29 16:29:19 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Properly set hasAction for erasing modifiers in class member completions (#57643)

Browse Source
This commit is contained in:
Gabriela Araujo Britto
2024-03-07 11:34:47 -08:00
committed by GitHub
parent 881f449a8a
commit 6357c89c52
12 changed files with 409 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/diagnosticMessages.json
View File

@@ -7019,6 +7019,10 @@
"category": "Message",
"code": 90060
},
"Update modifiers of '{0}'": {
"category": "Message",
"code": 90061
},
"Convert function to an ES2015 class": {
"category": "Message",

62
src/services/completions.ts
View File

@@ -1757,10 +1757,21 @@ function createCompletionEntry(
isClassLikeMemberCompletion(symbol, location, sourceFile)
) {
let importAdder;
const memberCompletionEntry = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, position, contextToken, formatContext);
const memberCompletionEntry = getEntryForMemberCompletion(
host,
program,
options,
preferences,
name,
symbol,
location,
position,
contextToken,
formatContext,
);
if (memberCompletionEntry) {
({ insertText, filterText, isSnippet, importAdder } = memberCompletionEntry);
if (importAdder?.hasFixes()) {
if (importAdder?.hasFixes() || memberCompletionEntry.eraseRange) {
hasAction = true;
source = CompletionSource.ClassMemberSnippet;
}
@@ -2068,6 +2079,7 @@ function getPresentModifiers(
let decorators: Decorator[] | undefined;
let contextMod;
const range: TextRange = { pos: position, end: position };
/*
Cases supported:
In
@@ -2083,23 +2095,41 @@ function getPresentModifiers(
}`
`contextToken` is ``override`` (as a keyword),
`contextToken.parent` is property declaration,
`location` is identifier ``m``,
`location.parent` is property declaration ``protected override m``,
`location.parent.parent` is class declaration ``class C { ... }``.
`location` is identifier ``m``.
*/
if (isPropertyDeclaration(contextToken.parent) && contextToken.parent.modifiers) {
modifiers |= modifiersToFlags(contextToken.parent.modifiers) & ModifierFlags.Modifier;
decorators = contextToken.parent.modifiers.filter(isDecorator) || [];
range.pos = Math.min(range.pos, contextToken.parent.modifiers.pos);
}
if (contextMod = isModifierLike(contextToken)) {
if (isPropertyDeclaration(contextToken.parent) && (contextMod = isModifierLike(contextToken))) {
if (contextToken.parent.modifiers) {
modifiers |= modifiersToFlags(contextToken.parent.modifiers) & ModifierFlags.Modifier;
decorators = contextToken.parent.modifiers.filter(isDecorator) || [];
range.pos = Math.min(...contextToken.parent.modifiers.map(n => n.getStart(sourceFile)));
}
const contextModifierFlag = modifierToFlag(contextMod);
if (!(modifiers & contextModifierFlag)) {
modifiers |= contextModifierFlag;
range.pos = Math.min(range.pos, contextToken.pos);
range.pos = Math.min(range.pos, contextToken.getStart(sourceFile));
}
/*
We have two cases:
1.
`class C {
modifier |
}`
`contextToken` is `modifier`,
and the range should be `modifier |`, ending at `position`,
and
2.
`class C {
modifier otherToken|
}`
`contextToken` is `modifier`,
`contextToken.parent.name` is `otherToken`,
and the range should be `modifier `, ending at the start of `otherToken`.
*/
if (contextToken.parent.name !== contextToken) {
range.end = contextToken.parent.name.getStart(sourceFile);
}
}
return { modifiers, decorators, range: range.pos !== position ? range : undefined };
return { modifiers, decorators, range: range.pos < range.end ? range : undefined };
}
function isModifierLike(node: Node): ModifierSyntaxKind | undefined {
@@ -2941,7 +2971,7 @@ function getCompletionEntryCodeActionsAndSourceDisplay(
contextToken,
formatContext,
)!;
if (importAdder || eraseRange) {
if (importAdder?.hasFixes() || eraseRange) {
const changes = textChanges.ChangeTracker.with(
{ host, formatContext, preferences },
tracker => {
@@ -2957,7 +2987,9 @@ function getCompletionEntryCodeActionsAndSourceDisplay(
sourceDisplay: undefined,
codeActions: [{
changes,
description: diagnosticToString([Diagnostics.Includes_imports_of_types_referenced_by_0, name]),
description: importAdder?.hasFixes() ?
diagnosticToString([Diagnostics.Includes_imports_of_types_referenced_by_0, name]) :
diagnosticToString([Diagnostics.Update_modifiers_of_0, name]),
}],
};
}