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.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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -244,6 +244,6 @@
[
(er_attribute_key_type_pk)
(er_attribute_key_type_fk)
] @type.qualifier
] @keyword.modifier
(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.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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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"

View file

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

View file

@ -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

View file

@ -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

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -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

View file

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

View file

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

View file

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

View file

@ -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;

View file

@ -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

View file

@ -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

View file

@ -2,21 +2,21 @@ class Box<T> {
// ^ @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

View file

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

View file

@ -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

View file

@ -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;