aboutsummaryrefslogtreecommitdiffstats
path: root/tests/query/highlights/tiger
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 /tests/query/highlights/tiger
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 'tests/query/highlights/tiger')
-rw-r--r--tests/query/highlights/tiger/functions.tig4
-rw-r--r--tests/query/highlights/tiger/identifiers.tig4
-rw-r--r--tests/query/highlights/tiger/imports.tig4
-rw-r--r--tests/query/highlights/tiger/keywords.tig12
-rw-r--r--tests/query/highlights/tiger/object-oriented.tig4
5 files changed, 14 insertions, 14 deletions
diff --git a/tests/query/highlights/tiger/functions.tig b/tests/query/highlights/tiger/functions.tig
index 6505d20fe..706f1991a 100644
--- a/tests/query/highlights/tiger/functions.tig
+++ b/tests/query/highlights/tiger/functions.tig
@@ -1,9 +1,9 @@
primitive print(s: string)
/* ^ @function */
-/* ^ @parameter */
+/* ^ @variable.parameter */
function func(a: int) : int = (print("Hello World!"); a)
/* ^ @function */
-/* ^ @parameter */
+/* ^ @variable.parameter */
/* ^ @function.builtin */
/* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/identifiers.tig b/tests/query/highlights/tiger/identifiers.tig
index e712e57de..e38749071 100644
--- a/tests/query/highlights/tiger/identifiers.tig
+++ b/tests/query/highlights/tiger/identifiers.tig
@@ -22,9 +22,9 @@ var array := int_array[12] of 27;
/* ^ @type */
primitive func(a: int, b: string) : array
-/* ^ @parameter */
+/* ^ @variable.parameter */
/* ^ @type.builtin */
-/* ^ @parameter */
+/* ^ @variable.parameter */
/* ^ @type.builtin */
/* ^ @type */
/* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/imports.tig b/tests/query/highlights/tiger/imports.tig
index f20a0bc1a..1c7ce308d 100644
--- a/tests/query/highlights/tiger/imports.tig
+++ b/tests/query/highlights/tiger/imports.tig
@@ -1,4 +1,4 @@
import "lib.tih"
-/* <- @include */
-/* ^ @string.special */
+/* <- @keyword.import */
+/* ^ @string.special.path */
/* vim: set ft=tiger: */
diff --git a/tests/query/highlights/tiger/keywords.tig b/tests/query/highlights/tiger/keywords.tig
index 7deb0288d..c92cd929a 100644
--- a/tests/query/highlights/tiger/keywords.tig
+++ b/tests/query/highlights/tiger/keywords.tig
@@ -10,7 +10,7 @@ let
/* <- @keyword.function */
import "lib.tih"
- /* <- @include */
+ /* <- @keyword.import */
type array_of_int = array of int
/* <- @keyword */
@@ -28,13 +28,13 @@ in
/* ^ @keyword */
for i := 12 to 27 do 42;
- /* <- @repeat */
- /* ^ @repeat */
- /* ^ @repeat */
+ /* <- @keyword.repeat */
+ /* ^ @keyword.repeat */
+ /* ^ @keyword.repeat */
while 12 do break
- /* <- @repeat */
- /* ^ @repeat */
+ /* <- @keyword.repeat */
+ /* ^ @keyword.repeat */
/* ^ @keyword */
end
diff --git a/tests/query/highlights/tiger/object-oriented.tig b/tests/query/highlights/tiger/object-oriented.tig
index 607efec8c..bf1632485 100644
--- a/tests/query/highlights/tiger/object-oriented.tig
+++ b/tests/query/highlights/tiger/object-oriented.tig
@@ -13,7 +13,7 @@ let
method meth() : int = self.a
/* <- @keyword.function */
- /* ^ @method */
+ /* ^ @function.method */
/* ^ @variable.builtin */
}
@@ -24,6 +24,6 @@ in
/* ^ @property */
object.meth()
- /* ^ @method */
+ /* ^ @function.method */
end
/* vim: set ft=tiger: */