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"
  (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

View file

@ -8,7 +8,7 @@
[
"include"
"cpp_include"
] @include
] @keyword.import
; Function
@ -17,17 +17,17 @@
; Fields
(field (identifier) @field)
(field (identifier) @variable.member)
; Parameters
(function_definition
(parameters
(parameter (identifier) @parameter)))
(parameter (identifier) @variable.parameter)))
(throws
(parameters
(parameter (identifier) @parameter)))
(parameter (identifier) @variable.parameter)))
; Types
@ -82,7 +82,7 @@
(namespace_declaration
(namespace_scope) @tag
[(namespace) @namespace (_ (identifier) @namespace)])
[(namespace) @module (_ (identifier) @module)])
; Attributes
@ -104,7 +104,7 @@
[
"throws"
] @exception
] @keyword.exception
; Keywords
@ -177,11 +177,11 @@
(escape_sequence) @string.escape
(namespace_uri
(string) @text.uri @string.special)
(string) @string.special.url)
(number) @number
(double) @float
(double) @number.float
(boolean) @boolean
@ -222,5 +222,5 @@
((comment) @comment.documentation
(#lua-match? @comment.documentation "^///$"))
((comment) @preproc
(#lua-match? @preproc "#!.*"))
((comment) @keyword.directive
(#lua-match? @keyword.directive "#!.*"))