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

44
queries/vimdoc/highlights.scm
View file

@ -1,31 +1,31 @@
(h1) @text.title.1
(h2) @text.title.2
(h3) @text.title.3
(column_heading) @text.title.4
(h1) @markup.heading.1
(h2) @markup.heading.2
(h3) @markup.heading.3
(column_heading) @markup.heading.4
(column_heading
"~" @conceal (#set! conceal ""))
"~" @markup.heading.4.marker (#set! conceal ""))
(tag
"*" @conceal (#set! conceal "")
"*" @markup.heading.5.marker (#set! conceal "")
text: (_) @label)
(taglink
"|" @conceal (#set! conceal "")
text: (_) @text.reference)
"|" @markup.link (#set! conceal "")
text: (_) @markup.link)
(optionlink
text: (_) @text.reference)
text: (_) @markup.link)
(codespan
"`" @conceal (#set! conceal "")
text: (_) @text.literal)
((codeblock) @text.literal.block (#set! "priority" 90))
"`" @markup.raw (#set! conceal "")
text: (_) @markup.raw)
((codeblock) @markup.raw.block (#set! "priority" 90))
(codeblock
[">" (language)] @conceal (#set! conceal ""))
[">" (language)] @markup.raw.block (#set! conceal ""))
(block
"<" @conceal (#set! conceal ""))
(argument) @parameter
"<" @markup.raw.block (#set! conceal ""))
(argument) @variable.parameter
(keycode) @string.special
(url) @text.uri
((note) @text.note
(#any-of? @text.note "Note:" "NOTE:" "Notes:"))
((note) @text.warning
(#any-of? @text.warning "Warning:" "WARNING:"))
((note) @text.danger
(#any-of? @text.danger "Deprecated:" "DEPRECATED:"))
(url) @string.special.url
((note) @comment.hint
(#any-of? @comment.hint "Note:" "NOTE:" "Notes:"))
((note) @comment.warning
(#any-of? @comment.warning "Warning:" "WARNING:"))
((note) @comment.error
(#any-of? @comment.error "Deprecated:" "DEPRECATED:"))