aboutsummaryrefslogtreecommitdiff
path: root/runtime/queries
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2025-02-05 23:09:29 +0000
committerJosh Rahm <joshuarahm@gmail.com>2025-02-05 23:09:29 +0000
commitd5f194ce780c95821a855aca3c19426576d28ae0 (patch)
treed45f461b19f9118ad2bb1f440a7a08973ad18832 /runtime/queries
parentc5d770d311841ea5230426cc4c868e8db27300a8 (diff)
parent44740e561fc93afe3ebecfd3618bda2d2abeafb0 (diff)
downloadrneovim-rahm.tar.gz
rneovim-rahm.tar.bz2
rneovim-rahm.zip
Merge remote-tracking branch 'upstream/master' into mix_20240309HEADrahm
Diffstat (limited to 'runtime/queries')
-rw-r--r--runtime/queries/c/highlights.scm13
-rw-r--r--runtime/queries/lua/highlights.scm2
-rw-r--r--runtime/queries/markdown_inline/highlights.scm13
-rw-r--r--runtime/queries/query/highlights.scm10
-rw-r--r--runtime/queries/vim/highlights.scm1
5 files changed, 25 insertions, 14 deletions
diff --git a/runtime/queries/c/highlights.scm b/runtime/queries/c/highlights.scm
index eba272d5c9..bd6857fd17 100644
--- a/runtime/queries/c/highlights.scm
+++ b/runtime/queries/c/highlights.scm
@@ -252,13 +252,22 @@
; Preproc def / undef
(preproc_def
- name: (_) @constant)
+ name: (_) @constant.macro)
(preproc_call
directive: (preproc_directive) @_u
- argument: (_) @constant
+ argument: (_) @constant.macro
(#eq? @_u "#undef"))
+(preproc_ifdef
+ name: (identifier) @constant.macro)
+
+(preproc_elifdef
+ name: (identifier) @constant.macro)
+
+(preproc_defined
+ (identifier) @constant.macro)
+
(call_expression
function: (identifier) @function.call)
diff --git a/runtime/queries/lua/highlights.scm b/runtime/queries/lua/highlights.scm
index 01c280f2d5..79ab165aa7 100644
--- a/runtime/queries/lua/highlights.scm
+++ b/runtime/queries/lua/highlights.scm
@@ -151,8 +151,6 @@
((identifier) @constant
(#lua-match? @constant "^[A-Z][A-Z_0-9]*$"))
-(vararg_expression) @constant
-
(nil) @constant.builtin
[
diff --git a/runtime/queries/markdown_inline/highlights.scm b/runtime/queries/markdown_inline/highlights.scm
index 148ef0fad0..5fb9e911dd 100644
--- a/runtime/queries/markdown_inline/highlights.scm
+++ b/runtime/queries/markdown_inline/highlights.scm
@@ -40,14 +40,12 @@
(image_description)
] @markup.link.label
-(inline_link
- (link_text) @_label
- (link_destination) @_url
+((inline_link
+ (link_destination) @_url) @_label
(#set! @_label url @_url))
-(image
- (image_description) @_label
- (link_destination) @_url
+((image
+ (link_destination) @_url) @_label
(#set! @_label url @_url))
; Conceal image links
@@ -93,9 +91,6 @@
(email_autolink)
] @markup.link.url @nospell
-((link_destination) @_url
- (#set! @_url url @_url))
-
((uri_autolink) @_url
(#offset! @_url 0 1 0 -1)
(#set! @_url url @_url))
diff --git a/runtime/queries/query/highlights.scm b/runtime/queries/query/highlights.scm
index e459b44602..cbd192a8ff 100644
--- a/runtime/queries/query/highlights.scm
+++ b/runtime/queries/query/highlights.scm
@@ -11,6 +11,9 @@
(named_node
name: (identifier) @variable)
+(missing_node
+ name: (identifier) @variable)
+
(field_definition
name: (identifier) @variable.member)
@@ -43,7 +46,12 @@
"#"
] @punctuation.special
-"_" @constant
+(predicate
+ "." @punctuation.special)
+
+"_" @character.special
+
+"MISSING" @keyword
((parameters
(identifier) @number)
diff --git a/runtime/queries/vim/highlights.scm b/runtime/queries/vim/highlights.scm
index 14e5a8128f..df7b3cf483 100644
--- a/runtime/queries/vim/highlights.scm
+++ b/runtime/queries/vim/highlights.scm
@@ -287,6 +287,7 @@
"=~"
"!~"
"="
+ "^="
"+="
"-="
"*="