Make sure we rewrite contentName for jsx grammar

extensions/javascript/syntaxes/JavaScript.tmLanguage.json

@@ -3225,7 +3225,7 @@
 					"include": "#expression"
 				}
 			],
-			"contentName": "meta.embedded.line.tsx"
+			"contentName": "meta.embedded.line.js"
 		},
 		"regex": {
 			"patterns": [
@@ -3482,7 +3482,7 @@
 						}
 					},
 					"end": "(?=^)",
-					"contentName": "comment.line.double-slash.tsx"
+					"contentName": "comment.line.double-slash.js"
 				}
 			]
 		},
@@ -4020,7 +4020,7 @@
 					"name": "punctuation.definition.tag.end.js"
 				}
 			},
-			"contentName": "meta.jsx.children.tsx",
+			"contentName": "meta.jsx.children.js",
 			"patterns": [
 				{
 					"include": "#jsx-children"
@@ -4124,7 +4124,7 @@
 						}
 					},
 					"end": "(?=</)",
-					"contentName": "meta.jsx.children.tsx",
+					"contentName": "meta.jsx.children.js",
 					"patterns": [
 						{
 							"include": "#jsx-children"

extensions/javascript/syntaxes/JavaScriptReact.tmLanguage.json

@@ -3225,7 +3225,7 @@
 					"include": "#expression"
 				}
 			],
-			"contentName": "meta.embedded.line.tsx"
+			"contentName": "meta.embedded.line.js.jsx"
 		},
 		"regex": {
 			"patterns": [
@@ -3482,7 +3482,7 @@
 						}
 					},
 					"end": "(?=^)",
-					"contentName": "comment.line.double-slash.tsx"
+					"contentName": "comment.line.double-slash.js.jsx"
 				}
 			]
 		},
@@ -4020,7 +4020,7 @@
 					"name": "punctuation.definition.tag.end.js.jsx"
 				}
 			},
-			"contentName": "meta.jsx.children.tsx",
+			"contentName": "meta.jsx.children.js.jsx",
 			"patterns": [
 				{
 					"include": "#jsx-children"
@@ -4124,7 +4124,7 @@
 						}
 					},
 					"end": "(?=</)",
-					"contentName": "meta.jsx.children.tsx",
+					"contentName": "meta.jsx.children.js.jsx",
 					"patterns": [
 						{
 							"include": "#jsx-children"

extensions/typescript/build/update-grammars.js

@@ -15,6 +15,9 @@ function adaptToJavaScript(grammar, replacementScope) {
 		if (typeof rule.name === 'string') {
 			rule.name = rule.name.replace(/\.tsx/g, replacementScope);
 		}
+		if (typeof rule.contentName === 'string') {
+			rule.contentName = rule.contentName.replace(/\.tsx/g, replacementScope);
+		}
 		for (var property in rule) {
 			var value = rule[property];
 			if (typeof value === 'object') {