fix(highlights): comment out problematic query

and rearrange/refactor some other queries

queries/dtd/highlights.scm

@@ -1,12 +1,12 @@
 ;; XML declaration
 
-(TextDecl "xml" @keyword)
+"xml" @keyword
 
-(TextDecl [ "version" "encoding" ] @property)
+[ "version" "encoding" ] @property
 
-(TextDecl (EncName) @string.special)
+(EncName) @string.special
 
-(TextDecl (VersionNum) @number)
+(VersionNum) @number
 
 ;; Processing instructions
 
@@ -121,7 +121,8 @@
 
 ;; Misc
 
-[ "INCLUDE" "IGNORE" ] @keyword
+; FIXME: enable when ts test is fixed
+; [ "INCLUDE" "IGNORE" ] @keyword
 
 (Comment) @comment
 

queries/xml/highlights.scm

@@ -1,14 +1,14 @@
 ;; XML declaration
 
-(XMLDecl "xml" @keyword)
+"xml" @keyword
 
-(XMLDecl [ "version" "encoding" "standalone" ] @property)
+[ "version" "encoding" "standalone" ] @property
 
-(XMLDecl (EncName) @string.special)
+(EncName) @string.special
 
-(XMLDecl (VersionNum) @number)
+(VersionNum) @number
 
-(XMLDecl [ "yes" "no" ] @boolean)
+[ "yes" "no" ] @boolean
 
 ;; Processing instructions
 
@@ -137,15 +137,6 @@
 
 (Attribute (AttValue) @string)
 
-;; Text
-
-(CharData) @markup
-
-(CDSect
-  (CDStart) @markup.heading
-  (CData) @markup.raw
-  "]]>" @markup.heading)
-
 ;; Delimiters & punctuation
 
 [
@@ -161,6 +152,15 @@
 
 [ "," "|" "=" ] @operator
 
+;; Text
+
+(CharData) @markup
+
+(CDSect
+  (CDStart) @markup.heading
+  (CData) @markup.raw
+  "]]>" @markup.heading)
+
 ;; Misc
 
 (Comment) @comment