feat(highlights)!: `@keyword.storage` → `@keyword.modifier`

36 files changed, 43 insertions, 44 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a6369a5ae..1f80341e0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -169,7 +169,6 @@ As languages differ quite a lot, here is a set of captures available to you when
 @keyword.function          ; keywords that define a function (e.g. `func` in Go, `def` in Python)
 @keyword.operator          ; operators that are English words (e.g. `and` / `or`)
 @keyword.import            ; keywords for including modules (e.g. `import` / `from` in Python)
-@keyword.storage           ; modifiers that affect storage in memory or life-time
 @keyword.type              ; keywords describing composite types (e.g. `struct`, `enum`)
 @keyword.modifier          ; keywords modifying other constructs (e.g. `const`, `static`, `public`)
 @keyword.repeat            ; keywords related to loops (e.g. `for` / `while`)
diff --git a/queries/ada/highlights.scm b/queries/ada/highlights.scm
index c024afb4e..5b6a09978 100644
--- a/queries/ada/highlights.scm
+++ b/queries/ada/highlights.scm
@@ -54,7 +54,7 @@
   "aliased"
   "constant"
   "renames"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "with"
diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm
index a56acab56..b8bbfea3f 100644
--- a/queries/bitbake/highlights.scm
+++ b/queries/bitbake/highlights.scm
@@ -86,7 +86,7 @@
 [
   "before"
   "after"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "append"
diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm
index 5a26d7b48..e22aac997 100644
--- a/queries/c/highlights.scm
+++ b/queries/c/highlights.scm
@@ -169,7 +169,7 @@
   (type_descriptor)
 ] @type
 
-(storage_class_specifier) @keyword.storage
+(storage_class_specifier) @keyword.modifier
 
 [
   (type_qualifier)
@@ -178,7 +178,7 @@
 ] @keyword.modifier
 
 (linkage_specification
-  "extern" @keyword.storage)
+  "extern" @keyword.modifier)
 
 (type_definition
   declarator: (type_identifier) @type.definition)
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm
index c36c66057..bd80f3146 100644
--- a/queries/c_sharp/highlights.scm
+++ b/queries/c_sharp/highlights.scm
@@ -439,7 +439,7 @@
   "static"
   "volatile"
   "required"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "abstract"
diff --git a/queries/cairo/highlights.scm b/queries/cairo/highlights.scm
index aa25847c9..e7a4faf9c 100644
--- a/queries/cairo/highlights.scm
+++ b/queries/cairo/highlights.scm
@@ -138,7 +138,7 @@
 [
   "tempvar"
   "extern"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "if"
diff --git a/queries/cmake/highlights.scm b/queries/cmake/highlights.scm
index de9c24094..e2bcd9278 100644
--- a/queries/cmake/highlights.scm
+++ b/queries/cmake/highlights.scm
@@ -136,7 +136,7 @@
   (argument_list
     .
     (argument)
-    ((argument) @_cache @keyword.storage
+    ((argument) @_cache @keyword.modifier
       .
       (argument) @_type @type
       (#any-of? @_cache "CACHE")
@@ -148,8 +148,8 @@
   (argument_list
     .
     (argument)
-    (argument) @keyword.storage
-    (#any-of? @keyword.storage "CACHE" "PARENT_SCOPE")))
+    (argument) @keyword.modifier
+    (#any-of? @keyword.modifier "CACHE" "PARENT_SCOPE")))
 
 (normal_command
   (identifier) @_function
diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm
index afa03b3b3..8b81ce870 100644
--- a/queries/cuda/highlights.scm
+++ b/queries/cuda/highlights.scm
@@ -11,6 +11,6 @@
   "__global__"
   "__forceinline__"
   "__noinline__"
-] @keyword.storage
+] @keyword.modifier
 
 "__launch_bounds__" @keyword.modifier
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm
index 24c8e03c2..11d08a1b7 100644
--- a/queries/d/highlights.scm
+++ b/queries/d/highlights.scm
@@ -102,16 +102,16 @@
   (gshared)
   (out)
   (inout)
-] @keyword.storage
+] @keyword.modifier
 
 (parameter_attribute
-  (return) @keyword.storage)
+  (return) @keyword.modifier)
 
 (parameter_attribute
-  (in) @keyword.storage)
+  (in) @keyword.modifier)
 
 (parameter_attribute
-  (out) @keyword.storage)
+  (out) @keyword.modifier)
 
 (debug) @keyword.debug
 
diff --git a/queries/doxygen/highlights.scm b/queries/doxygen/highlights.scm
index e3e26881e..da39bdd83 100644
--- a/queries/doxygen/highlights.scm
+++ b/queries/doxygen/highlights.scm
@@ -31,7 +31,7 @@
   "in"
   "out"
   "inout"
-] @keyword.storage
+] @keyword.modifier
 
 "~" @operator
 
diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm
index 158a6eedc..b2cfd08a6 100644
--- a/queries/firrtl/highlights.scm
+++ b/queries/firrtl/highlights.scm
@@ -44,7 +44,7 @@
 [
   "input"
   "output"
-] @keyword.storage
+] @keyword.modifier
 
 ; Conditionals
 [
diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm
index 935f12adb..bbe0dd6ee 100644
--- a/queries/fortran/highlights.scm
+++ b/queries/fortran/highlights.scm
@@ -137,7 +137,7 @@
   "in"
   "inout"
   "out"
-] @keyword.storage
+] @keyword.modifier
 
 ; Labels
 [
diff --git a/queries/gdshader/highlights.scm b/queries/gdshader/highlights.scm
index c0cb2905e..334aece0f 100644
--- a/queries/gdshader/highlights.scm
+++ b/queries/gdshader/highlights.scm
@@ -19,7 +19,7 @@
   "in"
   "out"
   "inout"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "while"
diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm
index 590cf93b3..d4583f0ea 100644
--- a/queries/glsl/highlights.scm
+++ b/queries/glsl/highlights.scm
@@ -29,7 +29,7 @@
 
 "subroutine" @keyword.function
 
-(extension_storage_class) @keyword.storage
+(extension_storage_class) @keyword.modifier
 
 ((identifier) @variable.builtin
   (#lua-match? @variable.builtin "^gl_"))
diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm
index 16abeacb2..b515358e1 100644
--- a/queries/java/highlights.scm
+++ b/queries/java/highlights.scm
@@ -207,7 +207,7 @@
 [
   "transient"
   "volatile"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "return"
diff --git a/queries/lalrpop/highlights.scm b/queries/lalrpop/highlights.scm
index 336845092..a3cf8d897 100644
--- a/queries/lalrpop/highlights.scm
+++ b/queries/lalrpop/highlights.scm
@@ -72,7 +72,7 @@
 ] @punctuation.delimiter
 
 (lifetime
-  (identifier) @keyword.storage)
+  (identifier) @keyword.modifier)
 
 (string_literal) @string
 
diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm
index 7e3056c14..ea48272f5 100644
--- a/queries/llvm/highlights.scm
+++ b/queries/llvm/highlights.scm
@@ -109,7 +109,7 @@
   "localexec"
   (unnamed_addr)
   (dll_storage_class)
-] @keyword.storage
+] @keyword.modifier
 
 (attribute_name) @attribute