aboutsummaryrefslogtreecommitdiffstats
path: root/queries/pascal/highlights.scm
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/pascal/highlights.scm
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/pascal/highlights.scm')
-rw-r--r--queries/pascal/highlights.scm24
1 files changed, 12 insertions, 12 deletions
diff --git a/queries/pascal/highlights.scm b/queries/pascal/highlights.scm
index e11e0eaa2..088465545 100644
--- a/queries/pascal/highlights.scm
+++ b/queries/pascal/highlights.scm
@@ -72,13 +72,13 @@
(kWhile)
(kRepeat)
(kUntil)
-] @repeat
+] @keyword.repeat
[
(kIf)
(kThen)
(kElse)
-] @conditional
+] @keyword.conditional
[
(kPublished)
@@ -95,9 +95,9 @@
(kPacked)
(kAbsolute)
-] @storageclass
+] @keyword.storage
-(kUses) @include
+(kUses) @keyword.import
; -- Attributes
@@ -278,7 +278,7 @@
(comment) @comment.documentation
. (declVar))
-(pp) @preproc
+(pp) @keyword.directive
; -- Type declaration
@@ -304,11 +304,11 @@
; -- Function parameters
-(declArg name: (identifier) @parameter)
+(declArg name: (identifier) @variable.parameter)
; -- Template parameters
-(genericArg name: (identifier) @parameter)
+(genericArg name: (identifier) @variable.parameter)
(genericArg type: (typeref) @type)
(declProc name: (genericDot lhs: (identifier) @type))
@@ -322,7 +322,7 @@
; -- Exception parameters
-(exceptionHandler variable: (identifier) @parameter)
+(exceptionHandler variable: (identifier) @variable.parameter)
; -- Type usage
@@ -394,10 +394,10 @@
(#lua-match? @keyword.return "^[eE][xX][iI][tT]$")))
(statement (exprCall entity: ((identifier) @keyword.return
(#lua-match? @keyword.return "^[eE][xX][iI][tT]$"))))
-(statement ((identifier) @repeat
- (#lua-match? @repeat "^[bB][rR][eE][aA][kK]$")))
-(statement ((identifier) @repeat
- (#lua-match? @repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
+(statement ((identifier) @keyword.repeat
+ (#lua-match? @keyword.repeat "^[bB][rR][eE][aA][kK]$")))
+(statement ((identifier) @keyword.repeat
+ (#lua-match? @keyword.repeat "^[cC][oO][nN][tT][iI][nN][uU][eE]$")))
; -- Identifier type inference