benbot/nvim-treesitter
1
0
Fork 0
mirror of https://github.com/nvim-treesitter/nvim-treesitter.git synced 2026-07-07 05:50:04 -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/gdscript/highlights.scm
View file

@ -6,7 +6,7 @@
(comment) @comment @spell
(string_name) @string
(string) @string
(float) @float
(float) @number.float
(integer) @number
(null) @constant
(setter) @function
@ -15,14 +15,14 @@
(get_body "get" @keyword.function)
(static_keyword) @type.qualifier
(tool_statement) @keyword
(breakpoint_statement) @debug
(breakpoint_statement) @keyword.debug
(inferred_type) @operator
[(true) (false)] @boolean
[
(get_node)
(node_path)
] @text.uri
] @string.special.url
(class_name_statement
(name) @type) @keyword
@ -44,14 +44,14 @@
(function_definition
(name) @function (parameters
(identifier) @parameter)*)
(identifier) @variable.parameter)*)
(typed_parameter (identifier) @parameter)
(default_parameter (identifier) @parameter)
(typed_parameter (identifier) @variable.parameter)
(default_parameter (identifier) @variable.parameter)
(call (identifier) @function.call)
(call (identifier) @include
(#any-of? @include "preload" "load"))
(call (identifier) @keyword.import
(#any-of? @keyword.import "preload" "load"))
;; Properties and Methods
@ -63,9 +63,9 @@
; Same question but for methods?
(class_definition
(body (function_definition (name) @method)))
(body (function_definition (name) @function.method)))
(attribute_call (identifier) @method.call)
(attribute_call (identifier) @function.method.call)
(attribute (_) (identifier) @property)
;; Enums
@ -90,9 +90,9 @@
["," "." ":"] @punctuation.delimiter
["if" "elif" "else" "match"] @conditional
["if" "elif" "else" "match"] @keyword.conditional
["for" "while" "break" "continue"] @repeat
["for" "while" "break" "continue"] @keyword.repeat
[
"~"