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/d/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/d/highlights.scm')
| -rw-r--r-- | queries/d/highlights.scm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/queries/d/highlights.scm b/queries/d/highlights.scm index 229a9bf55..18ced7246 100644 --- a/queries/d/highlights.scm +++ b/queries/d/highlights.scm @@ -59,7 +59,7 @@ (integer_literal) @number -(float_literal) @float +(float_literal) @number.float [ "true" @@ -88,12 +88,12 @@ (parameter (var_declarator - (identifier) @parameter + (identifier) @variable.parameter ) ) (function_literal - (identifier) @parameter + (identifier) @variable.parameter ) (constructor @@ -112,7 +112,7 @@ "else" "if" "switch" -] @conditional +] @keyword.conditional [ "break" @@ -122,7 +122,7 @@ "foreach" "foreach_reverse" "while" -] @repeat +] @keyword.repeat [ "__parameters" @@ -209,7 +209,7 @@ "finally" "throw" "try" -] @exception +] @keyword.exception "null" @constant.builtin @@ -218,7 +218,7 @@ "const" "immutable" "shared" -] @storageclass +] @keyword.storage [ "abstract" @@ -241,11 +241,11 @@ . (identifier) @type.definition) (module_declaration - "module" @include + "module" @keyword.import ) (import_declaration - "import" @include + "import" @keyword.import ) (type) @type @@ -272,8 +272,8 @@ (fundamental_type) @type.builtin -(module_fully_qualified_name (packages (package_name) @namespace)) -(module_name) @namespace +(module_fully_qualified_name (packages (package_name) @module)) +(module_name) @module (at_attribute) @attribute |