aboutsummaryrefslogtreecommitdiffstats
path: root/queries/v
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2023-12-24 10:00:20 +0100
committerChristian Clason <c.clason@uni-graz.at>2024-01-19 16:58:37 +0100
commit1ae9b0e4558fe7868f8cda2db65239cfb14836d0 (patch)
tree4eea14b40b8b81d9388fb35cbc9e35b341a75c98 /queries/v
parentchore(tests): consistent captures (diff)
downloadnvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.gz
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.bz2
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.lz
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.xz
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.tar.zst
nvim-treesitter-1ae9b0e4558fe7868f8cda2db65239cfb14836d0.zip
feat!: align standard captures with upstream
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" (https://github.com/tree-sitter/tree-sitter/blob/3f44b896852eb7daaa6df4fb778c9bb52c70c815/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`
Diffstat (limited to 'queries/v')
-rw-r--r--queries/v/highlights.scm30
1 files changed, 15 insertions, 15 deletions
diff --git a/queries/v/highlights.scm b/queries/v/highlights.scm
index dbf059d8f..221b05028 100644
--- a/queries/v/highlights.scm
+++ b/queries/v/highlights.scm
@@ -3,7 +3,7 @@
[
"import"
"module"
-] @include
+] @keyword.import
; Keywords
@@ -38,14 +38,14 @@
"else"
"$else"
"select"
-] @conditional
+] @keyword.conditional
[
"for"
"$for"
"continue"
"break"
-] @repeat
+] @keyword.repeat
"fn" @keyword.function
@@ -56,7 +56,7 @@
"shared"
"static"
"const"
-] @storageclass
+] @keyword.storage
[
"pub"
@@ -77,13 +77,13 @@
; Namespace
(module_clause
- (identifier) @namespace)
+ (identifier) @module)
(import_path
- (import_name) @namespace)
+ (import_name) @module)
(import_alias
- (import_name) @namespace)
+ (import_name) @module)
; Literals
@@ -115,20 +115,20 @@
; Fields
-(selector_expression field: (reference_expression (identifier) @field))
+(selector_expression field: (reference_expression (identifier) @variable.member))
-(field_name) @field
+(field_name) @variable.member
(struct_field_declaration
- name: (identifier) @field)
+ name: (identifier) @variable.member)
; Parameters
(parameter_declaration
- name: (identifier) @parameter)
+ name: (identifier) @variable.parameter)
(receiver
- name: (identifier) @parameter)
+ name: (identifier) @variable.parameter)
; Constants
@@ -158,11 +158,11 @@
(function_declaration
receiver: (receiver)
- name: (identifier) @method)
+ name: (identifier) @function.method)
(call_expression
name: (selector_expression
- field: (reference_expression) @method.call))
+ field: (reference_expression) @function.method.call))
(call_expression
name: (reference_expression) @function.call)
@@ -428,7 +428,7 @@
(int_literal) @number
-(float_literal) @float
+(float_literal) @number.float
[
(c_string_literal)