[less] update grammar

aeschli · aeschli · commit 422ff199cadc · 2017-05-25T12:27:38.000+02:00
diff --git a/extensions/less/syntaxes/less.tmLanguage.json b/extensions/less/syntaxes/less.tmLanguage.json
@@ -146,12 +146,7 @@
 			"name": "comment.block.css"
 		},
 		{
-			"match": "[+-]?\\d*\\.?\\d+",
-			"name": "constant.numeric.css"
-		},
-		{
-			"match": "(?<=[\\d])(ch|cm|deg|dpi|dpcm|dppx|em|ex|grad|in|mm|ms|pc|pt|px|rad|rem|turn|s|vh|vmin|vw)\\b|%",
-			"name": "keyword.other.unit.css"
+			"include": "source.css#numeric-values"
 		},
 		{
 			"captures": {
@@ -281,13 +276,13 @@
 			]
 		},
 		{
+			"match": "(@|\\-\\-)[\\w-]+(?=\\s*)",
+			"name": "variable.other.less",
 			"captures": {
 				"1": {
 					"name": "punctuation.definition.variable.less"
 				}
-			},
-			"match": "(?:@|\\-\\-)[a-zA-Z0-9_-][\\w-]*(?=\\s*)",
-			"name": "variable.other.less"
+			}
 		},
 		{
 			"include": "#variable_interpolation"
@@ -516,7 +511,7 @@
 							"include": "#strings"
 						},
 						{
-							"match": "(\\b|\\.{0,2}/).*\\b",
+							"match": "(\\b|\\.{0,2}/)[^)]*\\b",
 							"name": "string.url.css"
 						}
 					]
@@ -546,5 +541,5 @@
 			"name": "support.function.any-method.builtin.less"
 		}
 	},
-	"version": "https://github.com/atom/language-less/commit/7d70b66aa9c853d59e27cce25b5bc25cb067e75a"
+	"version": "https://github.com/atom/language-less/commit/4661d870784f725599e438bf683553cc6cf0f4ed"
 }
diff --git a/extensions/less/test/colorize-results/14119_less.json b/extensions/less/test/colorize-results/14119_less.json
@@ -33,7 +33,18 @@
 		}
 	},
 	{
-		"c": "@hm",
+		"c": "@",
+		"t": "source.css.less variable.other.less punctuation.definition.variable.less",
+		"r": {
+			"dark_plus": "variable.other.less: #9CDCFE",
+			"light_plus": "variable.other.less: #FF0000",
+			"dark_vs": "variable.other.less: #9CDCFE",
+			"light_vs": "variable.other.less: #FF0000",
+			"hc_black": "variable.other.less: #D4D4D4"
+		}
+	},
+	{
+		"c": "hm",
 		"t": "source.css.less variable.other.less",
 		"r": {
 			"dark_plus": "variable.other.less: #9CDCFE",
diff --git a/extensions/less/test/colorize-results/test-cssvariables_less.json b/extensions/less/test/colorize-results/test-cssvariables_less.json
@@ -55,7 +55,18 @@
 		}
 	},
 	{
-		"c": "--spacing-unit",
+		"c": "--",
+		"t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less",
+		"r": {
+			"dark_plus": "variable.other.less: #9CDCFE",
+			"light_plus": "variable.other.less: #FF0000",
+			"dark_vs": "variable.other.less: #9CDCFE",
+			"light_vs": "variable.other.less: #FF0000",
+			"hc_black": "variable.other.less: #D4D4D4"
+		}
+	},
+	{
+		"c": "spacing-unit",
 		"t": "source.css.less meta.property-list.css variable.other.less",
 		"r": {
 			"dark_plus": "variable.other.less: #9CDCFE",
@@ -100,7 +111,7 @@
 	},
 	{
 		"c": "px",
-		"t": "source.css.less meta.property-list.css meta.property-value.css keyword.other.unit.css",
+		"t": "source.css.less meta.property-list.css meta.property-value.css constant.numeric.css keyword.other.unit.px.css",
 		"r": {
 			"dark_plus": "keyword.other.unit: #B5CEA8",
 			"light_plus": "keyword.other.unit: #09885A",
@@ -132,7 +143,18 @@
 		}
 	},
 	{
-		"c": "--cell-padding",
+		"c": "--",
+		"t": "source.css.less meta.property-list.css variable.other.less punctuation.definition.variable.less",
+		"r": {
+			"dark_plus": "variable.other.less: #9CDCFE",
+			"light_plus": "variable.other.less: #FF0000",
+			"dark_vs": "variable.other.less: #9CDCFE",
+			"light_vs": "variable.other.less: #FF0000",
+			"hc_black": "variable.other.less: #D4D4D4"
+		}
+	},
+	{
+		"c": "cell-padding",
 		"t": "source.css.less meta.property-list.css variable.other.less",
 		"r": {
 			"dark_plus": "variable.other.less: #9CDCFE",
diff --git a/extensions/less/test/colorize-results/test_less.json b/extensions/less/test/colorize-results/test_less.json

Original file line number	Diff line number	Diff line change
`@@ -146,12 +146,7 @@`
`146`	`146`	`"name": "comment.block.css"`
`147`	`147`	`},`
`148`	`148`	`{`
`149`		`- "match": "[+-]?\\d*\\.?\\d+",`
`150`		`- "name": "constant.numeric.css"`
`151`		`- },`
`152`		`- {`
`153`		`- "match": "(?<=[\\d])(ch\|cm\|deg\|dpi\|dpcm\|dppx\|em\|ex\|grad\|in\|mm\|ms\|pc\|pt\|px\|rad\|rem\|turn\|s\|vh\|vmin\|vw)\\b\|%",`
`154`		`- "name": "keyword.other.unit.css"`
	`149`	`+ "include": "source.css#numeric-values"`
`155`	`150`	`},`
`156`	`151`	`{`
`157`	`152`	`"captures": {`
`@@ -281,13 +276,13 @@`
`281`	`276`	`]`
`282`	`277`	`},`
`283`	`278`	`{`
	`279`	`+ "match": "(@\|\\-\\-)[\\w-]+(?=\\s*)",`
	`280`	`+ "name": "variable.other.less",`
`284`	`281`	`"captures": {`
`285`	`282`	`"1": {`
`286`	`283`	`"name": "punctuation.definition.variable.less"`
`287`	`284`	`}`
`288`		`- },`
`289`		`- "match": "(?:@\|\\-\\-)[a-zA-Z0-9_-][\\w-](?=\\s)",`
`290`		`- "name": "variable.other.less"`
	`285`	`+ }`
`291`	`286`	`},`
`292`	`287`	`{`
`293`	`288`	`"include": "#variable_interpolation"`
`@@ -516,7 +511,7 @@`
`516`	`511`	`"include": "#strings"`
`517`	`512`	`},`
`518`	`513`	`{`
`519`		`- "match": "(\\b\|\\.{0,2}/).*\\b",`
	`514`	`+ "match": "(\\b\|\\.{0,2}/)[^)]*\\b",`
`520`	`515`	`"name": "string.url.css"`
`521`	`516`	`}`
`522`	`517`	`]`
`@@ -546,5 +541,5 @@`
`546`	`541`	`"name": "support.function.any-method.builtin.less"`
`547`	`542`	`}`
`548`	`543`	`},`
`549`		`- "version": "https://github.com/atom/language-less/commit/7d70b66aa9c853d59e27cce25b5bc25cb067e75a"`
	`544`	`+ "version": "https://github.com/atom/language-less/commit/4661d870784f725599e438bf683553cc6cf0f4ed"`
`550`	`545`	`}`