From 5fb80bb933803df4140cf25ee8e91d212ca8ad61 Mon Sep 17 00:00:00 2001
From: Ramya Achutha Rao <ramyar@microsoft.com>
Date: Wed, 19 Jul 2017 12:59:06 -0700
Subject: [PATCH] Combine custom snippets from base syntax #29146

---
 extensions/emmet/npm-shrinkwrap.json |  6 +++---
 extensions/emmet/package.json        |  2 +-
 extensions/emmet/src/extension.ts    | 26 ++++++++++++--------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/extensions/emmet/npm-shrinkwrap.json b/extensions/emmet/npm-shrinkwrap.json
index 16b0b4feec1..e8e1bb961c4 100644
--- a/extensions/emmet/npm-shrinkwrap.json
+++ b/extensions/emmet/npm-shrinkwrap.json
@@ -118,9 +118,9 @@
       "resolved": "https://registry.npmjs.org/@emmetio/variable-resolver/-/variable-resolver-0.2.1.tgz"
     },
     "vscode-emmet-helper": {
-      "version": "0.0.24",
-      "from": "vscode-emmet-helper@0.0.24",
-      "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-0.0.24.tgz"
+      "version": "0.0.25",
+      "from": "vscode-emmet-helper@0.0.25",
+      "resolved": "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-0.0.25.tgz"
     },
     "vscode-languageserver-types": {
       "version": "3.0.3",
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
index c6472a9bc0c..6ede0ca82b1 100644
--- a/extensions/emmet/package.json
+++ b/extensions/emmet/package.json
@@ -73,7 +73,7 @@
         "@emmetio/html-matcher": "^0.3.1",
         "@emmetio/css-parser": "^0.3.0",
         "@emmetio/math-expression": "^0.1.1",
-        "vscode-emmet-helper":"0.0.24",
+        "vscode-emmet-helper":"0.0.25",
         "vscode-languageserver-types": "^3.0.3"
     }
 }
\ No newline at end of file
diff --git a/extensions/emmet/src/extension.ts b/extensions/emmet/src/extension.ts
index 7cc7aae9a88..95ad4450992 100644
--- a/extensions/emmet/src/extension.ts
+++ b/extensions/emmet/src/extension.ts
@@ -119,24 +119,22 @@ export function activate(context: vscode.ExtensionContext) {
 		incrementDecrement(-10);
 	}));
 
-
-	let extensionsPath = vscode.workspace.getConfiguration('emmet')['extensionsPath'];
-	if (extensionsPath) {
-		if (!path.isAbsolute(extensionsPath)) {
+	let currentExtensionsPath = undefined;
+	let resolveUpdateExtensionsPath = () => {
+		let extensionsPath = vscode.workspace.getConfiguration('emmet')['extensionsPath'];
+		if (extensionsPath && !path.isAbsolute(extensionsPath)) {
 			extensionsPath = path.join(vscode.workspace.rootPath, extensionsPath);
 		}
-		updateExtensionsPath(extensionsPath);
-	}
+		if (currentExtensionsPath !== extensionsPath) {
+			currentExtensionsPath = extensionsPath;
+			updateExtensionsPath(currentExtensionsPath);
+		}
+	};
+
+	resolveUpdateExtensionsPath();
 
 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
-		let newExtensionsPath = vscode.workspace.getConfiguration('emmet')['extensionsPath'];
-		if (newExtensionsPath && !path.isAbsolute(newExtensionsPath)) {
-			newExtensionsPath = path.join(vscode.workspace.rootPath, newExtensionsPath);
-		}
-		if (extensionsPath !== newExtensionsPath) {
-			updateExtensionsPath(newExtensionsPath);
-			extensionsPath = newExtensionsPath;
-		}
+		resolveUpdateExtensionsPath();
 	}));
 }
 
-- 
GitLab