1 files changed, 72 insertions, 53 deletions
diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm
index 72009e76..1b876c4b 100644
--- a/queries/css/highlights.scm
+++ b/queries/css/highlights.scm
@@ -1,72 +1,91 @@
-"@media" @keyword
-"@import" @include
-"@charset" @keyword
-"@namespace" @keyword
-"@supports" @keyword
-"@keyframes" @keyword
-(at_keyword) @keyword
-(to) @keyword
-(from) @keyword
-(important) @keyword
+[
+ "@media"
+ "@import"
+ "@charset"
+ "@namespace"
+ "@supports"
+ "@keyframes"
+ (at_keyword)
+ (to)
+ (from)
+ (important)
+ ] @keyword
 
 (comment) @comment
 
-(tag_name) @type
-(nesting_selector) @type
-(universal_selector) @type
+[
+ (tag_name)
+ (nesting_selector)
+ (universal_selector)
+ ] @type
 
 (function_name) @function
 
-"~" @operator
-">" @operator
-"+" @operator
-"-" @operator
-"*" @operator
-"/" @operator
-"=" @operator
-"^=" @operator
-"|=" @operator
-"~=" @operator
-"$=" @operator
-"*=" @operator
+[
+ "~"
+ ">"
+ "+"
+ "-"
+ "*"
+ "/"
+ "="
+ "^="
+ "|="
+ "~="
+ "$="
+ "*=" 
+ "and"
+ "or"
+ "not"
+ "only"
+ ] @operator
 
-"and" @operator
-"or" @operator
-"not" @operator
-"only" @operator
 
 (attribute_selector (plain_value) @string)
 (pseudo_element_selector (tag_name) @property)
 (pseudo_class_selector (class_name) @property)
 
-(class_name) @property
-(id_name) @property
-(namespace_name) @property
-(property_name) @property
-(feature_name) @property
-(attribute_name) @property
+[
+ (class_name)
+ (id_name)
+ (namespace_name)
+ (property_name)
+ (feature_name)
+ (attribute_name)
+ ] @property
 
 
 ((property_name) @type
- (#match? @type "^--"))
+                 (#match? @type "^--"))
 ((plain_value) @type
- (#match? @type "^--"))
+               (#match? @type "^--"))
 
-(string_value) @string
-(color_value) @string
-(identifier) @string
+[
+ (string_value)
+ (color_value)
+ (identifier)
+ (unit)
+ ] @string
 
-(integer_value) @number
-(float_value) @number
-(unit) @string
+[
+ (integer_value)
+ (float_value)
+ ] @number
 
-"#" @punctuation.delimiter
-"," @punctuation.delimiter
-"." @punctuation.delimiter
-":" @punctuation.delimiter
-"::" @punctuation.delimiter
-";" @punctuation.delimiter
-"{" @punctuation.bracket
-")" @punctuation.bracket
-"(" @punctuation.bracket
-"}" @punctuation.bracket
+[
+ "#"
+ ","
+ "."
+ ":"
+ "::"
+ ";"
+ ] @punctuation.delimiter
+
+[
+ "{"
+ ")"
+ "("
+ "}"
+ ] @punctuation.bracket
+
+(ERROR) @error