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

Emmet Error handling Fixes #29897

Browse Source
This commit is contained in:
Ramya Achutha Rao
2017-06-29 18:35:53 -07:00
parent e7de8b2536
commit 0ee00cbd2a
15 changed files with 129 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,13 +4,10 @@
*--------------------------------------------------------------------------------------------*/
import * as vscode from 'vscode';
import parseStylesheet from '@emmetio/css-parser';
import parse from '@emmetio/html-matcher';
import { Node, HtmlNode } from 'EmmetNode';
import { DocumentStreamReader } from './bufferStream';
import { HtmlNode } from 'EmmetNode';
import { EmmetCompletionItemProvider, isStyleSheet, getEmmetMode } from 'vscode-emmet-helper';
import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
import { getNode, getInnerRange, getMappingForIncludedLanguages } from './util';
import { getNode, getInnerRange, getMappingForIncludedLanguages, parse } from './util';
export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
@@ -46,8 +43,11 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
if (!syntax) {
return syntax;
}
let parseContent = isStyleSheet(syntax) ? parseStylesheet : parse;
let rootNode: Node = parseContent(new DocumentStreamReader(document));
let rootNode = parse(document, false);
if (!rootNode) {
return;
}
let currentNode = getNode(rootNode, position);
if (!isStyleSheet(syntax)) {