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

@ -97,10 +97,10 @@
))
(package_header "package" @keyword
. (identifier (simple_identifier) @namespace))
. (identifier (simple_identifier) @module))
(import_header
"import" @include)
"import" @keyword.import)
; The last `simple_identifier` in a `import_header` will always either be a function
; or a type. Classes can appear anywhere in the import path, unlike functions
@ -142,16 +142,16 @@
("init") @constructor)
(parameter
(simple_identifier) @parameter)
(simple_identifier) @variable.parameter)
(parameter_with_optional_type
(simple_identifier) @parameter)
(simple_identifier) @variable.parameter)
; lambda parameters
(lambda_literal
(lambda_parameters
(variable_declaration
(simple_identifier) @parameter)))
(simple_identifier) @variable.parameter)))
;;; Function calls
@ -227,9 +227,9 @@
((multiline_comment) @comment.documentation
(#lua-match? @comment.documentation "^/[*][*][^*].*[*]/$"))
(shebang_line) @preproc
(shebang_line) @keyword.directive
(real_literal) @float
(real_literal) @number.float
[
(integer_literal)
(long_literal)
@ -254,7 +254,7 @@
; - "[abc]?".toRegex()
(call_expression
(navigation_expression
((string_literal) @string.regex)
((string_literal) @string.regexp)
(navigation_suffix
((simple_identifier) @_function
(#eq? @_function "toRegex")))))
@ -266,7 +266,7 @@
(call_suffix
(value_arguments
(value_argument
(string_literal) @string.regex))))
(string_literal) @string.regexp))))
; - Regex.fromLiteral("[abc]?")
(call_expression
@ -279,7 +279,7 @@
(call_suffix
(value_arguments
(value_argument
(string_literal) @string.regex))))
(string_literal) @string.regexp))))
;;; Keywords
@ -323,7 +323,7 @@
"if"
"else"
"when"
] @conditional
] @keyword.conditional
[
"for"
@ -333,14 +333,14 @@
"continue@"
"break"
"break@"
] @repeat
] @keyword.repeat
[
"try"
"catch"
"throw"
"finally"
] @exception
] @keyword.exception
(annotation