Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Combine Expand/Complete Emmet abbreviations #28556

Browse Source
This commit is contained in:
Ramya Achutha Rao
2017-06-20 17:53:19 -07:00
parent 8a18099b51
commit a318cab2f0
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/emmet/src/emmetCompletionProvider.ts
+16 -6
View File
@@ -40,7 +40,11 @@ export class EmmetCompletionItemProvider implements vscode.CompletionItemProvide
expandedAbbr.insertText = new vscode.SnippetString(output.expandedText); expandedAbbr.insertText = new vscode.SnippetString(output.expandedText);
expandedAbbr.documentation = removeTabStops(output.expandedText); expandedAbbr.documentation = removeTabStops(output.expandedText);
expandedAbbr.range = output.abbreviationRange; expandedAbbr.range = output.abbreviationRange;
expandedAbbr.detail = 'Expand Emmet Abbreviation'; expandedAbbr.detail = 'Emmet Abbreviation';
// Workaround for completion items appearing out of order
expandedAbbr.sortText = '0' + expandedAbbr.label;
syntax = output.syntax; syntax = output.syntax;
let completionItems: vscode.CompletionItem[] = expandedAbbr ? [expandedAbbr] : []; let completionItems: vscode.CompletionItem[] = expandedAbbr ? [expandedAbbr] : [];
@@ -66,21 +70,27 @@ export class EmmetCompletionItemProvider implements vscode.CompletionItemProvide
snippetKeyCache.set(syntax, snippetKeys); snippetKeyCache.set(syntax, snippetKeys);
} }
let skipExactMatch = prefix === abbreviation;
let snippetKeys = snippetKeyCache.get(syntax); let snippetKeys = snippetKeyCache.get(syntax);
let snippetCompletions = []; let snippetCompletions = [];
snippetKeys.forEach(snippetKey => { snippetKeys.forEach(snippetKey => {
if (!snippetKey.startsWith(prefix) || (snippetKey === prefix) || (skipExactMatch && snippetKey === prefix)) { if (!snippetKey.startsWith(prefix) || snippetKey === prefix) {
return; return;
} }
let currentAbbr = snippetKey; // For #28556: abbreviation + snippetKey.substr(prefix.length); let currentAbbr = abbreviation + snippetKey.substr(prefix.length);
let expandedAbbr = expand(currentAbbr, getExpandOptions(syntax)); let expandedAbbr = expand(currentAbbr, getExpandOptions(syntax));
let item = new vscode.CompletionItem(snippetKey); let item = new vscode.CompletionItem(snippetKey);
item.documentation = removeTabStops(expandedAbbr); item.documentation = removeTabStops(expandedAbbr);
item.detail = 'Complete Emmet Abbreviation'; item.detail = 'Emmet Abbreviation';
item.insertText = snippetKey; // For #28556: new vscode.SnippetString(expandedAbbr); item.insertText = new vscode.SnippetString(expandedAbbr);
item.range = abbreviationRange;
// Workaround for completion items getting filtered out
item.filterText = abbreviation;
// Workaround for completion items appearing in wrong order
item.sortText = '9' + abbreviation;
snippetCompletions.push(item); snippetCompletions.push(item);
}); });