benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-09 06:50:06 -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

16
queries/unison/highlights.scm
View file

@ -41,35 +41,35 @@
(match)
(with)
(cases)
] @conditional
] @keyword.conditional
(blank_pattern) @variable.builtin
(pattern) @variable (constructor_or_variable_pattern) @type
(use_clause) @include
(use_clause) @keyword.import
;; Types
(record_field name: (wordy_id) @variable type: (wordy_id) @type)
(type_name) @type
(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @parameter)
(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @variable.parameter)
(effect (wordy_id) @attribute) ;; NOTE: an effect is a special type
;; Namespaces
(path) @namespace
(namespace) @namespace
(path) @module
(namespace) @module
;; Terms
(type_signature term_name: (path) @namespace term_name: (wordy_id) @variable)
(type_signature term_name: (path) @module term_name: (wordy_id) @variable)
(type_signature term_name: (wordy_id) @variable)
(term_type) @type
(function_application function_name: (path) function_name: (wordy_id) @function)
(term_definition name: (wordy_id) @variable)
(term_definition param: (wordy_id) @parameter)
(term_definition param: (wordy_id) @variable.parameter)
;; Punctuation
[
(type_signature_colon)
@ -85,4 +85,4 @@
"]"
] @punctuation.bracket
(test_watch_expression (wordy_id) @preproc)
(test_watch_expression (wordy_id) @keyword.directive)