Merging for 20170525201950.

pvspain · May 25, 2017 · be09e13 · be09e13
2 parents cd62fde + 92be0f0
commit be09e13
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts b/src/vs/workbench/parts/emmet/electron-browser/actions/expandAbbreviation.ts
@@ -33,7 +33,7 @@ class ExpandAbbreviationAction extends BasicEmmetEditorAction {
 					EditorContextKeys.hasSingleSelection,
 					EditorContextKeys.tabDoesNotMoveFocus,
 					ContextKeyExpr.has('config.emmet.triggerExpansionOnTab'),
-					ContextKeyExpr.not('config.emmet.suggestExpandedAbbreviation')
+					ContextKeyExpr.not('config.emmet.useModules')
 				)
 			}
 		);