aboutsummaryrefslogtreecommitdiffstats
path: root/queries
diff options
context:
space:
mode:
authorObserverOfTime <chronobserver@disroot.org>2024-10-22 08:34:05 +0300
committerChristian Clason <ch.clason+github@icloud.com>2024-10-22 08:56:17 +0200
commita5c7a3f6b46f4cbc3ee3d56f403afb6565291cae (patch)
treea3e7cd631674848112f9eae7e255d964fb9e14ce /queries
parentbot(lockfile): update swift, tlaplus, vimdoc, xresources (diff)
downloadnvim-treesitter-a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae.tar
nvim-treesitter-a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae.tar.gz
nvim-treesitter-a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae.tar.bz2
nvim-treesitter-a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae.tar.lz
nvim-treesitter-a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae.tar.xz
nvim-treesitter-a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae.tar.zst
nvim-treesitter-a5c7a3f6b46f4cbc3ee3d56f403afb6565291cae.zip
fix(xml,dtd): adapt to parser changes
Diffstat (limited to 'queries')
-rw-r--r--queries/dtd/highlights.scm17
-rw-r--r--queries/xml/highlights.scm92
2 files changed, 45 insertions, 64 deletions
diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm
index e573ca387..9afd6e38b 100644
--- a/queries/dtd/highlights.scm
+++ b/queries/dtd/highlights.scm
@@ -1,17 +1,17 @@
-; XML declaration
-(XMLDecl
+; Text declaration
+(TextDecl
"xml" @keyword.directive)
-(XMLDecl
+(TextDecl
[
"version"
"encoding"
] @tag.attribute)
-(XMLDecl
+(TextDecl
(EncName) @string.special)
-(XMLDecl
+(TextDecl
(VersionNum) @number)
; Processing instructions
@@ -65,12 +65,6 @@
"NOTATION" @keyword.directive
(Name) @label)
-(NotationDecl
- (ExternalID
- (SystemLiteral
- (URI) @string.special.url))
- (#set! priority 105))
-
; Attlist declaration
(AttlistDecl
"ATTLIST" @keyword.directive.define
@@ -124,6 +118,7 @@
"?>"
"<!"
">"
+ "<!["
"]]>"
] @tag.delimiter
diff --git a/queries/xml/highlights.scm b/queries/xml/highlights.scm
index c6362c5c7..85e6e9bb4 100644
--- a/queries/xml/highlights.scm
+++ b/queries/xml/highlights.scm
@@ -6,6 +6,7 @@
[
"version"
"encoding"
+ "standalone"
] @tag.attribute)
(XMLDecl
@@ -14,6 +15,12 @@
(XMLDecl
(VersionNum) @number)
+(XMLDecl
+ [
+ "yes"
+ "no"
+ ] @boolean)
+
; Processing instructions
(PI) @keyword.directive
@@ -65,12 +72,6 @@
"NOTATION" @keyword.directive
(Name) @label)
-(NotationDecl
- (ExternalID
- (SystemLiteral
- (URI) @string.special.url))
- (#set! priority 105))
-
; Attlist declaration
(AttlistDecl
"ATTLIST" @keyword.directive.define
@@ -118,45 +119,6 @@
(SystemLiteral
(URI) @string.special.url)
-; Delimiters & punctuation
-[
- "<?"
- "?>"
- "<!"
- ">"
- "]]>"
-] @tag.delimiter
-
-[
- "("
- ")"
- "["
-] @punctuation.bracket
-
-[
- "\""
- "'"
-] @punctuation.delimiter
-
-[
- ","
- "|"
- "="
-] @operator
-
-; Misc
-(Comment) @comment @spell
-
-; XML declaration
-(XMLDecl
- "standalone" @tag.attribute)
-
-(XMLDecl
- [
- "yes"
- "no"
- ] @boolean)
-
; Processing instructions
(XmlModelPI
"xml-model" @keyword.directive)
@@ -194,6 +156,36 @@
(Attribute
(AttValue) @string)
+; Delimiters & punctuation
+[
+ "<?"
+ "?>"
+ "<"
+ ">"
+ "</"
+ "/>"
+ "<!"
+ "]]>"
+] @tag.delimiter
+
+[
+ "("
+ ")"
+ "["
+ "]"
+] @punctuation.bracket
+
+[
+ "\""
+ "'"
+] @punctuation.delimiter
+
+[
+ ","
+ "|"
+ "="
+] @operator
+
; Text
(CharData) @none @spell
@@ -203,11 +195,5 @@
"]]>" @module)
(#set! priority 105))
-; Delimiters & punctuation
-[
- "<"
- "</"
- "/>"
-] @tag.delimiter
-
-"]" @punctuation.bracket
+; Misc
+(Comment) @comment @spell