[css] update grammar

aeschli · aeschli · commit beee645a2944 · 2017-05-18T10:06:02.000+02:00
diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json
@@ -182,7 +182,7 @@
 				},
 				{
 					"begin": "(?i)(?=@media(\\s|\\(|/\\*|$))",
-					"end": "(?<=})",
+					"end": "(?<=})(?!\\G)",
 					"patterns": [
 						{
 							"begin": "(?i)\\G(@)media",
@@ -226,7 +226,7 @@
 				},
 				{
 					"begin": "(?i)(?=@counter-style([\\s'\"{;]|/\\*|$))",
-					"end": "(?<=})",
+					"end": "(?<=})(?!\\G)",
 					"patterns": [
 						{
 							"begin": "(?i)\\G(@)counter-style",
@@ -292,7 +292,7 @@
 				},
 				{
 					"begin": "(?i)(?=@document([\\s'\"{;]|/\\*|$))",
-					"end": "(?<=})",
+					"end": "(?<=})(?!\\G)",
 					"patterns": [
 						{
 							"begin": "(?i)\\G(@)document",
@@ -377,11 +377,11 @@
 					]
 				},
 				{
-					"begin": "(?i)(?=@keyframes([\\s'\"{;]|/\\*|$))",
-					"end": "(?<=})",
+					"begin": "(?i)(?=@(?:-(?:webkit|moz|o|ms)-)?keyframes([\\s'\"{;]|/\\*|$))",
+					"end": "(?<=})(?!\\G)",
 					"patterns": [
 						{
-							"begin": "(?i)\\G(@)keyframes",
+							"begin": "(?i)\\G(@)(?:-(?:webkit|moz|o|ms)-)?keyframes",
 							"beginCaptures": {
 								"0": {
 									"name": "keyword.control.at-rule.keyframes.css"
@@ -455,7 +455,7 @@
 				},
 				{
 					"begin": "(?i)(?=@supports(\\s|\\(|/\\*|$))",
-					"end": "(?<=})|(?=;)",
+					"end": "(?<=})(?!\\G)|(?=;)",
 					"patterns": [
 						{
 							"begin": "(?i)\\G(@)supports",
@@ -1409,7 +1409,7 @@
 					"name": "invalid.illegal.colon.css"
 				}
 			},
-			"match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|fullscreen|host|hover\n  | in-range|indeterminate|invalid|left|link|optional|out-of-range\n  | read-only|read-write|required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-])",
+			"match": "(?xi)\n(:)(:*)\n(?: active|any-link|checked|default|disabled|empty|enabled|first\n  | (?:first|last|only)-(?:child|of-type)|focus|fullscreen|host|hover\n  | in-range|indeterminate|invalid|left|link|optional|out-of-range\n  | read-only|read-write|required|right|root|scope|target|unresolved\n  | valid|visited\n)(?![\\w-]|\\s*[;}])",
 			"name": "entity.other.attribute-name.pseudo-class.css"
 		},
 		"pseudo-elements": {
@@ -1421,7 +1421,7 @@
 					"name": "punctuation.definition.entity.css"
 				}
 			},
-			"match": "(?xi)\n(?:\n  (::?)                       # Elements using both : and :: notation\n  (?: after\n    | before\n    | first-letter\n    | first-line\n    | (?:-(?:ah|apple|atsc|epub|hp|khtml|moz\n            |ms|o|rim|ro|tc|wap|webkit|xv)\n        | (?:mso|prince))\n      -[a-z-]+\n  )\n  |\n  (::)                        # Double-colon only\n  (?: backdrop\n    | content\n    | grammar-error\n    | marker\n    | placeholder\n    | selection\n    | shadow\n    | spelling-error\n  )\n)\n(?![\\w-])",
+			"match": "(?xi)\n(?:\n  (::?)                       # Elements using both : and :: notation\n  (?: after\n    | before\n    | first-letter\n    | first-line\n    | (?:-(?:ah|apple|atsc|epub|hp|khtml|moz\n            |ms|o|rim|ro|tc|wap|webkit|xv)\n        | (?:mso|prince))\n      -[a-z-]+\n  )\n  |\n  (::)                        # Double-colon only\n  (?: backdrop\n    | content\n    | grammar-error\n    | marker\n    | placeholder\n    | selection\n    | shadow\n    | spelling-error\n  )\n)\n(?![\\w-]|\\s*[;}])",
 			"name": "entity.other.attribute-name.pseudo-element.css"
 		},
 		"rule-list": {
@@ -1797,5 +1797,5 @@
 			]
 		}
 	},
-	"version": "https://github.com/atom/language-css/commit/a2c17d3526e6381992b173d6cead428419751e34"
+	"version": "https://github.com/atom/language-css/commit/df34a7a41fa6acd6d867c6c2214dba12dc0a4c31"
 }

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@`
`182`	`182`	`},`
`183`	`183`	`{`
`184`	`184`	`"begin": "(?i)(?=@media(\\s\|\\(\|/\\*\|$))",`
`185`		`- "end": "(?<=})",`
	`185`	`+ "end": "(?<=})(?!\\G)",`
`186`	`186`	`"patterns": [`
`187`	`187`	`{`
`188`	`188`	`"begin": "(?i)\\G(@)media",`
`@@ -226,7 +226,7 @@`
`226`	`226`	`},`
`227`	`227`	`{`
`228`	`228`	`"begin": "(?i)(?=@counter-style([\\s'\"{;]\|/\\*\|$))",`
`229`		`- "end": "(?<=})",`
	`229`	`+ "end": "(?<=})(?!\\G)",`
`230`	`230`	`"patterns": [`
`231`	`231`	`{`
`232`	`232`	`"begin": "(?i)\\G(@)counter-style",`
`@@ -292,7 +292,7 @@`
`292`	`292`	`},`
`293`	`293`	`{`
`294`	`294`	`"begin": "(?i)(?=@document([\\s'\"{;]\|/\\*\|$))",`
`295`		`- "end": "(?<=})",`
	`295`	`+ "end": "(?<=})(?!\\G)",`
`296`	`296`	`"patterns": [`
`297`	`297`	`{`
`298`	`298`	`"begin": "(?i)\\G(@)document",`
`@@ -377,11 +377,11 @@`
`377`	`377`	`]`
`378`	`378`	`},`
`379`	`379`	`{`
`380`		`- "begin": "(?i)(?=@keyframes([\\s'\"{;]\|/\\*\|$))",`
`381`		`- "end": "(?<=})",`
	`380`	`+ "begin": "(?i)(?=@(?:-(?:webkit\|moz\|o\|ms)-)?keyframes([\\s'\"{;]\|/\\*\|$))",`
	`381`	`+ "end": "(?<=})(?!\\G)",`
`382`	`382`	`"patterns": [`
`383`	`383`	`{`
`384`		`- "begin": "(?i)\\G(@)keyframes",`
	`384`	`+ "begin": "(?i)\\G(@)(?:-(?:webkit\|moz\|o\|ms)-)?keyframes",`
`385`	`385`	`"beginCaptures": {`
`386`	`386`	`"0": {`
`387`	`387`	`"name": "keyword.control.at-rule.keyframes.css"`
`@@ -455,7 +455,7 @@`
`455`	`455`	`},`
`456`	`456`	`{`
`457`	`457`	`"begin": "(?i)(?=@supports(\\s\|\\(\|/\\*\|$))",`
`458`		`- "end": "(?<=})\|(?=;)",`
	`458`	`+ "end": "(?<=})(?!\\G)\|(?=;)",`
`459`	`459`	`"patterns": [`
`460`	`460`	`{`
`461`	`461`	`"begin": "(?i)\\G(@)supports",`
`@@ -1409,7 +1409,7 @@`
`1409`	`1409`	`"name": "invalid.illegal.colon.css"`
`1410`	`1410`	`}`
`1411`	`1411`	`},`
`1412`		`- "match": "(?xi)\n(:)(:*)\n(?: active\|any-link\|checked\|default\|disabled\|empty\|enabled\|first\n \| (?:first\|last\|only)-(?:child\|of-type)\|focus\|fullscreen\|host\|hover\n \| in-range\|indeterminate\|invalid\|left\|link\|optional\|out-of-range\n \| read-only\|read-write\|required\|right\|root\|scope\|target\|unresolved\n \| valid\|visited\n)(?![\\w-])",`
	`1412`	`+ "match": "(?xi)\n(:)(:)\n(?: active\|any-link\|checked\|default\|disabled\|empty\|enabled\|first\n \| (?:first\|last\|only)-(?:child\|of-type)\|focus\|fullscreen\|host\|hover\n \| in-range\|indeterminate\|invalid\|left\|link\|optional\|out-of-range\n \| read-only\|read-write\|required\|right\|root\|scope\|target\|unresolved\n \| valid\|visited\n)(?![\\w-]\|\\s[;}])",`
`1413`	`1413`	`"name": "entity.other.attribute-name.pseudo-class.css"`
`1414`	`1414`	`},`
`1415`	`1415`	`"pseudo-elements": {`
`@@ -1421,7 +1421,7 @@`
`1421`	`1421`	`"name": "punctuation.definition.entity.css"`
`1422`	`1422`	`}`
`1423`	`1423`	`},`
`1424`		- "match": "(?xi)\n(?:\n (::?) # Elements using both : and :: notation\n (?: after\n \| before\n \| first-letter\n \| first-line\n \| (?:-(?:ah\|apple\|atsc\|epub\|hp\|khtml\|moz\n \|ms\|o\|rim\|ro\|tc\|wap\|webkit\|xv)\n \| (?:mso\|prince))\n -[a-z-]+\n )\n \|\n (::) # Double-colon only\n (?: backdrop\n \| content\n \| grammar-error\n \| marker\n \| placeholder\n \| selection\n \| shadow\n \| spelling-error\n )\n)\n(?![\\w-])",
	`1424`	+ "match": "(?xi)\n(?:\n (::?) # Elements using both : and :: notation\n (?: after\n \| before\n \| first-letter\n \| first-line\n \| (?:-(?:ah\|apple\|atsc\|epub\|hp\|khtml\|moz\n \|ms\|o\|rim\|ro\|tc\|wap\|webkit\|xv)\n \| (?:mso\|prince))\n -[a-z-]+\n )\n \|\n (::) # Double-colon only\n (?: backdrop\n \| content\n \| grammar-error\n \| marker\n \| placeholder\n \| selection\n \| shadow\n \| spelling-error\n )\n)\n(?![\\w-]\|\\s*[;}])",
`1425`	`1425`	`"name": "entity.other.attribute-name.pseudo-element.css"`
`1426`	`1426`	`},`
`1427`	`1427`	`"rule-list": {`
`@@ -1797,5 +1797,5 @@`
`1797`	`1797`	`]`
`1798`	`1798`	`}`
`1799`	`1799`	`},`
`1800`		`- "version": "https://github.com/atom/language-css/commit/a2c17d3526e6381992b173d6cead428419751e34"`
	`1800`	`+ "version": "https://github.com/atom/language-css/commit/df34a7a41fa6acd6d867c6c2214dba12dc0a4c31"`
`1801`	`1801`	`}`