Skip to content

(fix) organize imports mapping #1008

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 1 commit into from
May 16, 2021
Merged

(fix) organize imports mapping #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions packages/language-server/src/plugins/typescript/DocumentSnapshot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,10 @@ export class SvelteSnapshotFragment implements SnapshotFragment {
return this.parent.moduleScriptInfo;
}

get originalText() {
return this.parent.getText();
}

getOriginalPosition(pos: Position): Position {
return this.mapper.getOriginalPosition(pos);
}
Expand Down
7 changes: 7 additions & 0 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 @@ -139,6 +139,13 @@ export class CodeActionsProviderImpl implements CodeActionsProvider {
edit.span.length -= 1;
range = mapRangeToOriginal(fragment, convertRange(fragment, edit.span));
range.end.character += 1;
if (
fragment instanceof SvelteSnapshotFragment &&
getLineAtPosition(range.end, fragment.originalText).length <= range.end.character
) {
range.end.line += 1;
range.end.character = 0;
}
}

return range;
Expand Down
126 changes: 118 additions & 8 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 @@ -317,8 +317,8 @@ describe('CodeActionsProvider', () => {
line: 4
},
end: {
character: 21,
line: 4
character: 0,
line: 5
}
}
}
Expand Down Expand Up @@ -392,8 +392,8 @@ describe('CodeActionsProvider', () => {
character: 2
},
end: {
line: 7,
character: 23
line: 8,
character: 0
}
}
}
Expand Down Expand Up @@ -475,13 +475,13 @@ describe('CodeActionsProvider', () => {
{
newText: '',
range: {
end: {
character: 37,
line: 7
},
start: {
character: 2,
line: 7
},
end: {
character: 0,
line: 8
}
}
}
Expand All @@ -499,6 +499,116 @@ describe('CodeActionsProvider', () => {
]);
});

it('organizes imports which changes nothing (one import)', async () => {
const { provider, document } = setup('organize-imports-unchanged1.svelte');

const codeActions = await provider.getCodeActions(
document,
Range.create(Position.create(1, 4), Position.create(1, 5)), // irrelevant
{
diagnostics: [],
only: [CodeActionKind.SourceOrganizeImports]
}
);
(<TextDocumentEdit>codeActions[0]?.edit?.documentChanges?.[0])?.edits.forEach(
(edit) => (edit.newText = harmonizeNewLines(edit.newText))
);

assert.deepStrictEqual(codeActions, [
{
edit: {
documentChanges: [
{
edits: [
{
newText: "import { c } from './c';\n",
range: {
end: {
character: 0,
line: 2
},
start: {
character: 2,
line: 1
}
}
}
],
textDocument: {
uri: getUri('organize-imports-unchanged1.svelte'),
version: null
}
}
]
},
kind: 'source.organizeImports',
title: 'Organize Imports'
}
]);
});

it('organizes imports which changes nothing (two imports)', async () => {
const { provider, document } = setup('organize-imports-unchanged2.svelte');

const codeActions = await provider.getCodeActions(
document,
Range.create(Position.create(1, 4), Position.create(1, 5)), // irrelevant
{
diagnostics: [],
only: [CodeActionKind.SourceOrganizeImports]
}
);
(<TextDocumentEdit>codeActions[0]?.edit?.documentChanges?.[0])?.edits.forEach(
(edit) => (edit.newText = harmonizeNewLines(edit.newText))
);

assert.deepStrictEqual(codeActions, [
{
edit: {
documentChanges: [
{
edits: [
{
newText:
"import { c } from './c';\n import { d } from './d';\n",
range: {
end: {
character: 0,
line: 2
},
start: {
character: 2,
line: 1
}
}
},
{
newText: '',
range: {
end: {
character: 0,
line: 3
},
start: {
character: 0,
line: 2
}
}
}
],
textDocument: {
uri: getUri('organize-imports-unchanged2.svelte'),
version: null
}
}
]
},
kind: 'source.organizeImports',
title: 'Organize Imports'
}
]);
});

it('should do extract into const refactor', async () => {
const { provider, document } = setup('codeactions.svelte');

Expand Down
6 changes: 6 additions & 0 deletions ...-server/test/plugins/typescript/testfiles/code-actions/organize-imports-unchanged1.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<script context="module">
import {c} from './c';
const a = true;
</script>

{c}
7 changes: 7 additions & 0 deletions ...-server/test/plugins/typescript/testfiles/code-actions/organize-imports-unchanged2.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script context="module">
import {c} from './c';
import {d} from './d';
const a = true;
</script>

{c}{d}