aboutsummaryrefslogtreecommitdiffstats
path: root/queries/perl
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/perl
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/perl')
-rw-r--r--queries/perl/highlights.scm24
1 files changed, 12 insertions, 12 deletions
diff --git a/queries/perl/highlights.scm b/queries/perl/highlights.scm
index e3aa0b2bb..7a0c4e530 100644
--- a/queries/perl/highlights.scm
+++ b/queries/perl/highlights.scm
@@ -1,13 +1,13 @@
-((source_file . (comment) @preproc)
- (#lua-match? @preproc "^#!/"))
+((source_file . (comment) @keyword.directive)
+ (#lua-match? @keyword.directive "^#!/"))
-[ "use" "no" "require" ] @include
+[ "use" "no" "require" ] @keyword.import
-[ "if" "elsif" "unless" "else" ] @conditional
+[ "if" "elsif" "unless" "else" ] @keyword.conditional
-(conditional_expression [ "?" ":" ] @conditional.ternary)
+(conditional_expression [ "?" ":" ] @keyword.conditional.ternary)
-[ "while" "until" "for" "foreach" ] @repeat
+[ "while" "until" "for" "foreach" ] @keyword.repeat
"return" @keyword.return
@@ -15,7 +15,7 @@
[ "map" "grep" "sort" ] @function.builtin
-"package" @include
+"package" @keyword.import
[
"do"
@@ -27,7 +27,7 @@
(_ operator: _ @operator)
"\\" @operator
-(yadayada) @exception
+(yadayada) @keyword.exception
(phaser_statement phase: _ @keyword.phaser)
@@ -37,10 +37,10 @@
"isa"
] @keyword.operator
-(eof_marker) @preproc
+(eof_marker) @keyword.directive
(data_section) @comment
-(pod) @text
+(pod) @none
[
(number)
@@ -70,7 +70,7 @@
(quoted_regexp)
(match_regexp)
(regexp_content)
-] @string.regex
+] @string.regexp
(autoquoted_bareword) @string.special
@@ -89,7 +89,7 @@
(relational_expression operator: "isa" right: (bareword) @type)
(function_call_expression (function) @function.call)
-(method_call_expression (method) @method.call)
+(method_call_expression (method) @function.method.call)
(method_call_expression invocant: (bareword) @type)
(func0op_call_expression function: _ @function.builtin)