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

20
queries/dtd/highlights.scm
View file

@ -1,6 +1,6 @@
;; XML declaration
(XMLDecl "xml" @preproc)
(XMLDecl "xml" @keyword.directive)
(XMLDecl [ "version" "encoding" ] @tag.attribute)
@ -10,12 +10,12 @@
;; Processing instructions
(PI) @preproc
(PI) @keyword.directive
;; Element declaration
(elementdecl
"ELEMENT" @define
"ELEMENT" @keyword.directive.define
(Name) @tag)
(contentspec
@ -30,7 +30,7 @@
;; Entity declaration
(GEDecl
"ENTITY" @define
"ENTITY" @keyword.directive.define
(Name) @constant)
(GEDecl (EntityValue) @string)
@ -42,7 +42,7 @@
;; Parsed entity declaration
(PEDecl
"ENTITY" @define
"ENTITY" @keyword.directive.define
"%" @operator
(Name) @function.macro)
@ -51,18 +51,18 @@
;; Notation declaration
(NotationDecl
"NOTATION" @preproc
"NOTATION" @keyword.directive
(Name) @label)
((NotationDecl
(ExternalID
(SystemLiteral (URI) @string.special))
(SystemLiteral (URI) @string.special.url))
(#set! "priority" 105)))
;; Attlist declaration
(AttlistDecl
"ATTLIST" @define
"ATTLIST" @keyword.directive.define
(Name) @tag)
(AttDef (Name) @tag.attribute)
@ -100,7 +100,7 @@
(PubidLiteral) @string.special
(SystemLiteral (URI) @text.uri)
(SystemLiteral (URI) @string.special.url)
;; Delimiters & punctuation
@ -114,6 +114,6 @@
;; Misc
[ "INCLUDE" "IGNORE" ] @include
[ "INCLUDE" "IGNORE" ] @keyword.import
(Comment) @comment @spell