Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,9 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
if (isSvelteComp && existingImports.has(label)) {
return null;
}
const textEdit =
replacementSpan && insertText
? TextEdit.replace(convertRange(fragment, replacementSpan), insertText)
: undefined;
const textEdit = replacementSpan
? TextEdit.replace(convertRange(fragment, replacementSpan), insertText ?? label)
: undefined;

return {
label,
Expand Down Expand Up @@ -324,11 +323,11 @@ export class CompletionsProviderImpl implements CompletionsProvider<CompletionEn
};
}

if (insertText && comp.replacementSpan) {
if (comp.replacementSpan) {
return {
label: name,
isSvelteComp,
insertText: changeSvelteComponentName(insertText),
insertText: insertText ? changeSvelteComponentName(insertText) : undefined,
replacementSpan: comp.replacementSpan
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1109,6 +1109,47 @@ describe('CompletionProviderImpl', () => {
}
});
});

it('provide replacement for string completions', async () => {
const { completionProvider, document } = setup('string-completion.svelte');

const completions = await completionProvider.getCompletions(
document,
{
line: 1,
character: 10
},
{
triggerKind: CompletionTriggerKind.Invoked
}
);

const item = completions?.items.find((item) => item.label === '@hi');

delete item?.data;

assert.deepStrictEqual(item, {
label: '@hi',
kind: CompletionItemKind.Constant,
sortText: '11',
preselect: undefined,
insertText: undefined,
commitCharacters: undefined,
textEdit: {
newText: '@hi',
range: {
end: {
character: 10,
line: 1
},
start: {
character: 9,
line: 1
}
}
}
});
});
});

function harmonizeNewLines(input?: string) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<script lang="ts">
abc('@');

function abc(str: 'hi' | '@hi' | '~hi') {}
</script>