feat(highlights)!: keyword @type.qualifier@keyword.modifier

This commit is contained in:
Jaehwang Jung 2024-03-08 19:09:51 +09:00 committed by Christian Clason
parent f878828584
commit 998b230a77
76 changed files with 109 additions and 108 deletions

View file

@ -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.import ; keywords for including modules (e.g. `import` / `from` in Python)
@keyword.storage ; modifiers that affect storage in memory or life-time @keyword.storage ; modifiers that affect storage in memory or life-time
@keyword.type ; keywords describing composite types (e.g. `struct`, `enum`) @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.repeat ; keywords related to loops (e.g. `for` / `while`)
@keyword.return ; keywords like `return` and `yield` @keyword.return ; keywords like `return` and `yield`
@keyword.debug ; keywords related to debugging @keyword.debug ; keywords related to debugging

View file

@ -202,7 +202,7 @@
"protected" "protected"
"public" "public"
"static" "static"
] @type.qualifier ] @keyword.modifier
[ [
"if" "if"

View file

@ -92,7 +92,7 @@
"append" "append"
"prepend" "prepend"
"remove" "remove"
] @type.qualifier ] @keyword.modifier
; Variables ; Variables
[ [

View file

@ -175,7 +175,7 @@
(type_qualifier) (type_qualifier)
(gnu_asm_qualifier) (gnu_asm_qualifier)
"__extension__" "__extension__"
] @type.qualifier ] @keyword.modifier
(linkage_specification (linkage_specification
"extern" @keyword.storage) "extern" @keyword.storage)

View file

@ -450,7 +450,7 @@
"partial" "partial"
"sealed" "sealed"
"virtual" "virtual"
] @type.qualifier ] @keyword.modifier
(parameter_modifier) @operator (parameter_modifier) @operator

View file

@ -27,7 +27,7 @@
] @keyword ] @keyword
; Builtins ; Builtins
"const" @type.qualifier "const" @keyword.modifier
[ [
(primitive_type) (primitive_type)

View file

@ -232,7 +232,7 @@
"protected" "protected"
"virtual" "virtual"
"final" "final"
] @type.qualifier ] @keyword.modifier
[ [
"new" "new"

View file

@ -56,7 +56,7 @@
"only" "only"
] @keyword.operator ] @keyword.operator
(important) @type.qualifier (important) @keyword.modifier
(attribute_selector (attribute_selector
(plain_value) @string) (plain_value) @string)

View file

@ -13,4 +13,4 @@
"__noinline__" "__noinline__"
] @keyword.storage ] @keyword.storage
"__launch_bounds__" @type.qualifier "__launch_bounds__" @keyword.modifier

View file

@ -68,7 +68,7 @@
(const) (const)
(override) (override)
(static) (static)
] @type.qualifier ] @keyword.modifier
[ [
(assert) (assert)

View file

@ -245,7 +245,7 @@
"final" "final"
"base" "base"
"sealed" "sealed"
] @type.qualifier ] @keyword.modifier
; when used as an identifier: ; when used as an identifier:
((identifier) @variable.builtin ((identifier) @variable.builtin

View file

@ -31,7 +31,7 @@
[ [
"EMPTY" "EMPTY"
"ANY" "ANY"
] @type.qualifier ] @keyword.modifier
[ [
"*" "*"

View file

@ -38,7 +38,7 @@
] @keyword ] @keyword
; Qualifiers ; Qualifiers
(qualifier) @type.qualifier (qualifier) @keyword.modifier
; Storageclasses ; Storageclasses
[ [

View file

@ -130,7 +130,7 @@
"value" "value"
"volatile" "volatile"
(procedure_qualifier) (procedure_qualifier)
] @type.qualifier ] @keyword.modifier
[ [
"common" "common"

View file

@ -54,7 +54,7 @@
"const" "const"
"global" "global"
(var) (var)
] @type.qualifier ] @keyword.modifier
; Variables ; Variables
(identifier) @variable (identifier) @variable

View file

@ -28,7 +28,7 @@
(get_body (get_body
"get" @keyword.function) "get" @keyword.function)
(static_keyword) @type.qualifier (static_keyword) @keyword.modifier
(tool_statement) @keyword (tool_statement) @keyword
@ -50,7 +50,7 @@
(name) @type) @keyword (name) @type) @keyword
(const_statement (const_statement
"const" @type.qualifier "const" @keyword.modifier
(name) @constant) (name) @constant)
(expression_statement (expression_statement

View file

@ -13,7 +13,7 @@
[ [
(precision_qualifier) (precision_qualifier)
(interpolation_qualifier) (interpolation_qualifier)
] @type.qualifier ] @keyword.modifier
[ [
"in" "in"

View file

@ -159,7 +159,7 @@
"external" "external"
(opacity_modifier) (opacity_modifier)
(visibility_modifier) (visibility_modifier)
] @type.qualifier ] @keyword.modifier
; Tuples ; Tuples
(tuple_access (tuple_access

View file

@ -25,7 +25,7 @@
"noperspective" "noperspective"
"invariant" "invariant"
"precise" "precise"
] @type.qualifier ] @keyword.modifier
"subroutine" @keyword.function "subroutine" @keyword.function

View file

@ -26,7 +26,7 @@
(format) @character.special (format) @character.special
"sensitive:" @type.qualifier "sensitive:" @keyword.modifier
(filter_name) @variable.parameter (filter_name) @variable.parameter

View file

@ -67,7 +67,7 @@
"public" "public"
"static" "static"
"synchronized" "synchronized"
] @type.qualifier ] @keyword.modifier
(comment) @comment @spell (comment) @comment @spell

View file

@ -64,7 +64,7 @@
(static_modifier) (static_modifier)
(visibility_modifier) (visibility_modifier)
(xhp_modifier) (xhp_modifier)
] @type.qualifier ] @keyword.modifier
[ [
"shape" "shape"

View file

@ -74,7 +74,7 @@
"const" "const"
"static" "static"
"nullable" "nullable"
] @type.qualifier ] @keyword.modifier
; Attributes ; Attributes
[ [

View file

@ -24,7 +24,7 @@
"triangleadj" "triangleadj"
"lineadj" "lineadj"
"triangle" "triangle"
] @type.qualifier ] @keyword.modifier
((identifier) @variable.builtin ((identifier) @variable.builtin
(#lua-match? @variable.builtin "^SV_")) (#lua-match? @variable.builtin "^SV_"))

View file

@ -31,7 +31,7 @@
[ [
"varying" "varying"
"uniform" "uniform"
] @type.qualifier ] @keyword.modifier
"__regcall" @attribute "__regcall" @attribute

View file

@ -199,10 +199,10 @@
"static" "static"
"strictfp" "strictfp"
"transitive" "transitive"
] @type.qualifier ] @keyword.modifier
(modifiers (modifiers
"synchronized" @type.qualifier) "synchronized" @keyword.modifier)
[ [
"transient" "transient"

View file

@ -309,7 +309,7 @@
[ [
"const" "const"
"mutable" "mutable"
] @type.qualifier ] @keyword.modifier
; Operators & Punctuation ; Operators & Punctuation
[ [

View file

@ -237,7 +237,7 @@
(visibility_modifier) (visibility_modifier)
(reification_modifier) (reification_modifier)
(inheritance_modifier) (inheritance_modifier)
] @type.qualifier ] @keyword.modifier
[ [
"val" "val"

View file

@ -42,7 +42,7 @@
(type) @type (type) @type
(join_types) @type.qualifier (join_types) @keyword.modifier
[ [
"(" "("

View file

@ -24,7 +24,7 @@
"constant" "constant"
"private" "private"
"public" "public"
] @type.qualifier ] @keyword.modifier
"self" @variable.builtin "self" @variable.builtin

View file

@ -100,7 +100,7 @@
(dso_local) (dso_local)
(linkage_aux) (linkage_aux)
(visibility) (visibility)
] @type.qualifier ] @keyword.modifier
[ [
"thread_local" "thread_local"

View file

@ -62,7 +62,7 @@
"@private" "@private"
"(exact)" "(exact)"
"(key)" "(key)"
] @type.qualifier @nospell ] @keyword.modifier @nospell
; Variables ; Variables
(identifier) @variable @nospell (identifier) @variable @nospell

View file

@ -244,6 +244,6 @@
[ [
(er_attribute_key_type_pk) (er_attribute_key_type_pk)
(er_attribute_key_type_fk) (er_attribute_key_type_fk)
] @type.qualifier ] @keyword.modifier
(er_attribute_comment) @string @spell (er_attribute_comment) @string @spell

View file

@ -724,36 +724,36 @@
]))) ])))
; ============================================================================= ; =============================================================================
; @type.qualifier ; type qualifiers (e.g. `const`) ; @keyword.modifier ; type qualifier keywords (e.g. `const`)
(var_type (var_type
"var" @type.qualifier) "var" @keyword.modifier)
(out_type (out_type
"out" @type.qualifier) "out" @keyword.modifier)
(distinct_type (distinct_type
"distinct" @type.qualifier) "distinct" @keyword.modifier)
(ref_type (ref_type
"ref" @type.qualifier) "ref" @keyword.modifier)
(pointer_type (pointer_type
"ptr" @type.qualifier) "ptr" @keyword.modifier)
(var_parameter (var_parameter
"var" @type.qualifier) "var" @keyword.modifier)
(type_parameter (type_parameter
"type" @type.qualifier) "type" @keyword.modifier)
(static_parameter (static_parameter
"static" @type.qualifier) "static" @keyword.modifier)
(ref_parameter (ref_parameter
"ref" @type.qualifier) "ref" @keyword.modifier)
(pointer_parameter (pointer_parameter
"ptr" @type.qualifier) "ptr" @keyword.modifier)
; ============================================================================= ; =============================================================================
; @variable.member ; object and struct fields ; @variable.member ; object and struct fields

View file

@ -21,7 +21,7 @@
"__covariant" "__covariant"
"__contravariant" "__contravariant"
(visibility_specification) (visibility_specification)
] @type.qualifier ] @keyword.modifier
; Storageclasses ; Storageclasses
[ [

View file

@ -153,7 +153,7 @@
"rec" "rec"
"private" "private"
"virtual" "virtual"
] @type.qualifier ] @keyword.modifier
[ [
"fun" "fun"

View file

@ -79,7 +79,7 @@
(kStrict) (kStrict)
(kRequired) (kRequired)
(kOptional) (kOptional)
] @type.qualifier ] @keyword.modifier
[ [
(kPacked) (kPacked)

View file

@ -266,7 +266,7 @@
"public" "public"
"readonly" "readonly"
"static" "static"
] @type.qualifier ] @keyword.modifier
[ [
"return" "return"

View file

@ -62,7 +62,7 @@
[ [
(optional) (optional)
(irq_modifiers) (irq_modifiers)
] @type.qualifier ] @keyword.modifier
[ [
"block" "block"

View file

@ -45,7 +45,7 @@
"#share" "#share"
"#alias" "#alias"
"#any" "#any"
] @type.qualifier ] @keyword.modifier
; Conditionals ; Conditionals
[ [

View file

@ -19,7 +19,7 @@
"optional" "optional"
"repeated" "repeated"
"required" "required"
] @type.qualifier ] @keyword.modifier
[ [
"package" "package"

View file

@ -106,7 +106,7 @@ alias: (identifier) @variable.member
[ [
(keyword_version) (keyword_version)
(keyword_target) (keyword_target)
] @type.qualifier ] @keyword.modifier
(target) @function.builtin (target) @function.builtin

View file

@ -113,7 +113,7 @@
(type_role_declaration (type_role_declaration
"role" @keyword "role" @keyword
role: (type_role) @type.qualifier) role: (type_role) @keyword.modifier)
(hole) @character.special (hole) @character.special

View file

@ -54,7 +54,7 @@
[ [
"asc" "asc"
"desc" "desc"
] @type.qualifier ] @keyword.modifier
[ [
(true) (true)

View file

@ -116,7 +116,7 @@
"default" "default"
"readonly" "readonly"
"required" "required"
] @type.qualifier ] @keyword.modifier
; from typescript ; from typescript
(type_identifier) @type (type_identifier) @type

View file

@ -104,7 +104,7 @@
"normal" "normal"
"urgent" "urgent"
"active" "active"
] @type.qualifier) ] @keyword.modifier)
(hex_color) @number (hex_color) @number

View file

@ -37,7 +37,7 @@
"prepend" "prepend"
] @function.method ] @function.method
(visibility) @type.qualifier (visibility) @keyword.modifier
(comment) @comment @spell (comment) @comment @spell

View file

@ -62,8 +62,8 @@
(constant) @constant (constant) @constant
((identifier) @type.qualifier ((identifier) @keyword.modifier
(#any-of? @type.qualifier "private" "protected" "public")) (#any-of? @keyword.modifier "private" "protected" "public"))
[ [
"rescue" "rescue"

View file

@ -275,7 +275,7 @@
[ [
"ref" "ref"
(mutable_specifier) (mutable_specifier)
] @type.qualifier ] @keyword.modifier
[ [
"const" "const"

View file

@ -161,13 +161,13 @@
"$" @punctuation.special) "$" @punctuation.special)
; keywords ; keywords
(opaque_modifier) @type.qualifier (opaque_modifier) @keyword.modifier
(infix_modifier) @keyword (infix_modifier) @keyword
(transparent_modifier) @type.qualifier (transparent_modifier) @keyword.modifier
(open_modifier) @type.qualifier (open_modifier) @keyword.modifier
[ [
"case" "case"
@ -201,7 +201,7 @@
"sealed" "sealed"
"private" "private"
"protected" "protected"
] @type.qualifier ] @keyword.modifier
(inline_modifier) @keyword.storage (inline_modifier) @keyword.storage

View file

@ -28,11 +28,11 @@
(relative_font_size_value) (relative_font_size_value)
] @number.float ] @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 (builtin_type_identifier) @type.builtin

View file

@ -192,7 +192,7 @@
; Misc ; Misc
(annotation_visibility) @keyword.storage (annotation_visibility) @keyword.storage
(access_modifier) @type.qualifier (access_modifier) @keyword.modifier
(array_type (array_type
"[" @punctuation.special) "[" @punctuation.special)

View file

@ -172,7 +172,7 @@
"view" "view"
"payable" "payable"
(immutable) (immutable)
] @type.qualifier ] @keyword.modifier
[ [
"memory" "memory"

View file

@ -149,7 +149,7 @@
; Non-type Keywords ; Non-type Keywords
(variable_storage_class) @keyword.storage (variable_storage_class) @keyword.storage
(visibility) @type.qualifier (visibility) @keyword.modifier
(assertion) @function.builtin (assertion) @function.builtin
@ -298,4 +298,4 @@
"static" "static"
"stock" "stock"
"forward" "forward"
] @type.qualifier ] @keyword.modifier

View file

@ -333,7 +333,7 @@
(keyword_statistics) (keyword_statistics)
(keyword_maxvalue) (keyword_maxvalue)
(keyword_minvalue) (keyword_minvalue)
] @type.qualifier ] @keyword.modifier
[ [
(keyword_int) (keyword_int)

View file

@ -61,7 +61,7 @@
[ [
"static" "static"
"const" "const"
] @type.qualifier ] @keyword.modifier
; Variables ; Variables
[ [

View file

@ -10,7 +10,7 @@
"render" "render"
] @keyword ] @keyword
"const" @type.qualifier "const" @keyword.modifier
[ [
"if" "if"

View file

@ -34,7 +34,7 @@
(parameter_modifier) (parameter_modifier)
(inheritance_modifier) (inheritance_modifier)
(mutation_modifier) (mutation_modifier)
] @type.qualifier ] @keyword.modifier
(function_declaration (function_declaration
(simple_identifier) @function.method) (simple_identifier) @function.method)

View file

@ -153,6 +153,6 @@
"@define" @keyword.directive.define "@define" @keyword.directive.define
"private" @type.qualifier "private" @keyword.modifier
"global" @keyword.storage "global" @keyword.storage

View file

@ -68,7 +68,7 @@
[ [
"const" "const"
"volatile" "volatile"
] @type.qualifier ] @keyword.modifier
; Operators in comma and conditional HLL expressions ; Operators in comma and conditional HLL expressions
(hll_comma_expression (hll_comma_expression
@ -120,7 +120,7 @@
(hll_type_descriptor) (hll_type_descriptor)
] @type ] @type
(hll_type_qualifier) @type.qualifier (hll_type_qualifier) @keyword.modifier
(hll_primitive_type) @type.builtin (hll_primitive_type) @type.builtin

View file

@ -177,7 +177,7 @@
"server" "server"
"stateful" "stateful"
"transient" "transient"
] @type.qualifier ] @keyword.modifier
; Literals ; Literals
(string) @string (string) @string

View file

@ -41,7 +41,7 @@
"protected" "protected"
"public" "public"
"readonly" "readonly"
] @type.qualifier ] @keyword.modifier
; types ; types
(type_identifier) @type (type_identifier) @type

View file

@ -24,9 +24,9 @@
(kw_equals) @keyword.operator (kw_equals) @keyword.operator
(structural) @type.qualifier (structural) @keyword.modifier
(unique) @type.qualifier (unique) @keyword.modifier
(type_constructor) @constructor (type_constructor) @constructor

View file

@ -59,7 +59,7 @@
[ [
"pub" "pub"
"mut" "mut"
] @type.qualifier ] @keyword.modifier
[ [
"go" "go"

View file

@ -208,7 +208,7 @@
"owned" "owned"
"weak" "weak"
"unowned" "unowned"
] @type.qualifier ] @keyword.modifier
[ [
"case" "case"

View file

@ -154,7 +154,7 @@
[ [
"signed" "signed"
"unsigned" "unsigned"
] @type.qualifier ] @keyword.modifier
(data_type (data_type
(simple_identifier) @type) (simple_identifier) @type)
@ -263,7 +263,7 @@
;(parameter_identifier) @variable.member)) ;(parameter_identifier) @variable.member))
(type_declaration (type_declaration
(data_type (data_type
"packed" @type.qualifier)) "packed" @keyword.modifier))
(struct_union) @type (struct_union) @type

View file

@ -50,7 +50,7 @@
"read" "read"
"read_write" "read_write"
"write" "write"
] @type.qualifier ] @keyword.modifier
"fn" @keyword.function "fn" @keyword.function

View file

@ -15,7 +15,7 @@
[ [
(modifier) (modifier)
"None" "None"
] @type.qualifier ] @keyword.modifier
[ [
"%L" "%L"

View file

@ -154,7 +154,7 @@ field_constant: (IDENTIFIER) @constant
"volatile" "volatile"
"allowzero" "allowzero"
"noalias" "noalias"
] @type.qualifier ] @keyword.modifier
[ [
"addrspace" "addrspace"

View file

@ -328,7 +328,7 @@ struct TestEmptyStruct {}
struct TestConstants { struct TestConstants {
const voidConst :Void = void; const voidConst :Void = void;
# ^^^^^ @type.qualifier # ^^^^^ @keyword.modifier
const boolConst :Bool = true; const boolConst :Bool = true;
const int8Const :Int8 = -123; const int8Const :Int8 = -123;
const int16Const :Int16 = -12345; const int16Const :Int16 = -12345;

View file

@ -1,5 +1,5 @@
pub fn add(x: Int, y: Int) -> Int { pub fn add(x: Int, y: Int) -> Int {
// <- @type.qualifier // <- @keyword.modifier
// ^^ @keyword.function // ^^ @keyword.function
// ^^^ @function // ^^^ @function
// ^ @punctuation.bracket // ^ @punctuation.bracket
@ -18,7 +18,7 @@ pub fn add(x: Int, y: Int) -> Int {
// <- @punctuation.bracket // <- @punctuation.bracket
pub fn twice(f: fn(t) -> t, x: t) -> t { pub fn twice(f: fn(t) -> t, x: t) -> t {
// <- @type.qualifier // <- @keyword.modifier
// ^ @keyword.function // ^ @keyword.function
// ^^^^^ @function // ^^^^^ @function
// ^ @punctuation.bracket // ^ @punctuation.bracket
@ -100,8 +100,8 @@ fn replace(
// <- @punctuation.bracket // <- @punctuation.bracket
pub external fn random_float() -> Float = "rand" "uniform" pub external fn random_float() -> Float = "rand" "uniform"
// <- @type.qualifier // <- @keyword.modifier
// ^^^^^^^^ @type.qualifier // ^^^^^^^^ @keyword.modifier
// ^^ @keyword.function // ^^ @keyword.function
// ^^^^^^^^^^^^ @function // ^^^^^^^^^^^^ @function
// ^ @punctuation.bracket // ^ @punctuation.bracket
@ -113,8 +113,8 @@ pub external fn random_float() -> Float = "rand" "uniform"
// ^^^^^^^^^ @function // ^^^^^^^^^ @function
pub external fn inspect(a) -> a = "Elixir.IO" "inspect" pub external fn inspect(a) -> a = "Elixir.IO" "inspect"
// <- @type.qualifier // <- @keyword.modifier
// ^^^^^^^^ @type.qualifier // ^^^^^^^^ @keyword.modifier
// ^^ @keyword.function // ^^ @keyword.function
// ^^^^^^^ @function // ^^^^^^^ @function
// ^ @punctuation.bracket // ^ @punctuation.bracket

View file

@ -1,5 +1,5 @@
pub type Cat { pub type Cat {
// <- @type.qualifier // <- @keyword.modifier
// ^^^^ @keyword // ^^^^ @keyword
// ^^^ @type // ^^^ @type
// ^ @punctuation.bracket // ^ @punctuation.bracket
@ -54,8 +54,8 @@ type Box(inner_type) {
} }
pub opaque type Counter { pub opaque type Counter {
// <- @type.qualifier // <- @keyword.modifier
// ^^^^^^ @type.qualifier // ^^^^^^ @keyword.modifier
// ^^^^ @keyword // ^^^^ @keyword
// ^^^^^^^ @type // ^^^^^^^ @type
// ^ @punctuation.bracket // ^ @punctuation.bracket

View file

@ -2,21 +2,21 @@ class Box<T> {
// ^ @type // ^ @type
// ^ @type // ^ @type
protected T $data; protected T $data;
// ^ @type.qualifier // ^ @keyword.modifier
// ^ @type // ^ @type
public function __construct(T $data) { public function __construct(T $data) {
// ^ @type // ^ @type
// ^ @variable.parameter // ^ @variable.parameter
// ^ @keyword.function // ^ @keyword.function
// ^ @type.qualifier // ^ @keyword.modifier
// ^ @function.method // ^ @function.method
$this->data = $data; $this->data = $data;
} }
public function getData(): T { public function getData(): T {
// ^ @function.method // ^ @function.method
// ^ @type.qualifier // ^ @keyword.modifier
return $this->data; return $this->data;
// ^ @operator // ^ @operator
// ^ @variable.builtin // ^ @variable.builtin

View file

@ -1,6 +1,6 @@
.class public Lbaksmali/test/class; .class public Lbaksmali/test/class;
# <- @keyword # <- @keyword
# ^^^^^^ @type.qualifier # ^^^^^^ @keyword.modifier
.super Ljava/lang/Object; .super Ljava/lang/Object;
# ^ @character.special # ^ @character.special
# ^^^^ @type.builtin # ^^^^ @type.builtin

View file

@ -39,8 +39,8 @@ Var.Assign sp = &s.n+offset
Var.Assign padd = (CAddition const * volatile)&d Var.Assign padd = (CAddition const * volatile)&d
; ^ @variable ; ^ @variable
; ^ @type ; ^ @type
; ^ @type.qualifier ; ^ @keyword.modifier
; ^ @type.qualifier ; ^ @keyword.modifier
; ^ @variable ; ^ @variable
Var.Assign e1 = (enum e2)&e Var.Assign e1 = (enum e2)&e
; ^ @variable ; ^ @variable

View file

@ -5,8 +5,8 @@ use type Facebook\XHP\HTML\{XHPHTMLHelpers, a, form};
final xhp class a_post extends x\element { final xhp class a_post extends x\element {
// ^ @type.qualifier // ^ @keyword.modifier
// ^ @type.qualifier // ^ @keyword.modifier
// ^ @keyword // ^ @keyword
use XHPHTMLHelpers; use XHPHTMLHelpers;