Skip to content

support missing funciton declaration quick fix #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2021
Merged

support missing funciton declaration quick fix #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf93827
support missing funciton declaration quick fix
jasonlyu123 Mar 3, 2021
7bcfd15
format
jasonlyu123 Mar 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 32 additions & 17 deletions packages/language-server/src/plugins/typescript/features/CodeActionsProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
);
}

if (fix.fixName === 'fixMissingFunctionDeclaration') {
originalRange = this.checkEndOfFileCodeInsert(
originalRange,
range,
document
);
}

return TextEdit.replace(originalRange, edit.newText);
})
);
Expand Down Expand Up @@ -327,30 +335,37 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
TextDocumentEdit.create(
VersionedTextDocumentIdentifier.create(document.uri, 0),
edit.textChanges.map((edit) => {
let range = mapRangeToOriginal(fragment, convertRange(fragment, edit.span));
// Some refactorings place the new code at the end of svelte2tsx' render function,
// which is unmapped. In this case, add it to the end of the script tag ourselves.
if (range.start.line < 0 || range.end.line < 0) {
if (isRangeInTag(originalRange, document.scriptInfo)) {
range = Range.create(
document.scriptInfo.endPos,
document.scriptInfo.endPos
);
} else if (isRangeInTag(originalRange, document.moduleScriptInfo)) {
range = Range.create(
document.moduleScriptInfo.endPos,
document.moduleScriptInfo.endPos
);
}
}
return TextEdit.replace(range, edit.newText);
const range = mapRangeToOriginal(fragment, convertRange(fragment, edit.span));

return TextEdit.replace(
this.checkEndOfFileCodeInsert(range, originalRange, document),
edit.newText
);
})
)
);

return { documentChanges };
}

/**
* Some refactorings place the new code at the end of svelte2tsx' render function,
* which is unmapped. In this case, add it to the end of the script tag ourselves.
*/
private checkEndOfFileCodeInsert(resultRange: Range, targetRange: Range, document: Document) {
if (resultRange.start.line < 0 || resultRange.end.line < 0) {
if (isRangeInTag(targetRange, document.scriptInfo)) {
resultRange = Range.create(document.scriptInfo.endPos, document.scriptInfo.endPos);
} else if (isRangeInTag(targetRange, document.moduleScriptInfo)) {
resultRange = Range.create(
document.moduleScriptInfo.endPos,
document.moduleScriptInfo.endPos
);
}
}
return resultRange;
}

private getLSAndTSDoc(document: Document) {
return this.lsAndTsDocResolver.getLSAndTSDoc(document);
}
Expand Down
61 changes: 59 additions & 2 deletions packages/language-server/test/plugins/typescript/features/CodeActionsProvider.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,63 @@ describe('CodeActionsProvider', () => {
]);
});

it('provides quickfix for missing function', async () => {
const { provider, document } = setup('codeactions.svelte');

const codeActions = await provider.getCodeActions(
document,
Range.create(Position.create(9, 0), Position.create(9, 3)),
{
diagnostics: [
{
code: 2304,
message: "Cannot find name 'abc'.",
range: Range.create(Position.create(9, 0), Position.create(9, 3)),
source: 'ts'
}
],
only: [CodeActionKind.QuickFix]
}
);

(<TextDocumentEdit>codeActions[0]?.edit?.documentChanges?.[0])?.edits.forEach(
(edit) => (edit.newText = harmonizeNewLines(edit.newText))
);

assert.deepStrictEqual(codeActions, [
{
edit: {
documentChanges: [
{
edits: [
{
newText:
"\n\nfunction abc() {\nthrow new Error('Function not implemented.');\n}\n",
range: {
start: {
character: 0,
line: 10
},
end: {
character: 0,
line: 10
}
}
}
],
textDocument: {
uri: getUri('codeactions.svelte'),
version: 0
}
}
]
},
kind: CodeActionKind.QuickFix,
title: "Add missing function declaration 'abc'"
}
]);
});

it('organizes imports', async () => {
const { provider, document } = setup('codeactions.svelte');

Expand Down Expand Up @@ -428,11 +485,11 @@ describe('CodeActionsProvider', () => {
range: {
start: {
character: 0,
line: 9
line: 10
},
end: {
character: 0,
line: 9
line: 10
}
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/language-server/test/plugins/typescript/testfiles/codeactions.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ import {D} from 'd';
let a = true;
A;C;
let b = Math.random() > 0.5 ? true : false;
abc();
</script>