From 998b230a77b544761bae8aa7518d40b91a5c9559 Mon Sep 17 00:00:00 2001 From: Jaehwang Jung Date: Fri, 8 Mar 2024 19:09:51 +0900 Subject: [PATCH] =?UTF-8?q?feat(highlights)!:=20keyword=20`@type.qualifier?= =?UTF-8?q?`=20=E2=86=92=20`@keyword.modifier`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.md | 1 + queries/apex/highlights.scm | 2 +- queries/bitbake/highlights.scm | 2 +- queries/c/highlights.scm | 2 +- queries/c_sharp/highlights.scm | 2 +- queries/capnp/highlights.scm | 2 +- queries/cpp/highlights.scm | 2 +- queries/css/highlights.scm | 2 +- queries/cuda/highlights.scm | 2 +- queries/d/highlights.scm | 2 +- queries/dart/highlights.scm | 2 +- queries/dtd/highlights.scm | 2 +- queries/firrtl/highlights.scm | 2 +- queries/fortran/highlights.scm | 2 +- queries/func/highlights.scm | 2 +- queries/gdscript/highlights.scm | 4 ++-- queries/gdshader/highlights.scm | 2 +- queries/gleam/highlights.scm | 2 +- queries/glsl/highlights.scm | 2 +- queries/gpg/highlights.scm | 2 +- queries/groovy/highlights.scm | 2 +- queries/hack/highlights.scm | 2 +- queries/hare/highlights.scm | 2 +- queries/hlsl/highlights.scm | 2 +- queries/ispc/highlights.scm | 2 +- queries/java/highlights.scm | 4 ++-- queries/julia/highlights.scm | 2 +- queries/kotlin/highlights.scm | 2 +- queries/kusto/highlights.scm | 2 +- queries/leo/highlights.scm | 2 +- queries/llvm/highlights.scm | 2 +- queries/luadoc/highlights.scm | 2 +- queries/mermaid/highlights.scm | 2 +- queries/nim/highlights.scm | 22 +++++++++---------- queries/objc/highlights.scm | 2 +- queries/ocaml/highlights.scm | 2 +- queries/pascal/highlights.scm | 2 +- queries/php_only/highlights.scm | 2 +- queries/pioasm/highlights.scm | 2 +- queries/pony/highlights.scm | 2 +- queries/proto/highlights.scm | 2 +- queries/prql/highlights.scm | 2 +- queries/purescript/highlights.scm | 2 +- queries/ql/highlights.scm | 2 +- queries/qmljs/highlights.scm | 2 +- queries/rasi/highlights.scm | 2 +- queries/rbs/highlights.scm | 2 +- queries/ruby/highlights.scm | 4 ++-- queries/rust/highlights.scm | 2 +- queries/scala/highlights.scm | 8 +++---- queries/slint/highlights.scm | 6 ++--- queries/smali/highlights.scm | 2 +- queries/solidity/highlights.scm | 2 +- queries/sourcepawn/highlights.scm | 4 ++-- queries/sql/highlights.scm | 2 +- queries/squirrel/highlights.scm | 2 +- queries/svelte/highlights.scm | 2 +- queries/swift/highlights.scm | 2 +- queries/systemtap/highlights.scm | 2 +- queries/t32/highlights.scm | 4 ++-- queries/thrift/highlights.scm | 2 +- queries/typescript/highlights.scm | 2 +- queries/unison/highlights.scm | 4 ++-- queries/v/highlights.scm | 2 +- queries/vala/highlights.scm | 2 +- queries/verilog/highlights.scm | 4 ++-- queries/wgsl/highlights.scm | 2 +- queries/xcompose/highlights.scm | 2 +- queries/zig/highlights.scm | 2 +- tests/query/highlights/capnp/test.capnp | 2 +- tests/query/highlights/gleam/function.gleam | 12 +++++----- tests/query/highlights/gleam/type.gleam | 6 ++--- tests/query/highlights/hack/generics.hack | 6 ++--- .../smali/baksmali_test_class.smali | 2 +- tests/query/highlights/t32/var.cmm | 4 ++-- tests/query/highlights/xhp-intro.hack | 4 ++-- 76 files changed, 109 insertions(+), 108 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9db53d688..a6369a5ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -171,6 +171,7 @@ As languages differ quite a lot, here is a set of captures available to you when @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`) @keyword.return ; keywords like `return` and `yield` @keyword.debug ; keywords related to debugging diff --git a/queries/apex/highlights.scm b/queries/apex/highlights.scm index 2d2f8819d..55acadd62 100644 --- a/queries/apex/highlights.scm +++ b/queries/apex/highlights.scm @@ -202,7 +202,7 @@ "protected" "public" "static" -] @type.qualifier +] @keyword.modifier [ "if" diff --git a/queries/bitbake/highlights.scm b/queries/bitbake/highlights.scm index 67acd757e..a56acab56 100644 --- a/queries/bitbake/highlights.scm +++ b/queries/bitbake/highlights.scm @@ -92,7 +92,7 @@ "append" "prepend" "remove" -] @type.qualifier +] @keyword.modifier ; Variables [ diff --git a/queries/c/highlights.scm b/queries/c/highlights.scm index e80819fa3..5a26d7b48 100644 --- a/queries/c/highlights.scm +++ b/queries/c/highlights.scm @@ -175,7 +175,7 @@ (type_qualifier) (gnu_asm_qualifier) "__extension__" -] @type.qualifier +] @keyword.modifier (linkage_specification "extern" @keyword.storage) diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm index 99d85b193..c36c66057 100644 --- a/queries/c_sharp/highlights.scm +++ b/queries/c_sharp/highlights.scm @@ -450,7 +450,7 @@ "partial" "sealed" "virtual" -] @type.qualifier +] @keyword.modifier (parameter_modifier) @operator diff --git a/queries/capnp/highlights.scm b/queries/capnp/highlights.scm index 4ce923ce4..b77852ef0 100644 --- a/queries/capnp/highlights.scm +++ b/queries/capnp/highlights.scm @@ -27,7 +27,7 @@ ] @keyword ; Builtins -"const" @type.qualifier +"const" @keyword.modifier [ (primitive_type) diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm index b021e8b37..f2ba879fb 100644 --- a/queries/cpp/highlights.scm +++ b/queries/cpp/highlights.scm @@ -232,7 +232,7 @@ "protected" "virtual" "final" -] @type.qualifier +] @keyword.modifier [ "new" diff --git a/queries/css/highlights.scm b/queries/css/highlights.scm index a07fcb7be..7066d6906 100644 --- a/queries/css/highlights.scm +++ b/queries/css/highlights.scm @@ -56,7 +56,7 @@ "only" ] @keyword.operator -(important) @type.qualifier +(important) @keyword.modifier (attribute_selector (plain_value) @string) diff --git a/queries/cuda/highlights.scm b/queries/cuda/highlights.scm index 565daaa91..afa03b3b3 100644 --- a/queries/cuda/highlights.scm +++ b/queries/cuda/highlights.scm @@ -13,4 +13,4 @@ "__noinline__" ] @keyword.storage -"__launch_bounds__" @type.qualifier +"__launch_bounds__" @keyword.modifier diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm index 89ff704e7..24c8e03c2 100644 --- a/queries/d/highlights.scm +++ b/queries/d/highlights.scm @@ -68,7 +68,7 @@ (const) (override) (static) -] @type.qualifier +] @keyword.modifier [ (assert) diff --git a/queries/dart/highlights.scm b/queries/dart/highlights.scm index ba7a8ede7..2b0f0c6de 100644 --- a/queries/dart/highlights.scm +++ b/queries/dart/highlights.scm @@ -245,7 +245,7 @@ "final" "base" "sealed" -] @type.qualifier +] @keyword.modifier ; when used as an identifier: ((identifier) @variable.builtin diff --git a/queries/dtd/highlights.scm b/queries/dtd/highlights.scm index fb98391b3..7bc7a7ed1 100644 --- a/queries/dtd/highlights.scm +++ b/queries/dtd/highlights.scm @@ -31,7 +31,7 @@ [ "EMPTY" "ANY" -] @type.qualifier +] @keyword.modifier [ "*" diff --git a/queries/firrtl/highlights.scm b/queries/firrtl/highlights.scm index 14f12b169..158a6eedc 100644 --- a/queries/firrtl/highlights.scm +++ b/queries/firrtl/highlights.scm @@ -38,7 +38,7 @@ ] @keyword ; Qualifiers -(qualifier) @type.qualifier +(qualifier) @keyword.modifier ; Storageclasses [ diff --git a/queries/fortran/highlights.scm b/queries/fortran/highlights.scm index 86634e903..935f12adb 100644 --- a/queries/fortran/highlights.scm +++ b/queries/fortran/highlights.scm @@ -130,7 +130,7 @@ "value" "volatile" (procedure_qualifier) -] @type.qualifier +] @keyword.modifier [ "common" diff --git a/queries/func/highlights.scm b/queries/func/highlights.scm index a6fb6bd0b..9fd6dd82d 100644 --- a/queries/func/highlights.scm +++ b/queries/func/highlights.scm @@ -54,7 +54,7 @@ "const" "global" (var) -] @type.qualifier +] @keyword.modifier ; Variables (identifier) @variable diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm index bf951aa83..76dc89061 100644 --- a/queries/gdscript/highlights.scm +++ b/queries/gdscript/highlights.scm @@ -28,7 +28,7 @@ (get_body "get" @keyword.function) -(static_keyword) @type.qualifier +(static_keyword) @keyword.modifier (tool_statement) @keyword @@ -50,7 +50,7 @@ (name) @type) @keyword (const_statement - "const" @type.qualifier + "const" @keyword.modifier (name) @constant) (expression_statement diff --git a/queries/gdshader/highlights.scm b/queries/gdshader/highlights.scm index 797681a0c..c0cb2905e 100644 --- a/queries/gdshader/highlights.scm +++ b/queries/gdshader/highlights.scm @@ -13,7 +13,7 @@ [ (precision_qualifier) (interpolation_qualifier) -] @type.qualifier +] @keyword.modifier [ "in" diff --git a/queries/gleam/highlights.scm b/queries/gleam/highlights.scm index e338115ac..49dd8777c 100644 --- a/queries/gleam/highlights.scm +++ b/queries/gleam/highlights.scm @@ -159,7 +159,7 @@ "external" (opacity_modifier) (visibility_modifier) -] @type.qualifier +] @keyword.modifier ; Tuples (tuple_access diff --git a/queries/glsl/highlights.scm b/queries/glsl/highlights.scm index af037c160..590cf93b3 100644 --- a/queries/glsl/highlights.scm +++ b/queries/glsl/highlights.scm @@ -25,7 +25,7 @@ "noperspective" "invariant" "precise" -] @type.qualifier +] @keyword.modifier "subroutine" @keyword.function diff --git a/queries/gpg/highlights.scm b/queries/gpg/highlights.scm index 09656b302..f02834429 100644 --- a/queries/gpg/highlights.scm +++ b/queries/gpg/highlights.scm @@ -26,7 +26,7 @@ (format) @character.special -"sensitive:" @type.qualifier +"sensitive:" @keyword.modifier (filter_name) @variable.parameter diff --git a/queries/groovy/highlights.scm b/queries/groovy/highlights.scm index aadd04fe4..1dad58363 100644 --- a/queries/groovy/highlights.scm +++ b/queries/groovy/highlights.scm @@ -67,7 +67,7 @@ "public" "static" "synchronized" -] @type.qualifier +] @keyword.modifier (comment) @comment @spell diff --git a/queries/hack/highlights.scm b/queries/hack/highlights.scm index 22fa7ea50..f561dfe36 100644 --- a/queries/hack/highlights.scm +++ b/queries/hack/highlights.scm @@ -64,7 +64,7 @@ (static_modifier) (visibility_modifier) (xhp_modifier) -] @type.qualifier +] @keyword.modifier [ "shape" diff --git a/queries/hare/highlights.scm b/queries/hare/highlights.scm index 817084886..67d3eb499 100644 --- a/queries/hare/highlights.scm +++ b/queries/hare/highlights.scm @@ -74,7 +74,7 @@ "const" "static" "nullable" -] @type.qualifier +] @keyword.modifier ; Attributes [ diff --git a/queries/hlsl/highlights.scm b/queries/hlsl/highlights.scm index d70a83790..839d8d79a 100644 --- a/queries/hlsl/highlights.scm +++ b/queries/hlsl/highlights.scm @@ -24,7 +24,7 @@ "triangleadj" "lineadj" "triangle" -] @type.qualifier +] @keyword.modifier ((identifier) @variable.builtin (#lua-match? @variable.builtin "^SV_")) diff --git a/queries/ispc/highlights.scm b/queries/ispc/highlights.scm index 45d7be584..14e614260 100644 --- a/queries/ispc/highlights.scm +++ b/queries/ispc/highlights.scm @@ -31,7 +31,7 @@ [ "varying" "uniform" -] @type.qualifier +] @keyword.modifier "__regcall" @attribute diff --git a/queries/java/highlights.scm b/queries/java/highlights.scm index ee36bf0bf..16abeacb2 100644 --- a/queries/java/highlights.scm +++ b/queries/java/highlights.scm @@ -199,10 +199,10 @@ "static" "strictfp" "transitive" -] @type.qualifier +] @keyword.modifier (modifiers - "synchronized" @type.qualifier) + "synchronized" @keyword.modifier) [ "transient" diff --git a/queries/julia/highlights.scm b/queries/julia/highlights.scm index 9bc6b91cf..1ff8b8e4e 100644 --- a/queries/julia/highlights.scm +++ b/queries/julia/highlights.scm @@ -309,7 +309,7 @@ [ "const" "mutable" -] @type.qualifier +] @keyword.modifier ; Operators & Punctuation [ diff --git a/queries/kotlin/highlights.scm b/queries/kotlin/highlights.scm index ae7dcdf31..4af95c4c3 100644 --- a/queries/kotlin/highlights.scm +++ b/queries/kotlin/highlights.scm @@ -237,7 +237,7 @@ (visibility_modifier) (reification_modifier) (inheritance_modifier) -] @type.qualifier +] @keyword.modifier [ "val" diff --git a/queries/kusto/highlights.scm b/queries/kusto/highlights.scm index 00bf4b067..5f00f751c 100644 --- a/queries/kusto/highlights.scm +++ b/queries/kusto/highlights.scm @@ -42,7 +42,7 @@ (type) @type -(join_types) @type.qualifier +(join_types) @keyword.modifier [ "(" diff --git a/queries/leo/highlights.scm b/queries/leo/highlights.scm index c4500ddf3..c0e2e4065 100644 --- a/queries/leo/highlights.scm +++ b/queries/leo/highlights.scm @@ -24,7 +24,7 @@ "constant" "private" "public" -] @type.qualifier +] @keyword.modifier "self" @variable.builtin diff --git a/queries/llvm/highlights.scm b/queries/llvm/highlights.scm index 2ccae3693..7e3056c14 100644 --- a/queries/llvm/highlights.scm +++ b/queries/llvm/highlights.scm @@ -100,7 +100,7 @@ (dso_local) (linkage_aux) (visibility) -] @type.qualifier +] @keyword.modifier [ "thread_local" diff --git a/queries/luadoc/highlights.scm b/queries/luadoc/highlights.scm index 5e835b3b0..b1b04da2d 100644 --- a/queries/luadoc/highlights.scm +++ b/queries/luadoc/highlights.scm @@ -62,7 +62,7 @@ "@private" "(exact)" "(key)" -] @type.qualifier @nospell +] @keyword.modifier @nospell ; Variables (identifier) @variable @nospell diff --git a/queries/mermaid/highlights.scm b/queries/mermaid/highlights.scm index 3289c4e5c..2b7b56374 100644 --- a/queries/mermaid/highlights.scm +++ b/queries/mermaid/highlights.scm @@ -244,6 +244,6 @@ [ (er_attribute_key_type_pk) (er_attribute_key_type_fk) -] @type.qualifier +] @keyword.modifier (er_attribute_comment) @string @spell diff --git a/queries/nim/highlights.scm b/queries/nim/highlights.scm index 0eb0f8b46..104979b3f 100644 --- a/queries/nim/highlights.scm +++ b/queries/nim/highlights.scm @@ -724,36 +724,36 @@ ]))) ; ============================================================================= -; @type.qualifier ; type qualifiers (e.g. `const`) +; @keyword.modifier ; type qualifier keywords (e.g. `const`) (var_type - "var" @type.qualifier) + "var" @keyword.modifier) (out_type - "out" @type.qualifier) + "out" @keyword.modifier) (distinct_type - "distinct" @type.qualifier) + "distinct" @keyword.modifier) (ref_type - "ref" @type.qualifier) + "ref" @keyword.modifier) (pointer_type - "ptr" @type.qualifier) + "ptr" @keyword.modifier) (var_parameter - "var" @type.qualifier) + "var" @keyword.modifier) (type_parameter - "type" @type.qualifier) + "type" @keyword.modifier) (static_parameter - "static" @type.qualifier) + "static" @keyword.modifier) (ref_parameter - "ref" @type.qualifier) + "ref" @keyword.modifier) (pointer_parameter - "ptr" @type.qualifier) + "ptr" @keyword.modifier) ; ============================================================================= ; @variable.member ; object and struct fields diff --git a/queries/objc/highlights.scm b/queries/objc/highlights.scm index dd2c796bd..d0c60af5f 100644 --- a/queries/objc/highlights.scm +++ b/queries/objc/highlights.scm @@ -21,7 +21,7 @@ "__covariant" "__contravariant" (visibility_specification) -] @type.qualifier +] @keyword.modifier ; Storageclasses [ diff --git a/queries/ocaml/highlights.scm b/queries/ocaml/highlights.scm index 0a5f274c6..3863d405e 100644 --- a/queries/ocaml/highlights.scm +++ b/queries/ocaml/highlights.scm @@ -153,7 +153,7 @@ "rec" "private" "virtual" -] @type.qualifier +] @keyword.modifier [ "fun" diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm index 5849a167b..a28fa546e 100644 --- a/queries/pascal/highlights.scm +++ b/queries/pascal/highlights.scm @@ -79,7 +79,7 @@ (kStrict) (kRequired) (kOptional) -] @type.qualifier +] @keyword.modifier [ (kPacked) diff --git a/queries/php_only/highlights.scm b/queries/php_only/highlights.scm index a3792cad7..20d35c18e 100644 --- a/queries/php_only/highlights.scm +++ b/queries/php_only/highlights.scm @@ -266,7 +266,7 @@ "public" "readonly" "static" -] @type.qualifier +] @keyword.modifier [ "return" diff --git a/queries/pioasm/highlights.scm b/queries/pioasm/highlights.scm index 8bb9dca01..a5d75fe8a 100644 --- a/queries/pioasm/highlights.scm +++ b/queries/pioasm/highlights.scm @@ -62,7 +62,7 @@ [ (optional) (irq_modifiers) -] @type.qualifier +] @keyword.modifier [ "block" diff --git a/queries/pony/highlights.scm b/queries/pony/highlights.scm index 5884a3e89..06b0006b3 100644 --- a/queries/pony/highlights.scm +++ b/queries/pony/highlights.scm @@ -45,7 +45,7 @@ "#share" "#alias" "#any" -] @type.qualifier +] @keyword.modifier ; Conditionals [ diff --git a/queries/proto/highlights.scm b/queries/proto/highlights.scm index 6324ae3bb..f67f4574e 100644 --- a/queries/proto/highlights.scm +++ b/queries/proto/highlights.scm @@ -19,7 +19,7 @@ "optional" "repeated" "required" -] @type.qualifier +] @keyword.modifier [ "package" diff --git a/queries/prql/highlights.scm b/queries/prql/highlights.scm index 921ca37b8..6e6094a92 100644 --- a/queries/prql/highlights.scm +++ b/queries/prql/highlights.scm @@ -106,7 +106,7 @@ alias: (identifier) @variable.member [ (keyword_version) (keyword_target) -] @type.qualifier +] @keyword.modifier (target) @function.builtin diff --git a/queries/purescript/highlights.scm b/queries/purescript/highlights.scm index 7f108df80..c14ded077 100644 --- a/queries/purescript/highlights.scm +++ b/queries/purescript/highlights.scm @@ -113,7 +113,7 @@ (type_role_declaration "role" @keyword - role: (type_role) @type.qualifier) + role: (type_role) @keyword.modifier) (hole) @character.special diff --git a/queries/ql/highlights.scm b/queries/ql/highlights.scm index 39b7bc101..434ec3316 100644 --- a/queries/ql/highlights.scm +++ b/queries/ql/highlights.scm @@ -54,7 +54,7 @@ [ "asc" "desc" -] @type.qualifier +] @keyword.modifier [ (true) diff --git a/queries/qmljs/highlights.scm b/queries/qmljs/highlights.scm index 7cf08ed0a..b4b30d0aa 100644 --- a/queries/qmljs/highlights.scm +++ b/queries/qmljs/highlights.scm @@ -116,7 +116,7 @@ "default" "readonly" "required" -] @type.qualifier +] @keyword.modifier ; from typescript (type_identifier) @type diff --git a/queries/rasi/highlights.scm b/queries/rasi/highlights.scm index cec2e5a03..1a0b8659c 100644 --- a/queries/rasi/highlights.scm +++ b/queries/rasi/highlights.scm @@ -104,7 +104,7 @@ "normal" "urgent" "active" - ] @type.qualifier) + ] @keyword.modifier) (hex_color) @number diff --git a/queries/rbs/highlights.scm b/queries/rbs/highlights.scm index 340bc254e..f2066d855 100644 --- a/queries/rbs/highlights.scm +++ b/queries/rbs/highlights.scm @@ -37,7 +37,7 @@ "prepend" ] @function.method -(visibility) @type.qualifier +(visibility) @keyword.modifier (comment) @comment @spell diff --git a/queries/ruby/highlights.scm b/queries/ruby/highlights.scm index 5b5fcbf9f..c0e71e1dc 100644 --- a/queries/ruby/highlights.scm +++ b/queries/ruby/highlights.scm @@ -62,8 +62,8 @@ (constant) @constant -((identifier) @type.qualifier - (#any-of? @type.qualifier "private" "protected" "public")) +((identifier) @keyword.modifier + (#any-of? @keyword.modifier "private" "protected" "public")) [ "rescue" diff --git a/queries/rust/highlights.scm b/queries/rust/highlights.scm index 4639d8859..2c04347dc 100644 --- a/queries/rust/highlights.scm +++ b/queries/rust/highlights.scm @@ -275,7 +275,7 @@ [ "ref" (mutable_specifier) -] @type.qualifier +] @keyword.modifier [ "const" diff --git a/queries/scala/highlights.scm b/queries/scala/highlights.scm index 032863c08..3e1ee8ba7 100644 --- a/queries/scala/highlights.scm +++ b/queries/scala/highlights.scm @@ -161,13 +161,13 @@ "$" @punctuation.special) ; keywords -(opaque_modifier) @type.qualifier +(opaque_modifier) @keyword.modifier (infix_modifier) @keyword -(transparent_modifier) @type.qualifier +(transparent_modifier) @keyword.modifier -(open_modifier) @type.qualifier +(open_modifier) @keyword.modifier [ "case" @@ -201,7 +201,7 @@ "sealed" "private" "protected" -] @type.qualifier +] @keyword.modifier (inline_modifier) @keyword.storage diff --git a/queries/slint/highlights.scm b/queries/slint/highlights.scm index 2e6d5997e..d93ba299e 100644 --- a/queries/slint/highlights.scm +++ b/queries/slint/highlights.scm @@ -28,11 +28,11 @@ (relative_font_size_value) ] @number.float -(purity) @type.qualifier +(purity) @keyword.modifier -(function_visibility) @type.qualifier +(function_visibility) @keyword.modifier -(property_visibility) @type.qualifier +(property_visibility) @keyword.modifier (builtin_type_identifier) @type.builtin diff --git a/queries/smali/highlights.scm b/queries/smali/highlights.scm index 3220b19f2..13ac0e291 100644 --- a/queries/smali/highlights.scm +++ b/queries/smali/highlights.scm @@ -192,7 +192,7 @@ ; Misc (annotation_visibility) @keyword.storage -(access_modifier) @type.qualifier +(access_modifier) @keyword.modifier (array_type "[" @punctuation.special) diff --git a/queries/solidity/highlights.scm b/queries/solidity/highlights.scm index 81c68f9d3..20c07ce7b 100644 --- a/queries/solidity/highlights.scm +++ b/queries/solidity/highlights.scm @@ -172,7 +172,7 @@ "view" "payable" (immutable) -] @type.qualifier +] @keyword.modifier [ "memory" diff --git a/queries/sourcepawn/highlights.scm b/queries/sourcepawn/highlights.scm index b134a0035..e3d7f107a 100644 --- a/queries/sourcepawn/highlights.scm +++ b/queries/sourcepawn/highlights.scm @@ -149,7 +149,7 @@ ; Non-type Keywords (variable_storage_class) @keyword.storage -(visibility) @type.qualifier +(visibility) @keyword.modifier (assertion) @function.builtin @@ -298,4 +298,4 @@ "static" "stock" "forward" -] @type.qualifier +] @keyword.modifier diff --git a/queries/sql/highlights.scm b/queries/sql/highlights.scm index 7ffa99edc..21f2605b3 100644 --- a/queries/sql/highlights.scm +++ b/queries/sql/highlights.scm @@ -333,7 +333,7 @@ (keyword_statistics) (keyword_maxvalue) (keyword_minvalue) -] @type.qualifier +] @keyword.modifier [ (keyword_int) diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm index 28d072029..15879cee0 100644 --- a/queries/squirrel/highlights.scm +++ b/queries/squirrel/highlights.scm @@ -61,7 +61,7 @@ [ "static" "const" -] @type.qualifier +] @keyword.modifier ; Variables [ diff --git a/queries/svelte/highlights.scm b/queries/svelte/highlights.scm index 961a8ed5b..600eb9986 100644 --- a/queries/svelte/highlights.scm +++ b/queries/svelte/highlights.scm @@ -10,7 +10,7 @@ "render" ] @keyword -"const" @type.qualifier +"const" @keyword.modifier [ "if" diff --git a/queries/swift/highlights.scm b/queries/swift/highlights.scm index 7ed570ba1..377420003 100644 --- a/queries/swift/highlights.scm +++ b/queries/swift/highlights.scm @@ -34,7 +34,7 @@ (parameter_modifier) (inheritance_modifier) (mutation_modifier) -] @type.qualifier +] @keyword.modifier (function_declaration (simple_identifier) @function.method) diff --git a/queries/systemtap/highlights.scm b/queries/systemtap/highlights.scm index a2832ae2b..e44882f17 100644 --- a/queries/systemtap/highlights.scm +++ b/queries/systemtap/highlights.scm @@ -153,6 +153,6 @@ "@define" @keyword.directive.define -"private" @type.qualifier +"private" @keyword.modifier "global" @keyword.storage diff --git a/queries/t32/highlights.scm b/queries/t32/highlights.scm index e2b6c44c8..d98ccd76a 100644 --- a/queries/t32/highlights.scm +++ b/queries/t32/highlights.scm @@ -68,7 +68,7 @@ [ "const" "volatile" -] @type.qualifier +] @keyword.modifier ; Operators in comma and conditional HLL expressions (hll_comma_expression @@ -120,7 +120,7 @@ (hll_type_descriptor) ] @type -(hll_type_qualifier) @type.qualifier +(hll_type_qualifier) @keyword.modifier (hll_primitive_type) @type.builtin diff --git a/queries/thrift/highlights.scm b/queries/thrift/highlights.scm index 3df9b5b80..afb0eee4f 100644 --- a/queries/thrift/highlights.scm +++ b/queries/thrift/highlights.scm @@ -177,7 +177,7 @@ "server" "stateful" "transient" -] @type.qualifier +] @keyword.modifier ; Literals (string) @string diff --git a/queries/typescript/highlights.scm b/queries/typescript/highlights.scm index 961ec99ec..48f891cc4 100644 --- a/queries/typescript/highlights.scm +++ b/queries/typescript/highlights.scm @@ -41,7 +41,7 @@ "protected" "public" "readonly" -] @type.qualifier +] @keyword.modifier ; types (type_identifier) @type diff --git a/queries/unison/highlights.scm b/queries/unison/highlights.scm index 0092ef8d8..80ca65251 100644 --- a/queries/unison/highlights.scm +++ b/queries/unison/highlights.scm @@ -24,9 +24,9 @@ (kw_equals) @keyword.operator -(structural) @type.qualifier +(structural) @keyword.modifier -(unique) @type.qualifier +(unique) @keyword.modifier (type_constructor) @constructor diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm index 74001da65..647a498a6 100644 --- a/queries/v/highlights.scm +++ b/queries/v/highlights.scm @@ -59,7 +59,7 @@ [ "pub" "mut" -] @type.qualifier +] @keyword.modifier [ "go" diff --git a/queries/vala/highlights.scm b/queries/vala/highlights.scm index 31c02ad1b..bd046278b 100644 --- a/queries/vala/highlights.scm +++ b/queries/vala/highlights.scm @@ -208,7 +208,7 @@ "owned" "weak" "unowned" -] @type.qualifier +] @keyword.modifier [ "case" diff --git a/queries/verilog/highlights.scm b/queries/verilog/highlights.scm index e4f318ec8..393e54519 100644 --- a/queries/verilog/highlights.scm +++ b/queries/verilog/highlights.scm @@ -154,7 +154,7 @@ [ "signed" "unsigned" -] @type.qualifier +] @keyword.modifier (data_type (simple_identifier) @type) @@ -263,7 +263,7 @@ ;(parameter_identifier) @variable.member)) (type_declaration (data_type - "packed" @type.qualifier)) + "packed" @keyword.modifier)) (struct_union) @type diff --git a/queries/wgsl/highlights.scm b/queries/wgsl/highlights.scm index 970c4e2eb..0d974dd2e 100644 --- a/queries/wgsl/highlights.scm +++ b/queries/wgsl/highlights.scm @@ -50,7 +50,7 @@ "read" "read_write" "write" -] @type.qualifier +] @keyword.modifier "fn" @keyword.function diff --git a/queries/xcompose/highlights.scm b/queries/xcompose/highlights.scm index 82ef8e6d4..2afab42f9 100644 --- a/queries/xcompose/highlights.scm +++ b/queries/xcompose/highlights.scm @@ -15,7 +15,7 @@ [ (modifier) "None" -] @type.qualifier +] @keyword.modifier [ "%L" diff --git a/queries/zig/highlights.scm b/queries/zig/highlights.scm index 61ff5589c..5690a5010 100644 --- a/queries/zig/highlights.scm +++ b/queries/zig/highlights.scm @@ -154,7 +154,7 @@ field_constant: (IDENTIFIER) @constant "volatile" "allowzero" "noalias" -] @type.qualifier +] @keyword.modifier [ "addrspace" diff --git a/tests/query/highlights/capnp/test.capnp b/tests/query/highlights/capnp/test.capnp index ce12b07ac..9480affd3 100644 --- a/tests/query/highlights/capnp/test.capnp +++ b/tests/query/highlights/capnp/test.capnp @@ -328,7 +328,7 @@ struct TestEmptyStruct {} struct TestConstants { const voidConst :Void = void; -# ^^^^^ @type.qualifier +# ^^^^^ @keyword.modifier const boolConst :Bool = true; const int8Const :Int8 = -123; const int16Const :Int16 = -12345; diff --git a/tests/query/highlights/gleam/function.gleam b/tests/query/highlights/gleam/function.gleam index ff2b690ca..f1924aaf9 100644 --- a/tests/query/highlights/gleam/function.gleam +++ b/tests/query/highlights/gleam/function.gleam @@ -1,5 +1,5 @@ pub fn add(x: Int, y: Int) -> Int { -// <- @type.qualifier +// <- @keyword.modifier // ^^ @keyword.function // ^^^ @function // ^ @punctuation.bracket @@ -18,7 +18,7 @@ pub fn add(x: Int, y: Int) -> Int { // <- @punctuation.bracket pub fn twice(f: fn(t) -> t, x: t) -> t { -// <- @type.qualifier +// <- @keyword.modifier // ^ @keyword.function // ^^^^^ @function // ^ @punctuation.bracket @@ -100,8 +100,8 @@ fn replace( // <- @punctuation.bracket pub external fn random_float() -> Float = "rand" "uniform" -// <- @type.qualifier -// ^^^^^^^^ @type.qualifier +// <- @keyword.modifier +// ^^^^^^^^ @keyword.modifier // ^^ @keyword.function // ^^^^^^^^^^^^ @function // ^ @punctuation.bracket @@ -113,8 +113,8 @@ pub external fn random_float() -> Float = "rand" "uniform" // ^^^^^^^^^ @function pub external fn inspect(a) -> a = "Elixir.IO" "inspect" -// <- @type.qualifier -// ^^^^^^^^ @type.qualifier +// <- @keyword.modifier +// ^^^^^^^^ @keyword.modifier // ^^ @keyword.function // ^^^^^^^ @function // ^ @punctuation.bracket diff --git a/tests/query/highlights/gleam/type.gleam b/tests/query/highlights/gleam/type.gleam index da840c194..8ee82419e 100644 --- a/tests/query/highlights/gleam/type.gleam +++ b/tests/query/highlights/gleam/type.gleam @@ -1,5 +1,5 @@ pub type Cat { -// <- @type.qualifier +// <- @keyword.modifier // ^^^^ @keyword // ^^^ @type // ^ @punctuation.bracket @@ -54,8 +54,8 @@ type Box(inner_type) { } pub opaque type Counter { -// <- @type.qualifier -// ^^^^^^ @type.qualifier +// <- @keyword.modifier +// ^^^^^^ @keyword.modifier // ^^^^ @keyword // ^^^^^^^ @type // ^ @punctuation.bracket diff --git a/tests/query/highlights/hack/generics.hack b/tests/query/highlights/hack/generics.hack index fc41a86a9..50bd50e34 100644 --- a/tests/query/highlights/hack/generics.hack +++ b/tests/query/highlights/hack/generics.hack @@ -2,21 +2,21 @@ class Box { // ^ @type // ^ @type protected T $data; - // ^ @type.qualifier + // ^ @keyword.modifier // ^ @type public function __construct(T $data) { // ^ @type // ^ @variable.parameter // ^ @keyword.function - // ^ @type.qualifier + // ^ @keyword.modifier // ^ @function.method $this->data = $data; } public function getData(): T { // ^ @function.method - // ^ @type.qualifier + // ^ @keyword.modifier return $this->data; // ^ @operator // ^ @variable.builtin diff --git a/tests/query/highlights/smali/baksmali_test_class.smali b/tests/query/highlights/smali/baksmali_test_class.smali index 6412f8784..ee3bc6ad4 100644 --- a/tests/query/highlights/smali/baksmali_test_class.smali +++ b/tests/query/highlights/smali/baksmali_test_class.smali @@ -1,6 +1,6 @@ .class public Lbaksmali/test/class; # <- @keyword -# ^^^^^^ @type.qualifier +# ^^^^^^ @keyword.modifier .super Ljava/lang/Object; # ^ @character.special # ^^^^ @type.builtin diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm index 8e251afef..b8dc463b5 100644 --- a/tests/query/highlights/t32/var.cmm +++ b/tests/query/highlights/t32/var.cmm @@ -39,8 +39,8 @@ Var.Assign sp = &s.n+offset Var.Assign padd = (CAddition const * volatile)&d ; ^ @variable ; ^ @type -; ^ @type.qualifier -; ^ @type.qualifier +; ^ @keyword.modifier +; ^ @keyword.modifier ; ^ @variable Var.Assign e1 = (enum e2)&e ; ^ @variable diff --git a/tests/query/highlights/xhp-intro.hack b/tests/query/highlights/xhp-intro.hack index 06f7e30a2..0f8cffe02 100644 --- a/tests/query/highlights/xhp-intro.hack +++ b/tests/query/highlights/xhp-intro.hack @@ -5,8 +5,8 @@ use type Facebook\XHP\HTML\{XHPHTMLHelpers, a, form}; final xhp class a_post extends x\element { -// ^ @type.qualifier -// ^ @type.qualifier +// ^ @keyword.modifier +// ^ @keyword.modifier // ^ @keyword use XHPHTMLHelpers;