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

@ -59,7 +59,7 @@
(list_literal "list" @function.builtin)
(method_declaration
name: (name) @method)
name: (name) @function.method)
(function_call_expression
function: (qualified_name (name) @function.call))
@ -71,13 +71,13 @@
name: (name) @function.call)
(member_call_expression
name: (name) @method.call)
name: (name) @function.method.call)
(function_definition
name: (name) @function)
(nullsafe_member_call_expression
name: (name) @method)
name: (name) @function.method)
(method_declaration
name: (name) @constructor
@ -90,10 +90,10 @@
[
(simple_parameter)
(variadic_parameter)
] @parameter
] @variable.parameter
(argument
(name) @parameter)
(name) @variable.parameter)
; Member
@ -115,18 +115,18 @@
; Namespace
(namespace_definition
name: (namespace_name (name) @namespace))
name: (namespace_name (name) @module))
(namespace_name_as_prefix
(namespace_name (name) @namespace))
(namespace_name (name) @module))
; Attributes
(attribute_list) @attribute
; Conditions ( ? : )
(conditional_expression) @conditional
(conditional_expression) @keyword.conditional
; Directives
(declare_directive ["strict_types" "ticks" "encoding"] @parameter)
(declare_directive ["strict_types" "ticks" "encoding"] @variable.parameter)
; Basic tokens
@ -149,7 +149,7 @@
(boolean) @boolean
(null) @constant.builtin
(integer) @number
(float) @float
(float) @number.float
(comment) @comment @spell
(named_label_statement) @label
@ -215,7 +215,7 @@
"switch"
"match"
"??"
] @conditional
] @keyword.conditional
[
"continue"
@ -226,14 +226,14 @@
"for"
"foreach"
"while"
] @repeat
] @keyword.repeat
[
"catch"
"finally"
"throw"
"try"
] @exception
] @keyword.exception
[
"include_once"
@ -241,7 +241,7 @@
"require_once"
"require"
"use"
] @include
] @keyword.import
[
","