[scss] update grammar

aeschli · aeschli · commit dba4da9cba83 · 2017-05-25T12:27:37.000+02:00
diff --git a/extensions/scss/syntaxes/scss.json b/extensions/scss/syntaxes/scss.json
@@ -890,15 +890,6 @@
 				}
 			]
 		},
-		"constant_hex": {
-			"captures": {
-				"1": {
-					"name": "punctuation.definition.constant.scss"
-				}
-			},
-			"match": "(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\\b",
-			"name": "constant.numeric.color.hex-value.scss"
-		},
 		"constant_important": {
 			"match": "!important",
 			"name": "keyword.other.important.scss"
@@ -907,10 +898,6 @@
 			"match": "\\b(\\+|-|\\*|/)\\b",
 			"name": "support.constant.mathematical-symbols.scss"
 		},
-		"constant_number": {
-			"match": "(\\b([0-9]+(\\.[0-9]+)?)|\\B\\.[0-9]+)(?=\\s*(ch|cm|deg|dpi|dpcm|dppx|em|ex|grad|in|mm|mozmm|ms|pc|pt|px|rad|rem|turn|s|vh|vmin|vmax|vw|\\b))",
-			"name": "constant.numeric.scss"
-		},
 		"constant_optional": {
 			"match": "!optional",
 			"name": "keyword.other.optional.scss"
@@ -937,10 +924,6 @@
 				}
 			]
 		},
-		"constant_unit": {
-			"match": "(?<=[\\d])(ch|cm|deg|dpi|dpcm|dppx|em|ex|grad|in|mm|mozmm|ms|pc|pt|px|rad|rem|turn|s|vh|vmin|vmax|vw)\\b|%",
-			"name": "keyword.other.unit.scss"
-		},
 		"flow_control": {
 			"patterns": [
 				{
@@ -1242,9 +1225,6 @@
 				{
 					"include": "#constant_sass_functions"
 				},
-				{
-					"include": "#constant_hex"
-				},
 				{
 					"include": "#constant_important"
 				},
@@ -1255,10 +1235,7 @@
 					"include": "#constant_optional"
 				},
 				{
-					"include": "#constant_unit"
-				},
-				{
-					"include": "#constant_number"
+					"include": "source.css#numeric-values"
 				},
 				{
 					"include": "source.css#property-keywords"
@@ -1543,7 +1520,7 @@
 						},
 						{
 							"match": "\\d+",
-							"name": "constant.numeric.scss"
+							"name": "constant.numeric.css"
 						},
 						{
 							"match": "(?<=\\d)n\\b|\\b(n|even|odd)\\b",
@@ -1698,5 +1675,5 @@
 			"name": "variable.scss"
 		}
 	},
-	"version": "https://github.com/atom/language-sass/commit/f477576a0ff819657495142f7e64e577a837fadb"
+	"version": "https://github.com/atom/language-sass/commit/8b8b7b52655ab5cf4dbe597443abe4b078bb6953"
 }
diff --git a/extensions/scss/test/colorize-results/test-cssvariables_scss.json b/extensions/scss/test/colorize-results/test-cssvariables_scss.json
@@ -89,7 +89,7 @@
 	},
 	{
 		"c": "6",
-		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.scss",
+		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -100,7 +100,7 @@
 	},
 	{
 		"c": "px",
-		"t": "source.css.scss meta.property-list.scss meta.property-value.scss keyword.other.unit.scss",
+		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css",
 		"r": {
 			"dark_plus": "keyword.other.unit: #B5CEA8",
 			"light_plus": "keyword.other.unit: #09885A",
@@ -177,7 +177,7 @@
 	},
 	{
 		"c": "4",
-		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.scss",
+		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -397,7 +397,7 @@
 	},
 	{
 		"c": "4",
-		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.scss",
+		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -496,7 +496,7 @@
 	},
 	{
 		"c": "5",
-		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.scss",
+		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css",
 		"r": {
 			"dark_plus": "constant.numeric: #B5CEA8",
 			"light_plus": "constant.numeric: #09885A",
@@ -507,7 +507,7 @@
 	},
 	{
 		"c": "px",
-		"t": "source.css.scss meta.property-list.scss meta.property-value.scss keyword.other.unit.scss",
+		"t": "source.css.scss meta.property-list.scss meta.property-value.scss constant.numeric.css keyword.other.unit.px.css",
 		"r": {
 			"dark_plus": "keyword.other.unit: #B5CEA8",
 			"light_plus": "keyword.other.unit: #09885A",
diff --git a/extensions/scss/test/colorize-results/test_scss.json b/extensions/scss/test/colorize-results/test_scss.json
