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
 
diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm
index d0c60af5f..50ac7a78b 100644
--- a/queries/objc/highlights.scm
+++ b/queries/objc/highlights.scm
@@ -30,7 +30,7 @@
   "@dynamic"
   "volatile"
   (protocol_qualifier)
-] @keyword.storage
+] @keyword.modifier
 
 ; Keywords
 [
diff --git a/queries/odin/highlights.scm b/queries/odin/highlights.scm
index 2c3457e07..6c8a7965b 100644
--- a/queries/odin/highlights.scm
+++ b/queries/odin/highlights.scm
@@ -36,7 +36,7 @@
 [
   "distinct"
   "dynamic"
-] @keyword.storage
+] @keyword.modifier
 
 ; Conditionals
 [
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index a28fa546e..3511386ca 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -84,7 +84,7 @@
 [
   (kPacked)
   (kAbsolute)
-] @keyword.storage
+] @keyword.modifier
 
 (kUses) @keyword.import
 
diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm
index a5d75fe8a..325005928 100644
--- a/queries/pioasm/highlights.scm
+++ b/queries/pioasm/highlights.scm
@@ -75,7 +75,7 @@
   "ifempty"
 ] @keyword.conditional
 
-"public" @keyword.storage
+"public" @keyword.modifier
 
 (integer) @number
 
diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm
index 2c04347dc..7b229984f 100644
--- a/queries/rust/highlights.scm
+++ b/queries/rust/highlights.scm
@@ -282,13 +282,13 @@
   "static"
   "dyn"
   "extern"
-] @keyword.storage
+] @keyword.modifier
 
 (lifetime
   [
     "'"
     (identifier)
-  ] @keyword.storage)
+  ] @keyword.modifier)
 
 "fn" @keyword.function
 
diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm
index 3e1ee8ba7..74fde4ea9 100644
--- a/queries/scala/highlights.scm
+++ b/queries/scala/highlights.scm
@@ -203,7 +203,7 @@
   "protected"
 ] @keyword.modifier
 
-(inline_modifier) @keyword.storage
+(inline_modifier) @keyword.modifier
 
 (null_literal) @constant.builtin
 
diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm
index 13ac0e291..161b732b2 100644
--- a/queries/smali/highlights.scm
+++ b/queries/smali/highlights.scm
@@ -190,7 +190,7 @@
 (null) @constant.builtin
 
 ; Misc
-(annotation_visibility) @keyword.storage
+(annotation_visibility) @keyword.modifier
 
 (access_modifier) @keyword.modifier
 
diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm
index 20c07ce7b..9941cf905 100644
--- a/queries/solidity/highlights.scm
+++ b/queries/solidity/highlights.scm
@@ -179,7 +179,7 @@
   "storage"
   "calldata"
   "constant"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "for"
diff --git a/queries/soql/highlights.scm b/queries/soql/highlights.scm
index 721e84ed2..f87e5147e 100644
--- a/queries/soql/highlights.scm
+++ b/queries/soql/highlights.scm
@@ -32,7 +32,7 @@
 (alias_expression
   (identifier) @label)
 
-(storage_identifier) @keyword.storage
+(storage_identifier) @keyword.modifier
 
 (_
   function_name: (identifier) @function)
diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm
index e3d7f107a..f89331846 100644
--- a/queries/sourcepawn/highlights.scm
+++ b/queries/sourcepawn/highlights.scm
@@ -147,7 +147,7 @@
   name: (identifier) @function.method)
 
 ; Non-type Keywords
-(variable_storage_class) @keyword.storage
+(variable_storage_class) @keyword.modifier
 
 (visibility) @keyword.modifier
 
diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm
index 21f2605b3..bd706f879 100644
--- a/queries/sql/highlights.scm
+++ b/queries/sql/highlights.scm
@@ -95,7 +95,7 @@
   (keyword_jsonfile)
   (keyword_sequencefile)
   (keyword_volatile)
-] @keyword.storage
+] @keyword.modifier
 
 [
   (keyword_case)
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm
index 15879cee0..a8c37215d 100644
--- a/queries/squirrel/highlights.scm
+++ b/queries/squirrel/highlights.scm
@@ -55,7 +55,7 @@
 ] @keyword.exception
 
 ; Storageclasses
-"local" @keyword.storage
+"local" @keyword.modifier
 
 ; Qualifiers
 [
diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm
index e44882f17..d1348dc91 100644
--- a/queries/systemtap/highlights.scm
+++ b/queries/systemtap/highlights.scm
@@ -155,4 +155,4 @@
 
 "private" @keyword.modifier
 
-"global" @keyword.storage
+"global" @keyword.modifier
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index 647a498a6..be038aa34 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -54,7 +54,7 @@
   "shared"
   "static"
   "const"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "pub"
diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm
index bd046278b..b89df9432 100644
--- a/queries/vala/highlights.scm
+++ b/queries/vala/highlights.scm
@@ -229,7 +229,7 @@
   "protected"
   "public"
   "static"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "and"
diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm
index 393e54519..c723dc14a 100644
--- a/queries/verilog/highlights.scm
+++ b/queries/verilog/highlights.scm
@@ -140,7 +140,7 @@
 
 (edge_identifier) @attribute
 
-(port_direction) @keyword.storage
+(port_direction) @keyword.modifier
 
 (port_identifier
   (simple_identifier) @variable)
diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm
index 0d974dd2e..e5dd7b6ac 100644
--- a/queries/wgsl/highlights.scm
+++ b/queries/wgsl/highlights.scm
@@ -44,7 +44,7 @@
   "storage"
   "uniform"
   "workgroup"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "read"
diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm
index 5690a5010..9ceede3e5 100644
--- a/queries/zig/highlights.scm
+++ b/queries/zig/highlights.scm
@@ -161,7 +161,7 @@ field_constant: (IDENTIFIER) @constant
   "align"
   "callconv"
   "linksection"
-] @keyword.storage
+] @keyword.modifier
 
 [
   "comptime"
diff --git a/tests/query/highlights/smali/baksmali_test_class.smali b/tests/query/highlights/smali/baksmali_test_class.smali
index ee3bc6ad4..1d2a4cb40 100644
--- a/tests/query/highlights/smali/baksmali_test_class.smali
+++ b/tests/query/highlights/smali/baksmali_test_class.smali
@@ -14,7 +14,7 @@
 
 
 .annotation build Lsome/annotation;
-#           ^^^^^ @keyword.storage
+#           ^^^^^ @keyword.modifier
 #                  ^^^^ @type
 #                                 ^ @punctuation.delimiter
     value1 = "test"
@@ -93,7 +93,7 @@
 
 .field public static staticFieldWithAnnotation:I
     .annotation runtime La/field/annotation;
-#               ^^^^^^^ @keyword.storage
+#               ^^^^^^^ @keyword.modifier
         this = "is"
         a = "test"
     .end annotation