Pull in updated coffeescript grammar

mjbvz · mjbvz · commit ff58f5083f57 · 2019-01-25T15:36:17.000-08:00
Fixes microsoft#67138
diff --git a/extensions/coffeescript/cgmanifest.json b/extensions/coffeescript/cgmanifest.json
@@ -6,12 +6,12 @@
 				"git": {
 					"name": "atom/language-coffee-script",
 					"repositoryUrl": "https://github.com/atom/language-coffee-script",
-					"commitHash": "a0da2a73ad817e2fc13c2ef8fcd2624017c39610"
+					"commitHash": "0f6db9143663e18b1ad00667820f46747dba495e"
 				}
 			},
 			"license": "MIT",
 			"description": "The file syntaxes/coffeescript.tmLanguage.json was derived from the Atom package https://github.com/atom/language-coffee-script which was originally converted from the TextMate bundle https://github.com/jashkenas/coffee-script-tmbundle.",
-			"version": "0.49.2"
+			"version": "0.49.3"
 		}
 	],
 	"version": 1
diff --git a/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json b/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json
@@ -4,10 +4,13 @@
 		"If you want to provide a fix or improvement, please create a pull request against the original repository.",
 		"Once accepted there, we are happy to receive an update request."
 	],
-	"version": "https://github.com/atom/language-coffee-script/commit/a0da2a73ad817e2fc13c2ef8fcd2624017c39610",
+	"version": "https://github.com/atom/language-coffee-script/commit/0f6db9143663e18b1ad00667820f46747dba495e",
 	"name": "CoffeeScript",
 	"scopeName": "source.coffee",
 	"patterns": [
+		{
+			"include": "#jsx"
+		},
 		{
 			"match": "(new)\\s+(?:(?:(class)\\s+(\\w+(?:\\.\\w*)*)?)|(\\w+(?:\\.\\w*)*))",
 			"name": "meta.class.instance.constructor.coffee",
@@ -1213,6 +1216,101 @@
 					"include": "#embedded_comment"
 				}
 			]
+		},
+		"jsx": {
+			"patterns": [
+				{
+					"include": "#jsx-tag"
+				},
+				{
+					"include": "#jsx-end-tag"
+				}
+			]
+		},
+		"jsx-expression": {
+			"begin": "{",
+			"beginCaptures": {
+				"0": {
+					"name": "meta.brace.curly.coffee"
+				}
+			},
+			"end": "}",
+			"endCaptures": {
+				"0": {
+					"name": "meta.brace.curly.coffee"
+				}
+			},
+			"patterns": [
+				{
+					"include": "#double_quoted_string"
+				},
+				{
+					"include": "$self"
+				}
+			]
+		},
+		"jsx-attribute": {
+			"patterns": [
+				{
+					"captures": {
+						"1": {
+							"name": "entity.other.attribute-name.coffee"
+						},
+						"2": {
+							"name": "keyword.operator.assignment.coffee"
+						}
+					},
+					"match": "(?:^|\\s+)([-\\w.]+)\\s*(=)"
+				},
+				{
+					"include": "#double_quoted_string"
+				},
+				{
+					"include": "#single_quoted_string"
+				},
+				{
+					"include": "#jsx-expression"
+				}
+			]
+		},
+		"jsx-tag": {
+			"patterns": [
+				{
+					"begin": "(<)([-\\w\\.]+)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.coffee"
+						},
+						"2": {
+							"name": "entity.name.tag.coffee"
+						}
+					},
+					"end": "(/?>)",
+					"name": "meta.tag.coffee",
+					"patterns": [
+						{
+							"include": "#jsx-attribute"
+						}
+					]
+				}
+			]
+		},
+		"jsx-end-tag": {
+			"patterns": [
+				{
+					"begin": "(</)([-\\w\\.]+)",
+					"beginCaptures": {
+						"1": {
+							"name": "punctuation.definition.tag.coffee"
+						},
+						"2": {
+							"name": "entity.name.tag.coffee"
+						}
+					},
+					"end": "(/?>)",
+					"name": "meta.tag.coffee"
+				}
+			]
 		}
 	}
 }
