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/c_sharp/highlights.scm | |
| 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/c_sharp/highlights.scm')
| -rw-r--r-- | queries/c_sharp/highlights.scm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/queries/c_sharp/highlights.scm b/queries/c_sharp/highlights.scm index bc74a16ff..1cd566728 100644 --- a/queries/c_sharp/highlights.scm +++ b/queries/c_sharp/highlights.scm @@ -5,10 +5,10 @@ (#has-ancestor? @keyword accessor_declaration)) (method_declaration - name: (identifier) @method) + name: (identifier) @function.method) (local_function_statement - name: (identifier) @method) + name: (identifier) @function.method) (method_declaration type: (identifier) @type) @@ -23,41 +23,41 @@ (invocation_expression (member_access_expression - name: (identifier) @method.call)) + name: (identifier) @function.method.call)) (invocation_expression function: (conditional_access_expression (member_binding_expression - name: (identifier) @method.call))) + name: (identifier) @function.method.call))) (namespace_declaration - name: [(qualified_name) (identifier)] @namespace) + name: [(qualified_name) (identifier)] @module) (qualified_name (identifier) @type) (invocation_expression - (identifier) @method.call) + (identifier) @function.method.call) (field_declaration (variable_declaration (variable_declarator - (identifier) @field))) + (identifier) @variable.member))) (initializer_expression (assignment_expression - left: (identifier) @field)) + left: (identifier) @variable.member)) (parameter_list (parameter - name: (identifier) @parameter)) + name: (identifier) @variable.parameter)) (parameter_list (parameter type: (identifier) @type)) (integer_literal) @number -(real_literal) @float +(real_literal) @number.float (null_literal) @constant.builtin (character_literal) @character @@ -154,12 +154,12 @@ ; Generic Method invocation with generic type (invocation_expression function: (generic_name - . (identifier) @method.call)) + . (identifier) @function.method.call)) (invocation_expression (member_access_expression (generic_name - (identifier) @method))) + (identifier) @function.method))) (base_list (identifier) @type) @@ -194,10 +194,10 @@ (identifier) @type) (name_colon - (identifier) @parameter) + (identifier) @variable.parameter) -(warning_directive) @text.warning -(error_directive) @exception +(warning_directive) @comment.warning +(error_directive) @keyword.exception (define_directive (identifier) @constant) @constant.macro @@ -231,7 +231,7 @@ (elif_directive) (else_directive) (endif_directive) -] @conditional +] @keyword.conditional (if_directive (identifier) @constant) @@ -245,14 +245,14 @@ "continue" "goto" "foreach" -] @repeat +] @keyword.repeat [ "try" "catch" "throw" "finally" -] @exception +] @keyword.exception [ "+" @@ -304,7 +304,7 @@ ":" ] @punctuation.delimiter -(conditional_expression ["?" ":"] @conditional.ternary) +(conditional_expression ["?" ":"] @keyword.conditional.ternary) [ "[" @@ -325,10 +325,10 @@ [ "using" "as" -] @include +] @keyword.import (alias_qualified_name - (identifier "global") @include) + (identifier "global") @keyword.import) [ "with" @@ -385,7 +385,7 @@ "static" "volatile" "required" -] @storageclass +] @keyword.storage [ "abstract" |
