Merge remote-tracking branch 'origin/master' into alex/tokenization

extensions/javascript/package.json

@@ -27,7 +27,7 @@
 				"extensions": [
 					".jsx"
 				],
-				"configuration": "./language-configuration.json"
+				"configuration": "./javascript-language-configuration.json"
 			},
 			{
 				"id": "javascript",
@@ -47,19 +47,31 @@
 				"mimetypes": [
 					"text/javascript"
 				],
-				"configuration": "./language-configuration.json"
+				"configuration": "./javascript-language-configuration.json"
+			},
+			{
+				"id": "jsx-tags",
+				"configuration": "./tags-language-configuration.json"
 			}
 		],
 		"grammars": [
 			{
 				"language": "javascriptreact",
 				"scopeName": "source.js",
-				"path": "./syntaxes/JavaScript.tmLanguage.json"
+				"path": "./syntaxes/JavaScript.tmLanguage.json",
+				"embeddedLanguages": {
+					"meta.tag.js": "jsx-tags",
+					"meta.tag.without-attributes.js": "jsx-tags"
+				}
 			},
 			{
 				"language": "javascript",
 				"scopeName": "source.js",
-				"path": "./syntaxes/JavaScript.tmLanguage.json"
+				"path": "./syntaxes/JavaScript.tmLanguage.json",
+				"embeddedLanguages": {
+					"meta.tag.js": "jsx-tags",
+					"meta.tag.without-attributes.js": "jsx-tags"
+				}
 			},
 			{
 				"scopeName": "source.js.regexp",

extensions/javascript/tags-language-configuration.json

@@ -0,0 +1,27 @@
+{
+	"comments": {
+		"blockComment": [ "{/*", "*/}" ]
+	},
+	"brackets": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["<", ">"]
+	],
+	"autoClosingPairs": [
+		{ "open": "{", "close": "}" },
+		{ "open": "[", "close": "]" },
+		{ "open": "(", "close": ")" },
+		{ "open": "'", "close": "'", "notIn": ["string", "comment"] },
+		{ "open": "\"", "close": "\"", "notIn": ["string"] },
+		{ "open": "/**", "close": " */", "notIn": ["string"] }
+	],
+	"surroundingPairs": [
+		["{", "}"],
+		["[", "]"],
+		["(", ")"],
+		["<", ">"],
+		["'", "'"],
+		["\"", "\""]
+	]
+}