aboutsummaryrefslogtreecommitdiffstats
path: root/queries/erlang
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/erlang
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/erlang')
-rw-r--r--queries/erlang/highlights.scm28
1 files changed, 14 insertions, 14 deletions
diff --git a/queries/erlang/highlights.scm b/queries/erlang/highlights.scm
index 0c129e23f..da0d1e600 100644
--- a/queries/erlang/highlights.scm
+++ b/queries/erlang/highlights.scm
@@ -3,7 +3,7 @@
(char) @character
(integer) @number
-(float) @float
+(float) @number.float
(comment) @comment @spell
@@ -70,12 +70,12 @@
"end"
"maybe"
"else"
-] @conditional
+] @keyword.conditional
[
"catch"
"try"
-] @exception
+] @keyword.exception
((atom) @boolean (#any-of? @boolean "true" "false"))
@@ -86,26 +86,26 @@
(pp_define
lhs: _ @constant.macro (#set! "priority" 101)
)
-(_preprocessor_directive) @preproc (#set! "priority" 99)
+(_preprocessor_directive) @keyword.directive (#set! "priority" 99)
;; Attributes
-(pp_include) @include
-(pp_include_lib) @include
-(export_attribute) @include
+(pp_include) @keyword.import
+(pp_include_lib) @keyword.import
+(export_attribute) @keyword.import
(export_type_attribute) @type.definition
(export_type_attribute types: (fa fun: _ @type (#set! "priority" 101)))
-(behaviour_attribute) @include
-(module_attribute (atom) @namespace) @include
+(behaviour_attribute) @keyword.import
+(module_attribute (atom) @module) @keyword.import
(wild_attribute name: (attr_name name: _ @attribute)) @attribute
;; Records
(record_expr) @type
-(record_field_expr _ @field) @type
-(record_field_name _ @field) @type
+(record_field_expr _ @variable.member) @type
+(record_field_name _ @variable.member) @type
(record_name "#" @type name: _ @type) @type
(record_decl name: _ @type) @type.definition
-(record_field name: _ @field)
-(record_field name: _ @field ty: _ @type)
+(record_field name: _ @variable.member)
+(record_field name: _ @variable.member ty: _ @type)
;; Type alias
(type_alias name: _ @type) @type.definition
@@ -115,7 +115,7 @@
;;; expr_function_call
(call expr: [(atom) (remote) (var)] @function)
-(call (atom) @exception (#any-of? @exception "error" "throw" "exit"))
+(call (atom) @keyword.exception (#any-of? @keyword.exception "error" "throw" "exit"))
;;; Parenthesized expression: (SomeFunc)(), only highlight the parens
(call