Use new emmet for all emmet actions other than expand and wrap abbr

ramya-rao-a · ramya-rao-a · commit 8ace8efaf974 · 2017-06-26T10:14:35.000-07:00
diff --git a/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts b/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts
@@ -296,7 +296,7 @@ export abstract class EmmetEditorAction extends EditorAction {
 		const telemetryService = accessor.get(ITelemetryService);
 		const commandService = accessor.get(ICommandService);
 
-		let mappedCommand = configurationService.getConfiguration<IEmmetConfiguration>().emmet.useNewEmmet ? this.actionMap[this.id] : undefined;
+		let mappedCommand = this.actionMap[this.id];
 		if (mappedCommand && mappedCommand !== 'emmet.expandAbbreviation' && mappedCommand !== 'emmet.wrapWithAbbreviation') {
 			return commandService.executeCommand<void>(mappedCommand);
 		}
@@ -312,7 +312,8 @@ export abstract class EmmetEditorAction extends EditorAction {
 				this.emmetActionName
 			);
 
-			if (mappedCommand === 'emmet.expandAbbreviation' || mappedCommand === 'emmet.wrapWithAbbreviation') {
+			if (configurationService.getConfiguration<IEmmetConfiguration>().emmet.useNewEmmet
+				&& (mappedCommand === 'emmet.expandAbbreviation' || mappedCommand === 'emmet.wrapWithAbbreviation')) {
 				let syntax = editorAccessor.getSyntax();
 				return commandService.executeCommand<void>(mappedCommand, { syntax });
 			}
