From 190367eb1319fe26eee0d180af1943be9889c159 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Mon, 14 Aug 2017 09:58:07 -0700
Subject: [PATCH] lookahead not needed when running emmet expand #32478

---
 extensions/emmet/npm-shrinkwrap.json        | 6 +++---
 extensions/emmet/package.json               | 2 +-
 extensions/emmet/src/abbreviationActions.ts | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/extensions/emmet/npm-shrinkwrap.json b/extensions/emmet/npm-shrinkwrap.json
index 6917fe8d0e4..893744a5f24 100644
--- a/extensions/emmet/npm-shrinkwrap.json
+++ b/extensions/emmet/npm-shrinkwrap.json
@@ -38,9 +38,9 @@
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
     },
     "vscode-emmet-helper": {
-      "version": "1.0.14",
-      "from": "vscode-emmet-helper@>=1.0.14 <2.0.0",
-      "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.0.14.tgz"
+      "version": "1.0.15",
+      "from": "vscode-emmet-helper@>=1.0.15 <2.0.0",
+      "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.0.15.tgz"
     },
     "vscode-languageserver-types": {
       "version": "3.3.0",
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index abad16b25ae..5888c3b6c72 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -212,7 +212,7 @@
         "@emmetio/html-matcher": "^0.3.1",
         "@emmetio/css-parser": "^0.4.0",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper": "^1.0.14",
+        "vscode-emmet-helper": "^1.0.15",
         "vscode-languageserver-types": "^3.0.3",
         "image-size": "^0.5.2",
         "vscode-nls": "2.0.2"
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 1ea6df4a869..9737a0baf98 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -132,7 +132,11 @@ export function expandEmmetAbbreviation(args): Thenable<boolean> {
 				return [rangeToReplace, abbr, []];
 			}
 		}
+<<<<<<< HEAD
 		let extractedResults = extractAbbreviation(editor.document, position);
+=======
+		let extractedResults = extractAbbreviation(editor.document, position, false);
+>>>>>>> 1531c8d... lookahead not needed when running emmet expand #32478
 		if (!extractedResults) {
 			return [null, '', []];
 		}
-- 
GitLab