Skip to content
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

feat: provide snippets for attribute and method completions #820

Closed
wants to merge 1 commit into from
Closed

feat: provide snippets for attribute and method completions #820

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
78 changes: 75 additions & 3 deletions server/src/completion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,81 @@ export function tsCompletionEntryToLspCompletionItem(
// Text that actually gets inserted to the document. It could be different
// from 'entry.name'. For example, a method name could be 'greet', but the
// insertText is 'greet()'.
const insertText = entry.insertText || entry.name;
item.textEdit = entry.replacementSpan ?
lsp.TextEdit.replace(tsTextSpanToLspRange(scriptInfo, entry.replacementSpan), insertText) :
let insertText = entry.insertText || entry.name;
let replaceSpan = entry.replacementSpan;
if (kind === CompletionKind.attribute) {
// <div [(ng|)]=></div>
// ^-------------- start
// ^------- end
let start = scriptInfo.lineOffsetToPosition(position.line + 1, position.character) - 1;
let end = scriptInfo.lineOffsetToPosition(position.line + 1, position.character) + 4;
if (replaceSpan) {
start = replaceSpan.start - 2;
end = replaceSpan.start + replaceSpan.length + 3;
}
const attributeText = scriptInfo.getSnapshot().getText(start, end);
switch (attributeText[1]) {
case '*':
case '-':
// *ngI| => *ngIf="|"
// on-cli| => on-click="|"
if (attributeText[attributeText.length - 3] !== '=') {
item.insertTextFormat = lsp.InsertTextFormat.Snippet;
insertText = `${insertText}="\${0}"`;
replaceSpan = {start: start + 2, length: end - start - 5};
}
break;
case '[':
// [ngMo|] => [ngModel]="|"
if (attributeText[attributeText.length - 2] !== '=') {
item.insertTextFormat = lsp.InsertTextFormat.Snippet;
insertText = `${insertText}]="\${0}"`;
replaceSpan = {start: start + 2, length: end - start - 4};
}
break;
case '(':
if (attributeText[0] === '[') {
// [(ngMod|)] => [(ngModel)]="|"
if (attributeText[attributeText.length - 1] !== '=') {
item.insertTextFormat = lsp.InsertTextFormat.Snippet;
insertText = `${insertText})]="\${0}"`;
replaceSpan = {start: start + 2, length: end - start - 3};
}
} else {
// (clic|) => (click)="|"
if (attributeText[attributeText.length - 2] !== '=') {
item.insertTextFormat = lsp.InsertTextFormat.Snippet;
insertText = `${insertText})="\${0}"`;
replaceSpan = {start: start + 2, length: end - start - 4};
}
}
break;
default:
break;
}
}

if (kind === CompletionKind.method) {
let start = scriptInfo.lineOffsetToPosition(position.line + 1, position.character) + 1;
let end = scriptInfo.lineOffsetToPosition(position.line + 1, position.character) + 2;
if (replaceSpan) {
start = replaceSpan.start;
end = replaceSpan.start + replaceSpan.length + 1;
}
const methodText = scriptInfo.getSnapshot().getText(start, end);
if (methodText.endsWith('(')) {
// meth|() => method(|)
replaceSpan = {start: start, length: end - start};
insertText = insertText.slice(0, insertText.length - 1) + '\${0}';
} else {
// meth| => method(|)
insertText = insertText.slice(0, insertText.length - 1) + '\${0})';
}
item.insertTextFormat = lsp.InsertTextFormat.Snippet;
}

item.textEdit = replaceSpan ?
lsp.TextEdit.replace(tsTextSpanToLspRange(scriptInfo, replaceSpan), insertText) :
lsp.TextEdit.insert(position, insertText);
return item;
}