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

24
queries/pascal/highlights.scm
View file

@ -72,13 +72,13 @@
(kWhile)
(kRepeat)
(kUntil)
] @repeat
] @keyword.repeat
[
(kIf)
(kThen)
(kElse)
] @conditional
] @keyword.conditional
[
(kPublished)
@ -95,9 +95,9 @@
(kPacked)
(kAbsolute)
] @storageclass
] @keyword.storage
(kUses) @include
(kUses) @keyword.import
; -- Attributes
@ -278,7 +278,7 @@
(comment) @comment.documentation
. (declVar))
(pp) @preproc
(pp) @keyword.directive
; -- Type declaration
@ -304,11 +304,11 @@
; -- Function parameters
(declArg name: (identifier) @parameter)
(declArg name: (identifier) @variable.parameter)
; -- Template parameters
(genericArg name: (identifier) @parameter)
(genericArg name: (identifier) @variable.parameter)
(genericArg type: (typeref) @type)
(declProc name: (genericDot lhs: (identifier) @type))
@ -322,7 +322,7 @@
; -- Exception parameters
(exceptionHandler variable: (identifier) @parameter)
(exceptionHandler variable: (identifier) @variable.parameter)
; -- Type usage
@ -394,10 +394,10 @@
(#lua-match? @keyword.return "^[eE][xX][iI][tT]$")))
(statement (exprCall entity: ((identifier) @keyword.return
(#lua-match? @keyword.return "^[eE][xX][iI][tT]$"))))
(statement ((identifier) @repeat
(#lua-match? @repeat "^[bB][rR][eE][aA][kK]$")))
(statement ((identifier) @repeat
(#lua-match? @repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
(statement ((identifier) @keyword.repeat
(#lua-match? @keyword.repeat "^[bB][rR][eE][aA][kK]$")))
(statement ((identifier) @keyword.repeat
(#lua-match? @keyword.repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
; -- Identifier type inference