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
|
|
|
"source" @keyword.import
|
2023-08-31 05:28:16 -04:00
|
|
|
|
|
|
|
|
[
|
|
|
|
|
"mainmenu"
|
|
|
|
|
"config"
|
|
|
|
|
"menuconfig"
|
|
|
|
|
"choice"
|
|
|
|
|
"endchoice"
|
|
|
|
|
"comment"
|
|
|
|
|
"menu"
|
|
|
|
|
"endmenu"
|
|
|
|
|
"prompt"
|
|
|
|
|
"default"
|
|
|
|
|
"range"
|
|
|
|
|
"help"
|
|
|
|
|
(optional)
|
|
|
|
|
(modules)
|
|
|
|
|
] @keyword
|
|
|
|
|
|
|
|
|
|
[
|
|
|
|
|
"if"
|
|
|
|
|
"endif"
|
|
|
|
|
"depends on"
|
|
|
|
|
"select"
|
|
|
|
|
"imply"
|
|
|
|
|
"visible if"
|
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-08-31 05:28:16 -04:00
|
|
|
|
|
|
|
|
[
|
|
|
|
|
"def_bool"
|
|
|
|
|
"def_tristate"
|
|
|
|
|
] @keyword.function
|
|
|
|
|
|
|
|
|
|
[
|
|
|
|
|
"||"
|
|
|
|
|
"&&"
|
|
|
|
|
"="
|
|
|
|
|
"!="
|
|
|
|
|
"<"
|
|
|
|
|
">"
|
|
|
|
|
"<="
|
|
|
|
|
">="
|
|
|
|
|
"!"
|
2024-01-26 02:58:25 -05:00
|
|
|
":="
|
2024-02-01 01:19:51 -05:00
|
|
|
"+="
|
|
|
|
|
"?="
|
2023-08-31 05:28:16 -04:00
|
|
|
] @operator
|
|
|
|
|
|
|
|
|
|
[
|
|
|
|
|
"bool"
|
|
|
|
|
"tristate"
|
|
|
|
|
"int"
|
|
|
|
|
"hex"
|
|
|
|
|
"string"
|
|
|
|
|
] @type.builtin
|
|
|
|
|
|
2024-01-06 15:05:50 +09:00
|
|
|
[
|
|
|
|
|
"("
|
|
|
|
|
")"
|
|
|
|
|
] @punctuation.bracket
|
2023-08-31 05:28:16 -04:00
|
|
|
|
2024-01-26 02:58:25 -05:00
|
|
|
"," @punctuation.delimiter
|
|
|
|
|
|
2024-01-06 15:05:50 +09:00
|
|
|
(macro_variable
|
|
|
|
|
[
|
|
|
|
|
"$("
|
|
|
|
|
")"
|
|
|
|
|
] @punctuation.special)
|
2023-08-31 05:28:16 -04:00
|
|
|
|
|
|
|
|
(symbol) @variable
|
|
|
|
|
|
|
|
|
|
[
|
2024-12-21 21:01:19 -05:00
|
|
|
(string)
|
2023-08-31 05:28:16 -04:00
|
|
|
(macro_content)
|
|
|
|
|
(text)
|
|
|
|
|
] @string
|
|
|
|
|
|
2024-01-06 15:05:50 +09:00
|
|
|
(config
|
2024-12-21 21:01:19 -05:00
|
|
|
name: (name
|
|
|
|
|
(symbol) @constant))
|
2024-01-06 15:05:50 +09:00
|
|
|
|
|
|
|
|
(menuconfig
|
2024-12-21 21:01:19 -05:00
|
|
|
name: (name
|
|
|
|
|
(symbol) @constant))
|
2024-01-06 15:05:50 +09:00
|
|
|
|
|
|
|
|
(choice
|
2024-12-21 21:01:19 -05:00
|
|
|
name: (name
|
|
|
|
|
(symbol) @constant))
|
2023-08-31 05:28:16 -04:00
|
|
|
|
|
|
|
|
((symbol) @constant
|
|
|
|
|
(#lua-match? @constant "[A-Z0-9]+"))
|
|
|
|
|
|
2024-01-06 15:05:50 +09:00
|
|
|
(mainmenu
|
2024-12-21 21:01:19 -05:00
|
|
|
name: (string) @markup.heading)
|
2024-01-06 15:05:50 +09:00
|
|
|
|
|
|
|
|
(comment_entry
|
2024-12-21 21:01:19 -05:00
|
|
|
name: (string) @markup.heading)
|
2024-01-06 15:05:50 +09:00
|
|
|
|
|
|
|
|
(menu
|
2024-12-21 21:01:19 -05:00
|
|
|
name: (string) @markup.heading)
|
2023-08-31 05:28:16 -04:00
|
|
|
|
2024-01-06 15:05:50 +09:00
|
|
|
(source
|
2024-12-21 21:01:19 -05:00
|
|
|
(string) @string.special.url)
|
2023-08-31 05:28:16 -04:00
|
|
|
|
2023-09-13 00:25:01 +09:00
|
|
|
(comment) @comment @spell
|