From 9b29c54c6b06131ab0e25a2cdf27f3f546e8c23c Mon Sep 17 00:00:00 2001
From: Ramya Rao <ramya.rao.a@outlook.com>
Date: Thu, 9 Feb 2017 02:04:22 -0800
Subject: [PATCH] Add err handling for emmet and update commit hash (#20267)

---
 npm-shrinkwrap.json                               | 2 +-
 src/vs/workbench/parts/emmet/node/emmetActions.ts | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 9478c4fe4c7..55dc1daaf66 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -90,7 +90,7 @@
     "emmet": {
       "version": "1.3.1",
       "from": "ramya-rao-a/emmet#vscode",
-      "resolved": "git+https://github.com/ramya-rao-a/emmet.git#1d75a37a8c75795e103dae72b897eb0790c523ae"
+      "resolved": "git+https://github.com/ramya-rao-a/emmet.git#c8eb99f46c6734a37beadfd826c98a7a44d3e141"
     },
     "expand-brackets": {
       "version": "0.1.5",
diff --git a/src/vs/workbench/parts/emmet/node/emmetActions.ts b/src/vs/workbench/parts/emmet/node/emmetActions.ts
index adeec1d09f1..d93d46be474 100644
--- a/src/vs/workbench/parts/emmet/node/emmetActions.ts
+++ b/src/vs/workbench/parts/emmet/node/emmetActions.ts
@@ -92,6 +92,8 @@ class LazyEmmet {
 		return this._loadEmmet().then((_emmet: typeof emmet) => {
 			this._messageService = messageService;
 			this._withEmmetPreferences(configurationService, _emmet, callback);
+		}, (e) => {
+			callback(null);
 		});
 	}
 
@@ -241,6 +243,10 @@ export abstract class EmmetEditorAction extends EditorAction {
 			}
 
 			return LazyEmmet.withConfiguredEmmet(configurationService, messageService, workspaceRoot, (_emmet) => {
+				if (!_emmet) {
+					this.noExpansionOccurred(editor);
+					return undefined;
+				}
 				editorAccessor.onBeforeEmmetAction();
 				instantiationService.invokeFunction((accessor) => {
 					this.runEmmetAction(accessor, new EmmetActionContext(editor, _emmet, editorAccessor));
-- 
GitLab