benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-14 17:30:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat!: align standard captures with upstream

Browse source 
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"
  (3f44b89685/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`
This commit is contained in:
Christian Clason 2023-12-24 10:00:20 +01:00
parent 10dd49958c
commit 1ae9b0e455
263 changed files with 2356 additions and 2337 deletions
Download patch file Download diff file Expand all files Collapse all files

20
queries/dart/highlights.scm
View file

@ -84,11 +84,11 @@
(scoped_identifier
scope: (identifier) @type)
(function_signature
name: (identifier) @method)
name: (identifier) @function.method)
(getter_signature
(identifier) @method)
(identifier) @function.method)
(setter_signature
name: (identifier) @method)
name: (identifier) @function.method)
(enum_declaration
name: (identifier) @type)
(enum_constant
@ -131,10 +131,10 @@
; Parameters
; --------------------
(formal_parameter
name: (identifier) @parameter)
name: (identifier) @variable.parameter)
(named_argument
(label (identifier) @parameter))
(label (identifier) @variable.parameter))
; Literals
; --------------------
@ -147,7 +147,7 @@
; (hex_floating_point_literal)
] @number
(symbol_literal) @symbol
(symbol_literal) @string.special.symbol
(string_literal) @string
(true) @boolean
(false) @boolean
@ -165,7 +165,7 @@
"as"
"show"
"hide"
] @include
] @keyword.import
; Reserved words (cannot be used as identifiers)
[
@ -257,7 +257,7 @@
"static"
"typedef"))
["if" "else" "switch" "default"] @conditional
["if" "else" "switch" "default"] @keyword.conditional
[
"try"
@ -265,6 +265,6 @@
"catch"
"finally"
(break_statement)
] @exception
] @keyword.exception
["do" "while" "continue" "for"] @repeat
["do" "while" "continue" "for"] @keyword.repeat