Support both syntaxProfiles and includeLanguages until #29678 is resolved

extensions/emmet/src/util.ts

@@ -62,7 +62,7 @@ export function getMappedSyntax(syntax: string): string {
 	if (!syntax) {
 		return;
 	}
-	if (/\b(typescriptreact|javascriptreact|jsx-tags)\b/.test(syntax)) { // treat tsx like jsx
+	if (/\b(typescriptreact|javascriptreact|jsx-tags|jsx)\b/.test(syntax)) { // treat tsx like jsx
 		return 'jsx';
 	}
 	if (syntax === 'sass-indented') { // map sass-indented to sass

src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts

@@ -314,7 +314,9 @@ export abstract class EmmetEditorAction extends EditorAction {
 
 			if (configurationService.getConfiguration<IEmmetConfiguration>().emmet.useNewEmmet
 				&& (mappedCommand === 'emmet.expandAbbreviation' || mappedCommand === 'emmet.wrapWithAbbreviation')) {
-				return commandService.executeCommand<void>(mappedCommand, editorAccessor.getLanguage());
+				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());
 			}
 
 			if (!editorAccessor.isEmmetEnabledMode()) {