diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-12-24 10:00:20 +0100 |
|---|---|---|
| committer | Christian Clason <c.clason@uni-graz.at> | 2024-01-19 16:58:37 +0100 |
| commit | 1ae9b0e4558fe7868f8cda2db65239cfb14836d0 (patch) | |
| tree | 4eea14b40b8b81d9388fb35cbc9e35b341a75c98 /queries/squirrel | |
| parent | chore(tests): consistent captures (diff) | |
| download | nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.gz nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.bz2 nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.lz nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.xz nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.zst nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.zip | |
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`
Diffstat (limited to 'queries/squirrel')
| -rw-r--r-- | queries/squirrel/highlights.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/queries/squirrel/highlights.scm b/queries/squirrel/highlights.scm index b0b9caf56..5fa20881c 100644 --- a/queries/squirrel/highlights.scm +++ b/queries/squirrel/highlights.scm @@ -40,7 +40,7 @@ "case" "default" "break" -] @conditional +] @keyword.conditional ; Repeats @@ -50,7 +50,7 @@ "do" "while" "continue" -] @repeat +] @keyword.repeat ; Exceptions @@ -58,13 +58,13 @@ "try" "catch" "throw" -] @exception +] @keyword.exception ; Storageclasses [ "local" -] @storageclass +] @keyword.storage ; Qualifiers @@ -90,7 +90,7 @@ ; Parameters (parameter - . (identifier) @parameter) + . (identifier) @variable.parameter) ; Properties (Slots) @@ -128,7 +128,7 @@ (member_declaration (function_declaration - "::"? (_) @method . "(" (_)? ")")) + "::"? (_) @function.method . "(" (_)? ")")) ((function_declaration "::"? (_) @function . "(" (_)? ")") @@ -150,7 +150,7 @@ (identifier) @function "=" (lambda_expression - "@" @symbol)) + "@" @string.special.symbol)) (call_expression [ @@ -278,8 +278,8 @@ ; Ternaries (ternary_expression - "?" @conditional.ternary - ":" @conditional.ternary) + "?" @keyword.conditional.ternary + ":" @keyword.conditional.ternary) ; Literals @@ -293,7 +293,7 @@ (integer) @number -(float) @float +(float) @number.float (bool) @boolean |
