Stop supporting both syntaxProfiles, includeLanguage settings in new emmet microsoft#29678

ramya-rao-a · ramya-rao-a · commit 2f77f9fd6a71 · 2017-06-28T14:51:57.000-07:00
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()) {

Original file line number	Diff line number	Diff line change
`@@ -314,9 +314,7 @@ export abstract class EmmetEditorAction extends EditorAction {`
`314`	`314`
`315`	`315`	`if (configurationService.getConfiguration<IEmmetConfiguration>().emmet.useNewEmmet`
`316`	`316`	`&& (mappedCommand === 'emmet.expandAbbreviation' \|\| mappedCommand === 'emmet.wrapWithAbbreviation')) {`
`317`		`- return commandService.executeCommand<void>(mappedCommand, { language: editorAccessor.getSyntax() });`
`318`		`- // Below is for when disucssion at https://github.com/Microsoft/vscode/issues/29678 is resolved`
`319`		`- //return commandService.executeCommand<void>(mappedCommand, editorAccessor.getLanguage());`
	`317`	`+ return commandService.executeCommand<void>(mappedCommand, editorAccessor.getLanguage());`
`320`	`318`	`}`
`321`	`319`
`322`	`320`	`if (!editorAccessor.isEmmetEnabledMode()) {`