Emmet suggestions for jsx only when expicitly asked for microsoft#29532

ramya-rao-a · ramya-rao-a · commit 04f25df8458a · 2017-06-28T14:39:44.000-07:00
diff --git a/extensions/emmet/package.json b/extensions/emmet/package.json
@@ -40,8 +40,8 @@
                 },
                 "emmet.includeLanguages": {
                     "type": "object",
-                    "default": {},
-                    "description": "Enable emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported syntax.\n Eg: {\"php\": \"html\"}"
+                    "default": {}, 
+                    "description": "Enable emmet abbreviations in languages that are not supported by default. Add a mapping here between the language and emmet supported language.\n Eg: {\"php\": \"html\", \"javascript\": \"javascriptreact\"}"
                 },
                 "emmet.variables":{
                     "type": "object",
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -26,7 +26,9 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 			syntax = this.syntaxHelper(syntax, document, position);
 		}
 
-		if (!syntax || (isSyntaxMapped && vscode.workspace.getConfiguration('emmet')['showExpandedAbbreviation'] !== 'always')) {
+		if (!syntax
+			|| ((isSyntaxMapped || syntax === 'jsx')
+				&& vscode.workspace.getConfiguration('emmet')['showExpandedAbbreviation'] !== 'always')) {
 			return;
 		}
 
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
@@ -20,7 +20,9 @@ export const LANGUAGE_MODES: Object = {
 	'scss': [':'],
 	'sass': [':'],
 	'less': [':'],
-	'stylus': [':']
+	'stylus': [':'],
+	'javascriptreact': ['.', '}'],
+	'typescriptreact': ['.', '}']
 };
 
 // Explicitly map languages to their parent language to get emmet completion support

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi`
`26`	`26`	`syntax = this.syntaxHelper(syntax, document, position);`
`27`	`27`	`}`
`28`	`28`
`29`		`- if (!syntax \|\| (isSyntaxMapped && vscode.workspace.getConfiguration('emmet')['showExpandedAbbreviation'] !== 'always')) {`
	`29`	`+ if (!syntax`
	`30`	`+ \|\| ((isSyntaxMapped \|\| syntax === 'jsx')`
	`31`	`+ && vscode.workspace.getConfiguration('emmet')['showExpandedAbbreviation'] !== 'always')) {`
`30`	`32`	`return;`
`31`	`33`	`}`
`32`	`34`