Addressing feedback

extensions/emmet/src/defaultCompletionProvider.ts

@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { Node } from 'EmmetNode';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
-import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet } from './util';
+import { getEmmetHelper, getNode, getMappingForIncludedLanguages, parsePartialStylesheet, getEmmetConfiguration, getEmmetMode, isStyleSheet, parseDocument } from './util';
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 
@@ -38,7 +38,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 
 		// If document can be css parsed, get currentNode
 		if (isStyleSheet(document.languageId)) {
-			const rootNode = parsePartialStylesheet(document, position);
+			const rootNode = document.lineCount > 1000 ? parsePartialStylesheet(document, position) : parseDocument(document, false);
 			if (!rootNode) {
 				return;
 			}

extensions/emmet/src/util.ts

@@ -144,20 +144,17 @@ export function parsePartialStylesheet(document: vscode.TextDocument, position:
 	// Go back until we found an opening brace. If we find a closing one, we first find its opening brace and then we continue.
 	stream.pos = position;
 	let openBracesRemaining = 1;
-	let unindentedRulesFound = 0;
-	while (openBracesRemaining > 0 && !(stream.pos.line === 0 && stream.pos.character === 0)) {
+	while (openBracesRemaining > 0 && !stream.sof()) {
 		let ch = stream.backUp(1);
 		if (ch === openBrace) {
 			openBracesRemaining--;
-			// Heuristic to not parse the whole document.
-			if (unindentedRulesFound >= 10) {
-				break;
-			}
 		} else if (ch === closeBrace) {
-			if (stream.pos.character === 0) {
-				unindentedRulesFound++;
+			if (document.languageId !== 'css') {
+				openBracesRemaining++;
+			}
+			if (position.line - stream.pos.line > 1000) {
+				return parseStylesheet(new DocumentStreamReader(document, new vscode.Position(0, 0)));
 			}
-			openBracesRemaining++;
 		}
 	}
 	// We are at an opening brace. We need to include its selector