Stop supporting both syntaxProfiles, includeLanguage settings in new …

…emmet #29678
microsoft · Jun 28, 2017 · 2f77f9f · 2f77f9f
1 parent 04f25df
commit 2f77f9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
@@ -25,9 +25,13 @@ export const LANGUAGE_MODES: Object = {
 	'typescriptreact': ['.', '}']
 };
 
-// Explicitly map languages to their parent language to get emmet completion support
+// Explicitly map languages that have built-in grammar in VS Code to their parent language
+// to get emmet completion support
+// For other languages, users will have to use `emmet.includeLanguages` or
+// language specific extensions can provide emmet completion support
 export const MAPPED_MODES: Object = {
-	'handlebars': 'html'
+	'handlebars': 'html',
+	'php': 'html'
 };
 export function validate(allowStylesheet: boolean = true): boolean {
 	let editor = vscode.window.activeTextEditor;

diff --git a/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts b/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts
@@ -314,9 +314,7 @@ export abstract class EmmetEditorAction extends EditorAction {
 
 			if (configurationService.getConfiguration<IEmmetConfiguration>().emmet.useNewEmmet
 				&& (mappedCommand === 'emmet.expandAbbreviation' || mappedCommand === 'emmet.wrapWithAbbreviation')) {
-				return commandService.executeCommand<void>(mappedCommand, { language: editorAccessor.getSyntax() });
-				// Below is for when disucssion at https://github.com/Microsoft/vscode/issues/29678 is resolved
-				//return commandService.executeCommand<void>(mappedCommand, editorAccessor.getLanguage());
+				return commandService.executeCommand<void>(mappedCommand, editorAccessor.getLanguage());
 			}
 
 			if (!editorAccessor.isEmmetEnabledMode()) {