Skip to content
Open
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
5 changes: 5 additions & 0 deletions .changeset/rotten-gifts-develop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"svelte-language-server": patch
---

fix: use pug syntax for emmet in template lang pug
14 changes: 13 additions & 1 deletion packages/language-server/src/plugins/html/HTMLPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ export class HTMLPlugin
return this.lang.doHover(document, position, html);
}

private getEmmetSyntax(document: Document, position: Position) {
return isInTag(position, document.templateInfo) &&
document.getLanguageAttribute('template') === 'pug'
? 'pug'
: 'html';
}

async getCompletions(
document: Document,
position: Position,
Expand Down Expand Up @@ -158,7 +165,12 @@ export class HTMLPlugin
this.configManager.getEmmetConfig().showExpandedAbbreviation !== 'never'
) {
doEmmetCompleteInner = () =>
doEmmetComplete(document, position, 'html', this.configManager.getEmmetConfig());
doEmmetComplete(
document,
position,
this.getEmmetSyntax(document, position),
this.configManager.getEmmetConfig()
);

this.lang.setCompletionParticipants([
{
Expand Down
26 changes: 26 additions & 0 deletions packages/language-server/test/plugins/html/HTMLPlugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,32 @@ describe('HTML Plugin', () => {
assert.strictEqual(completions, null);
});

it('provides pug emmet completions inside template lang="pug"', async () => {
const { plugin, document } = setup('<template lang="pug">\ndiv>\n</template>');

const completions = await plugin.getCompletions(document, Position.create(1, 4), {
triggerCharacter: '>',
triggerKind: CompletionTriggerKind.TriggerCharacter
});

assert.strictEqual(completions?.items[0]?.label, 'div>');
assert.strictEqual(completions?.items[0]?.textEdit?.newText, 'div ${0}');
assert.strictEqual(completions?.items[0]?.documentation, 'div |');
});

it('provides html emmet completions outside template lang="pug"', async () => {
const { plugin, document } = setup('<template lang="pug">\np\n</template>\ndiv>');

const completions = await plugin.getCompletions(document, Position.create(3, 4), {
triggerCharacter: '>',
triggerKind: CompletionTriggerKind.TriggerCharacter
});

assert.strictEqual(completions?.items[0]?.label, 'div>');
assert.strictEqual(completions?.items[0]?.textEdit?.newText, '<div>${0}</div>');
assert.strictEqual(completions?.items[0]?.documentation, '<div>|</div>');
});

it('does not provide rename for element being uppercase', async () => {
const { plugin, document } = setup('<Div></Div>');

Expand Down
Loading