aboutsummaryrefslogtreecommitdiffstats
path: root/queries/gdscript
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/gdscript
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/gdscript')
-rw-r--r--queries/gdscript/highlights.scm24
1 files changed, 12 insertions, 12 deletions
diff --git a/queries/gdscript/highlights.scm b/queries/gdscript/highlights.scm
index 535dcd009..1b4edbc7e 100644
--- a/queries/gdscript/highlights.scm
+++ b/queries/gdscript/highlights.scm
@@ -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
[
"~"