mirror of
https://github.com/nvim-treesitter/nvim-treesitter.git
synced 2026-07-06 21:40:03 -04:00
1ae9b0e455
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`
93 lines
2.6 KiB
Scheme
93 lines
2.6 KiB
Scheme
;From MDeiml/tree-sitter-markdown & Helix
|
|
(setext_heading (paragraph) @markup.heading.1 (setext_h1_underline) @markup.heading.1.marker)
|
|
(setext_heading (paragraph) @markup.heading.2 (setext_h2_underline) @markup.heading.2.marker)
|
|
|
|
(atx_heading (atx_h1_marker) @markup.heading.1.marker (inline) @markup.heading.1)
|
|
(atx_heading (atx_h2_marker) @markup.heading.2.marker (inline) @markup.heading.2)
|
|
(atx_heading (atx_h3_marker) @markup.heading.3.marker (inline) @markup.heading.3)
|
|
(atx_heading (atx_h4_marker) @markup.heading.4.marker (inline) @markup.heading.4)
|
|
(atx_heading (atx_h5_marker) @markup.heading.5.marker (inline) @markup.heading.5)
|
|
(atx_heading (atx_h6_marker) @markup.heading.6.marker (inline) @markup.heading.6)
|
|
|
|
(info_string) @label
|
|
|
|
(pipe_table_header (pipe_table_cell) @markup.heading)
|
|
|
|
(pipe_table_header "|" @punctuation.special)
|
|
(pipe_table_row "|" @punctuation.special)
|
|
(pipe_table_delimiter_row "|" @punctuation.special)
|
|
(pipe_table_delimiter_cell) @punctuation.special
|
|
|
|
;; Code blocks (conceal backticks and language annotation)
|
|
(indented_code_block) @markup.raw.block
|
|
|
|
((fenced_code_block) @markup.raw.block
|
|
(#set! "priority" 90))
|
|
|
|
(fenced_code_block
|
|
(fenced_code_block_delimiter) @conceal
|
|
(#set! conceal ""))
|
|
|
|
(fenced_code_block
|
|
(info_string
|
|
(language) @conceal
|
|
(#set! conceal "")))
|
|
|
|
[
|
|
(link_destination)
|
|
] @markup.link.url
|
|
|
|
[
|
|
(link_title)
|
|
(link_label)
|
|
] @markup.link.label
|
|
|
|
[
|
|
(list_marker_plus)
|
|
(list_marker_minus)
|
|
(list_marker_star)
|
|
(list_marker_dot)
|
|
(list_marker_parenthesis)
|
|
] @markup.list
|
|
|
|
; NOTE: The following has been commented out due to issues with spaces in the
|
|
; list marker nodes generated by the parser. If those spaces ever get captured
|
|
; by a different node (e.g. block_continuation) we can safely readd these
|
|
; conceals.
|
|
; ;; Conceal bullet points
|
|
; ([(list_marker_plus) (list_marker_star)]
|
|
; @punctuation.special
|
|
; (#offset! @punctuation.special 0 0 0 -1)
|
|
; (#set! conceal "•"))
|
|
; ([(list_marker_plus) (list_marker_star)]
|
|
; @punctuation.special
|
|
; (#any-of? @punctuation.special "+" "*")
|
|
; (#set! conceal "•"))
|
|
; ((list_marker_minus)
|
|
; @punctuation.special
|
|
; (#offset! @punctuation.special 0 0 0 -1)
|
|
; (#set! conceal "—"))
|
|
; ((list_marker_minus)
|
|
; @punctuation.special
|
|
; (#eq? @punctuation.special "-")
|
|
; (#set! conceal "—"))
|
|
|
|
(code_fence_content) @none
|
|
|
|
(thematic_break) @punctuation.special
|
|
|
|
(task_list_marker_unchecked) @markup.list.unchecked
|
|
(task_list_marker_checked) @markup.list.checked
|
|
|
|
((block_quote) @markup.quote (#set! "priority" 90))
|
|
|
|
[
|
|
(block_continuation)
|
|
(block_quote_marker)
|
|
] @punctuation.special
|
|
|
|
[
|
|
(backslash_escape)
|
|
] @string.escape
|
|
|
|
(inline) @spell
|