feat!: align standard captures with upstream
Problem: Sharing highlight queries with upstream tree-sitter and
Helix is difficult.
Solution: Where reasonable, use capture names in tree-sitter's standard
list or Helix's Atom-style hierarchy.
Specifically:
* tree-sitter "standard capture names"
(https://github.com/tree-sitter/tree-sitter/blob/3f44b896852eb7daaa6df4fb778c9bb52c70c815/highlight/src/lib.rs#L20-L72):
- `@parameter` -> `@variable.parameter`
- `@field` -> `@variable.member`
- `@namespace` -> `@module`
- `@float` -> `@number.float`
- `@symbol` -> `@string.special.symbol`
- `@string.regex` -> `@string.regexp`
- `@text.*` -> `@markup.*` (`strong`, `italic`, `link`, `strikethrough`; with exceptions; see below)
- `@text.title` -> `@markup.heading`
- `@text.literal` -> `@markup.raw`
- `@text.reference` -> `@markup.link`
- `@text.uri` -> `@markup.link.url` (in markup links)
- `@string.special` -> `@markup.link.label` (non-url links)
- `@punctuation.special` -> `@markup.list` (markdown lists only; move subitems from `@text.todo`)
* Helix captures
(https://docs.helix-editor.com/master/themes.html#syntax-highlighting):
- `@method` -> `@function.method`
- `@method.call` -> `@function.method.call`
- `@text.{todo,warning,note,danger}` -> `@comment.{error,warning,hint,info,todo}`
- `@text.diff.{add,delete,}` -> `@diff.{plus,minus,delta}`
- `@text.uri` -> `@string.special.url` (outside markup)
- `@preproc` -> `@keyword.directive`
- `@define` -> `@keyword.directive`(`.define`?)
- `@storageclass` -> `@keyword.storage`
- `@conditional` -> `@keyword.conditional`
- `@debug` -> `@keyword.debug`
- `@exception` -> `@keyword.exception`
- `@include` -> `@keyword.import`
- `@repeat` -> `@keyword.repeat`
* cleanup
- remove some redundant `@conceal` (but still allow it for conceal-only patterns)
- remove obsolete `@error` (syntax linting is out of scope for this repo)
- sort, cleanup capture list in `CONTRIBUTING.md`
2023-12-24 10:00:20 +01:00
|
|
|
(identifier) @variable.member
|
2023-10-24 09:48:33 +02:00
|
|
|
|
2025-12-17 11:48:06 +01:00
|
|
|
(symfony_variable) @variable
|
|
|
|
|
|
2023-10-24 09:48:33 +02:00
|
|
|
(constant) @constant
|
|
|
|
|
|
2025-12-17 11:48:06 +01:00
|
|
|
(symfony_method) @function.method.call
|
|
|
|
|
|
|
|
|
|
[
|
|
|
|
|
(modifier_function)
|
|
|
|
|
(symfony_function)
|
|
|
|
|
] @function.call
|
|
|
|
|
|
|
|
|
|
[
|
|
|
|
|
(modifier_predefined)
|
|
|
|
|
(symfony_predefined_function)
|
|
|
|
|
] @function.builtin
|
|
|
|
|
|
|
|
|
|
(modifier_parameter) @variable.parameter
|
|
|
|
|
|
|
|
|
|
(symfony_function_parameter
|
|
|
|
|
(symfony_variable) @variable.parameter)
|
2024-01-06 15:05:50 +09:00
|
|
|
|
2025-12-17 11:48:06 +01:00
|
|
|
(symfony_method_parameter
|
|
|
|
|
(symfony_variable) @variable.parameter)
|
2023-10-24 09:48:33 +02:00
|
|
|
|
|
|
|
|
[
|
2024-01-06 15:05:50 +09:00
|
|
|
(condition)
|
|
|
|
|
(condition_end)
|
2023-10-24 09:48:33 +02:00
|
|
|
(condition_else)
|
feat!: align standard captures with upstream
Problem: Sharing highlight queries with upstream tree-sitter and
Helix is difficult.
Solution: Where reasonable, use capture names in tree-sitter's standard
list or Helix's Atom-style hierarchy.
Specifically:
* tree-sitter "standard capture names"
(https://github.com/tree-sitter/tree-sitter/blob/3f44b896852eb7daaa6df4fb778c9bb52c70c815/highlight/src/lib.rs#L20-L72):
- `@parameter` -> `@variable.parameter`
- `@field` -> `@variable.member`
- `@namespace` -> `@module`
- `@float` -> `@number.float`
- `@symbol` -> `@string.special.symbol`
- `@string.regex` -> `@string.regexp`
- `@text.*` -> `@markup.*` (`strong`, `italic`, `link`, `strikethrough`; with exceptions; see below)
- `@text.title` -> `@markup.heading`
- `@text.literal` -> `@markup.raw`
- `@text.reference` -> `@markup.link`
- `@text.uri` -> `@markup.link.url` (in markup links)
- `@string.special` -> `@markup.link.label` (non-url links)
- `@punctuation.special` -> `@markup.list` (markdown lists only; move subitems from `@text.todo`)
* Helix captures
(https://docs.helix-editor.com/master/themes.html#syntax-highlighting):
- `@method` -> `@function.method`
- `@method.call` -> `@function.method.call`
- `@text.{todo,warning,note,danger}` -> `@comment.{error,warning,hint,info,todo}`
- `@text.diff.{add,delete,}` -> `@diff.{plus,minus,delta}`
- `@text.uri` -> `@string.special.url` (outside markup)
- `@preproc` -> `@keyword.directive`
- `@define` -> `@keyword.directive`(`.define`?)
- `@storageclass` -> `@keyword.storage`
- `@conditional` -> `@keyword.conditional`
- `@debug` -> `@keyword.debug`
- `@exception` -> `@keyword.exception`
- `@include` -> `@keyword.import`
- `@repeat` -> `@keyword.repeat`
* cleanup
- remove some redundant `@conceal` (but still allow it for conceal-only patterns)
- remove obsolete `@error` (syntax linting is out of scope for this repo)
- sort, cleanup capture list in `CONTRIBUTING.md`
2023-12-24 10:00:20 +01:00
|
|
|
] @keyword.conditional
|
2023-10-24 09:48:33 +02:00
|
|
|
|
|
|
|
|
[
|
|
|
|
|
"@import"
|
|
|
|
|
"INCLUDE_TYPOSCRIPT"
|
feat!: align standard captures with upstream
Problem: Sharing highlight queries with upstream tree-sitter and
Helix is difficult.
Solution: Where reasonable, use capture names in tree-sitter's standard
list or Helix's Atom-style hierarchy.
Specifically:
* tree-sitter "standard capture names"
(https://github.com/tree-sitter/tree-sitter/blob/3f44b896852eb7daaa6df4fb778c9bb52c70c815/highlight/src/lib.rs#L20-L72):
- `@parameter` -> `@variable.parameter`
- `@field` -> `@variable.member`
- `@namespace` -> `@module`
- `@float` -> `@number.float`
- `@symbol` -> `@string.special.symbol`
- `@string.regex` -> `@string.regexp`
- `@text.*` -> `@markup.*` (`strong`, `italic`, `link`, `strikethrough`; with exceptions; see below)
- `@text.title` -> `@markup.heading`
- `@text.literal` -> `@markup.raw`
- `@text.reference` -> `@markup.link`
- `@text.uri` -> `@markup.link.url` (in markup links)
- `@string.special` -> `@markup.link.label` (non-url links)
- `@punctuation.special` -> `@markup.list` (markdown lists only; move subitems from `@text.todo`)
* Helix captures
(https://docs.helix-editor.com/master/themes.html#syntax-highlighting):
- `@method` -> `@function.method`
- `@method.call` -> `@function.method.call`
- `@text.{todo,warning,note,danger}` -> `@comment.{error,warning,hint,info,todo}`
- `@text.diff.{add,delete,}` -> `@diff.{plus,minus,delta}`
- `@text.uri` -> `@string.special.url` (outside markup)
- `@preproc` -> `@keyword.directive`
- `@define` -> `@keyword.directive`(`.define`?)
- `@storageclass` -> `@keyword.storage`
- `@conditional` -> `@keyword.conditional`
- `@debug` -> `@keyword.debug`
- `@exception` -> `@keyword.exception`
- `@include` -> `@keyword.import`
- `@repeat` -> `@keyword.repeat`
* cleanup
- remove some redundant `@conceal` (but still allow it for conceal-only patterns)
- remove obsolete `@error` (syntax linting is out of scope for this repo)
- sort, cleanup capture list in `CONTRIBUTING.md`
2023-12-24 10:00:20 +01:00
|
|
|
] @keyword.import
|
2023-10-24 09:48:33 +02:00
|
|
|
|
2025-12-17 11:48:06 +01:00
|
|
|
(condition_attribute) @tag.attribute
|
|
|
|
|
|
|
|
|
|
(cobject) @type.builtin
|
|
|
|
|
|
|
|
|
|
(symfony_built_in_variable) @variable.builtin
|
|
|
|
|
|
|
|
|
|
(symfony_property) @variable.member
|
|
|
|
|
|
2023-10-24 09:48:33 +02:00
|
|
|
[
|
|
|
|
|
(comment)
|
|
|
|
|
(single_line_comment)
|
|
|
|
|
] @comment @spell
|
|
|
|
|
|
|
|
|
|
[
|
|
|
|
|
(string)
|
2025-12-17 11:48:06 +01:00
|
|
|
(multiline_value_content)
|
|
|
|
|
(symfony_string)
|
2023-10-24 09:48:33 +02:00
|
|
|
] @string
|
|
|
|
|
|
2025-12-17 11:48:06 +01:00
|
|
|
(deletion_line
|
|
|
|
|
">" @operator)
|
|
|
|
|
|
|
|
|
|
(copy_line
|
|
|
|
|
"<" @operator)
|
|
|
|
|
|
2023-10-24 09:48:33 +02:00
|
|
|
[
|
|
|
|
|
"="
|
|
|
|
|
"=<"
|
2025-12-17 11:48:06 +01:00
|
|
|
":="
|
|
|
|
|
"?."
|
|
|
|
|
(symfony_condition_operator)
|
|
|
|
|
(condition_bool_legacy)
|
|
|
|
|
(constant_null_coalescing)
|
2023-10-24 09:48:33 +02:00
|
|
|
] @operator
|
|
|
|
|
|
2025-12-17 11:48:06 +01:00
|
|
|
(symfony_ternary_operator) @keyword.conditional.ternary
|
|
|
|
|
|
|
|
|
|
((symfony_condition_operator) @keyword.operator
|
|
|
|
|
(#any-of? @keyword.operator
|
|
|
|
|
"and" "or" "xor" "not" "not in" "in" "contains" "starts with" "ends with" "matches"))
|
|
|
|
|
|
|
|
|
|
[
|
|
|
|
|
","
|
|
|
|
|
"."
|
|
|
|
|
] @punctuation.delimiter
|
|
|
|
|
|
|
|
|
|
(symfony_property_access
|
|
|
|
|
"." @operator)
|
|
|
|
|
|
|
|
|
|
(symfony_method_call
|
|
|
|
|
"." @operator)
|
2023-10-24 09:48:33 +02:00
|
|
|
|
|
|
|
|
[
|
2024-01-06 15:05:50 +09:00
|
|
|
"("
|
|
|
|
|
")"
|
2025-12-17 11:48:06 +01:00
|
|
|
"["
|
|
|
|
|
"]"
|
2024-01-06 15:05:50 +09:00
|
|
|
(block_punctuation)
|
|
|
|
|
] @punctuation.bracket
|
2025-12-17 11:48:06 +01:00
|
|
|
|
|
|
|
|
(condition
|
|
|
|
|
"[" @punctuation.special)
|
|
|
|
|
|
|
|
|
|
(condition
|
|
|
|
|
"]" @punctuation.special)
|
|
|
|
|
|
|
|
|
|
(symfony_number) @number
|
|
|
|
|
|
|
|
|
|
(symfony_boolean) @boolean
|
|
|
|
|
|
|
|
|
|
(symfony_null) @constant.builtin
|