Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Absorb changes to the vscode-emmet-helper 0.0.19

Browse Source
This commit is contained in:
Ramya Achutha Rao
2017-07-17 19:24:42 -07:00
parent 7790c4a753
commit f2a9356417
6 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/emmet/src/defaultCompletionProvider.ts
View File

@@ -5,17 +5,19 @@
import * as vscode from 'vscode';
import { HtmlNode } from 'EmmetNode';
import { EmmetCompletionItemProvider, isStyleSheet, getEmmetMode } from 'vscode-emmet-helper';
import { doComplete, isStyleSheet, getEmmetMode } from 'vscode-emmet-helper';
import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
import { getNode, getInnerRange, getMappingForIncludedLanguages, parse } from './util';
import { getNode, getInnerRange, getMappingForIncludedLanguages, parse, getEmmetConfiguration } from './util';
export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
public provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Thenable<vscode.CompletionList> {
const mappedLanguages = getMappingForIncludedLanguages();
const emmetConfig = vscode.workspace.getConfiguration('emmet');
let isSyntaxMapped = mappedLanguages[document.languageId] ? true : false;
let syntax = getEmmetMode(isSyntaxMapped ? mappedLanguages[document.languageId] : document.languageId);
let excludedLanguages = emmetConfig['exlcudeLanguages'] ? emmetConfig['exlcudeLanguages'] : [];
let syntax = getEmmetMode((isSyntaxMapped ? mappedLanguages[document.languageId] : document.languageId), excludedLanguages);
if (document.languageId === 'html' || isStyleSheet(document.languageId)) {
// Document can be html/css parsed
@@ -25,12 +27,27 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
if (!syntax
|| ((isSyntaxMapped || syntax === 'jsx')
&& vscode.workspace.getConfiguration('emmet')['showExpandedAbbreviation'] !== 'always')) {
&& emmetConfig['showExpandedAbbreviation'] !== 'always')) {
return;
}
const emmetCompletionProvider = new EmmetCompletionItemProvider(syntax);
return emmetCompletionProvider.provideCompletionItems(document, position, token);
let result: vscode.CompletionList = doComplete(document, position, syntax, getEmmetConfiguration());
let newItems: vscode.CompletionItem[] = [];
result.items.forEach(item => {
let newItem = new vscode.CompletionItem(item.label);
newItem.documentation = item.documentation;
newItem.detail = item.detail;
newItem.insertText = new vscode.SnippetString(item.textEdit.newText);
let oldrange = item.textEdit.range;
newItem.range = new vscode.Range(oldrange.start.line, oldrange.start.character, oldrange.end.line, oldrange.end.character);
newItem.filterText = item.filterText;
newItem.sortText = item.sortText;
newItems.push(newItem);
});
return Promise.resolve(new vscode.CompletionList(newItems, true));
}
/**