Skip to content

(fix) don't trigger html completions inside moustache tags #90

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.

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, 2020
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
17 changes: 16 additions & 1 deletion packages/language-server/src/plugins/html/HTMLPlugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export class HTMLPlugin implements OnRegister, HoverProvider, CompletionsProvide

onRegister(docManager: DocumentManager, configManager: LSConfigManager) {
this.configManager = configManager;
docManager.on('documentChange', document => {
docManager.on('documentChange', (document) => {
const html = this.lang.parseHTMLDocument(document);
this.documents.set(document, html);
});
Expand Down Expand Up @@ -43,6 +43,10 @@ export class HTMLPlugin implements OnRegister, HoverProvider, CompletionsProvide
return null;
}

if (this.isInsideMoustacheTag(html, document, position)) {
return null;
}

const emmetResults: CompletionList = {
isIncomplete: true,
items: [],
Expand All @@ -64,9 +68,20 @@ export class HTMLPlugin implements OnRegister, HoverProvider, CompletionsProvide
return null;
}

if (this.isInsideMoustacheTag(html, document, position)) {
return null;
}

return this.lang.doTagComplete(document, position, html);
}

private isInsideMoustacheTag(html: HTMLDocument, document: Document, position: Position) {
const offset = document.offsetAt(position);
const node = html.findNodeAt(offset);
const charactersInNode = document.getText().substring(node.start, offset);
return charactersInNode.lastIndexOf('{') > charactersInNode.lastIndexOf('}');
}

getDocumentSymbols(document: Document): SymbolInformation[] {
if (!this.featureEnabled('documentSymbols')) {
return [];
Expand Down
38 changes: 38 additions & 0 deletions packages/language-server/test/plugins/html/HTMLPlugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,42 @@ describe('HTML Plugin', () => {
insertTextFormat: InsertTextFormat.PlainText,
});
});

it('does not provide completions inside of moustache tag', async () => {
const { plugin, document } = setup('<div on:click={() =>');

const completions = plugin.getCompletions(document, Position.create(0, 20));
assert.strictEqual(completions, null);

const tagCompletion = plugin.doTagComplete(document, Position.create(0, 20));
assert.strictEqual(tagCompletion, null);
});

it('does provide completions outside of moustache tag', async () => {
const { plugin, document } = setup('<div on:click={bla} >');

const completions = plugin.getCompletions(document, Position.create(0, 21));
assert.deepEqual(completions?.items[0], <CompletionItem>{
filterText: '</div>',
insertTextFormat: 2,
kind: 10,
label: '</div>',
textEdit: {
newText: '$0</div>',
range: {
end: {
character: 21,
line: 0,
},
start: {
character: 21,
line: 0,
},
},
},
});

const tagCompletion = plugin.doTagComplete(document, Position.create(0, 21));
assert.strictEqual(tagCompletion, '$0</div>');
});
});