From c30e2d46b2af085848b5749e8f67a54f60f5ef29 Mon Sep 17 00:00:00 2001
From: Hsuan-An Weng Lin <lancewenglin@gmail.com>
Date: Mon, 1 Mar 2021 11:50:14 -0600
Subject: [PATCH] Fix emmet update extensions path issue (#117797)

* Emmet: fix unloaded emmetHelper

* Emmet: fix wrong type of error object
---
 extensions/emmet/src/emmetCommon.ts | 3 +--
 extensions/emmet/src/util.ts        | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/extensions/emmet/src/emmetCommon.ts b/extensions/emmet/src/emmetCommon.ts
index 93c58f5ae1e..cb8dc21c586 100644
--- a/extensions/emmet/src/emmetCommon.ts
+++ b/extensions/emmet/src/emmetCommon.ts
@@ -23,6 +23,7 @@ import { addFileToParseCache, removeFileFromParseCache } from './parseDocument';
 
 export function activateEmmetExtension(context: vscode.ExtensionContext) {
 	registerCompletionProviders(context);
+	updateEmmetExtensionsPath();
 
 	context.subscriptions.push(vscode.commands.registerCommand('editor.emmet.action.wrapWithAbbreviation', (args) => {
 		wrapWithAbbreviation(args);
@@ -125,8 +126,6 @@ export function activateEmmetExtension(context: vscode.ExtensionContext) {
 		vscode.commands.executeCommand('workbench.action.quickOpen', '>Emmet: ');
 	}));
 
-	updateEmmetExtensionsPath();
-
 	context.subscriptions.push(vscode.workspace.onDidChangeConfiguration((e) => {
 		if (e.affectsConfiguration('emmet.includeLanguages')) {
 			registerCompletionProviders(context);
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
index cdb796da920..2894647a472 100644
--- a/extensions/emmet/src/util.ts
+++ b/extensions/emmet/src/util.ts
@@ -28,7 +28,6 @@ export function getEmmetHelper() {
 	if (!_emmetHelper) {
 		_emmetHelper = require('vscode-emmet-helper');
 	}
-	updateEmmetExtensionsPath();
 	return _emmetHelper;
 }
 
@@ -36,9 +35,7 @@ export function getEmmetHelper() {
  * Update Emmet Helper to use user snippets from the extensionsPath setting
  */
 export function updateEmmetExtensionsPath(forceRefresh: boolean = false) {
-	if (!_emmetHelper) {
-		return;
-	}
+	const helper = getEmmetHelper();
 	let extensionsPath = vscode.workspace.getConfiguration('emmet')['extensionsPath'];
 	if (forceRefresh || _currentExtensionsPath !== extensionsPath) {
 		_currentExtensionsPath = extensionsPath;
@@ -47,7 +44,7 @@ export function updateEmmetExtensionsPath(forceRefresh: boolean = false) {
 		} else {
 			const rootPath = vscode.workspace.workspaceFolders[0].uri;
 			const fileSystem = vscode.workspace.fs;
-			_emmetHelper.updateExtensionsPath(extensionsPath, fileSystem, rootPath, _homeDir).then(null, (err: string) => vscode.window.showErrorMessage(err));
+			helper.updateExtensionsPath(extensionsPath, fileSystem, rootPath, _homeDir).catch(err => vscode.window.showErrorMessage(err.message));
 		}
 	}
 }