From 239b199f6dcdbfb1fb3105c0954ef21e61fd326e Mon Sep 17 00:00:00 2001
From: Ramya Rao <ramya.rao.a@outlook.com>
Date: Tue, 7 Feb 2017 08:54:54 -0800
Subject: [PATCH] Use patched emmet to support svg and orphaned quote bug
 (#19655)

---
 npm-shrinkwrap.json                                 | 4 ++--
 package.json                                        | 2 +-
 src/vs/workbench/parts/emmet/node/editorAccessor.ts | 3 ++-
 src/vs/workbench/parts/emmet/node/emmetActions.ts   | 7 ++++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index e69dd7a2c3a..9478c4fe4c7 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -89,8 +89,8 @@
     },
     "emmet": {
       "version": "1.3.1",
-      "from": "emmet@1.3.1",
-      "resolved": "https://registry.npmjs.org/emmet/-/emmet-1.3.1.tgz"
+      "from": "ramya-rao-a/emmet#vscode",
+      "resolved": "git+https://github.com/ramya-rao-a/emmet.git#1d75a37a8c75795e103dae72b897eb0790c523ae"
     },
     "expand-brackets": {
       "version": "0.1.5",
diff --git a/package.json b/package.json
index 1ec117ff75c..f131b203b2b 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "applicationinsights": "0.17.0",
     "chokidar": "bpasero/chokidar#vscode",
-    "emmet": "1.3.1",
+    "emmet": "ramya-rao-a/emmet#vscode",
     "fast-plist": "0.1.2",
     "gc-signals": "^0.0.1",
     "getmac": "1.0.7",
diff --git a/src/vs/workbench/parts/emmet/node/editorAccessor.ts b/src/vs/workbench/parts/emmet/node/editorAccessor.ts
index bda144b0b07..9825553309c 100644
--- a/src/vs/workbench/parts/emmet/node/editorAccessor.ts
+++ b/src/vs/workbench/parts/emmet/node/editorAccessor.ts
@@ -33,7 +33,7 @@ export class EditorAccessor implements emmet.Editor {
 
 	private _hasMadeEdits: boolean;
 
-	private emmetSupportedModes = ['html', 'css', 'xml', 'xsl', 'haml', 'jade', 'jsx', 'slim', 'scss', 'sass', 'less', 'stylus', 'styl'];
+	private emmetSupportedModes = ['html', 'css', 'xml', 'xsl', 'haml', 'jade', 'jsx', 'slim', 'scss', 'sass', 'less', 'stylus', 'styl', 'svg'];
 
 	constructor(languageIdentifierResolver: ILanguageIdentifierResolver, editor: ICommonCodeEditor, syntaxProfiles: any, excludedLanguages: String[], grammars: IGrammarContributions) {
 		this._languageIdentifierResolver = languageIdentifierResolver;
@@ -45,6 +45,7 @@ export class EditorAccessor implements emmet.Editor {
 	}
 
 	public isEmmetEnabledMode(): boolean {
+
 		return this.emmetSupportedModes.indexOf(this.getSyntax()) !== -1;
 	}
 
diff --git a/src/vs/workbench/parts/emmet/node/emmetActions.ts b/src/vs/workbench/parts/emmet/node/emmetActions.ts
index d7b65bd4d70..adeec1d09f1 100644
--- a/src/vs/workbench/parts/emmet/node/emmetActions.ts
+++ b/src/vs/workbench/parts/emmet/node/emmetActions.ts
@@ -268,8 +268,13 @@ export class BasicEmmetEditorAction extends EmmetEditorAction {
 	}
 
 	public runEmmetAction(accessor: ServicesAccessor, ctx: EmmetActionContext) {
-		if (!ctx.emmet.run(this.emmetActionName, ctx.editorAccessor)) {
+		try {
+			if (!ctx.emmet.run(this.emmetActionName, ctx.editorAccessor)) {
+				this.noExpansionOccurred(ctx.editor);
+			}
+		} catch (err) {
 			this.noExpansionOccurred(ctx.editor);
 		}
+
 	}
 }
-- 
GitLab