chore(tests): consistent captures

4 files changed, 113 insertions, 113 deletions

diff --git a/tests/query/highlights/t32/comments.cmm b/tests/query/highlights/t32/comments.cmm
index 0bab130f6..e36f7e63a 100644
--- a/tests/query/highlights/t32/comments.cmm
+++ b/tests/query/highlights/t32/comments.cmm
@@ -1,10 +1,10 @@
 // This is a comment
-; <- comment
+; <- @comment
 
 ; Another comment
-; <- comment
+; <- @comment
 
 ECHO &a // This is a trailing comment
-;       ^ comment
+;       ^ @comment
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/keywords.cmm b/tests/query/highlights/t32/keywords.cmm
index 21422438b..a4013d72f 100644
--- a/tests/query/highlights/t32/keywords.cmm
+++ b/tests/query/highlights/t32/keywords.cmm
@@ -1,123 +1,123 @@
 PRIVATE &password
-; <- keyword
-;        ^ variable.builtin
+; <- @keyword
+;        ^ @variable.builtin
 ENTRY &password
-; <- keyword
-;        ^ parameter
+; <- @keyword
+;        ^ @parameter
 
 ENTRY %LINE &salt
-; <- keyword
-;      ^ constant.builtin
-;            ^ parameter
+; <- @keyword
+;      ^ @constant.builtin
+;            ^ @parameter
 
 IF "&password"==""
-; <- conditional
-;  ^ string
-;    ^ variable.builtin
-;             ^ operator
+; <- @conditional
+;  ^ @string
+;    ^ @variable.builtin
+;             ^ @operator
 (
     ECHO "Failed to provide password."
     ENDDO
-;   ^ keyword.return
+;   ^ @keyword.return
 )
 ELSE
-; <- conditional
+; <- @conditional
 (
     PRIVATE &pass
 
     &pass=FALSE()
-;          ^ function.builtin
+;          ^ @function.builtin
     WHILE !&pass
-;         ^ operator
+;         ^ @operator
     (
         GOSUB verify_password "&password"
-;             ^ function.call
+;             ^ @function.call
         RETURNVALUES &pass
-;                     ^ parameter
+;                     ^ @parameter
         WAIT 10.ms
-;            ^ float
+;            ^ @float
     )
 
     IF !&pass
         GOTO fail
-;            ^ label
+;            ^ @label
     ELSE
     (
         GOSUB start_debug
-;             ^ function.call
+;             ^ @function.call
     )
 )
 
 LOCAL &num
-;      ^ variable.builtin
+;      ^ @variable.builtin
 
 &num = 2.
-;      ^ number
+;      ^ @number
 
 RePeaT &num PRINT "Password: &password"
-;       ^ variable.builtin
-;                             ^ variable.builtin
+;       ^ @variable.builtin
+;                             ^ @variable.builtin
 
 WinCLEAR
 FramePOS ,,,,Maximized
-;        ^ punctuation.delimiter
-;            ^ constant.builtin
+;        ^ @punctuation.delimiter
+;            ^ @constant.builtin
 WinPOS 0% 50% 100% 35%
-;      ^ float
+;      ^ @float
 COVerage.ListFunc
 
 ENDDO
 
 
 fail:
-; <- label
+; <- @label
     PRINT %ERROR "Password verification failed."
     END
-;   ^ keyword.return
+;   ^ @keyword.return
 
 
 verify_password:
-; <- function
+; <- @function
 (
     PARAMETERS &password
-;               ^ parameter
+;               ^ @parameter
 
     SYStem.Option.KEYCODE "&password"
     SYStem.JtagClock  1kHz
-;                     ^ float
+;                     ^ @float
     SYStem.Mode.Attach
 
     Data.Set N: EAXI:0x34000000 %Long 0x34000100 0x34000021 /verify
-;            ^ constant.builtin
-;               ^ constant.builtin
-;                    ^ number
-;                                ^ constant.builtin
-;                                     ^ number
-;                                                            ^ constant.builtin
+;            ^ @constant.builtin
+;               ^ @constant.builtin
+;                    ^ @number
+;                                ^ @constant.builtin
+;                                     ^ @number
+;                                                            ^ @constant.builtin
 
     RETURN TRUE()
-;   ^ keyword.return
+;   ^ @keyword.return
 )
 
 
 SUBROUTINE start_debug
-; <- keyword.function
-;          ^ function
+; <- @keyword.function
+;          ^ @function
 (
     COVerage.ListModule %MULTI.OBC \sieve
-;    ^ keyword
-;                        ^ constant.builtin
-;                                  ^ symbol
+;    ^ @keyword
+;                        ^ @constant.builtin
+;                                  ^ @symbol
 
     Var.DRAW flags[0..16] /Alternate 3
-;    ^ keyword
-;             ^ variable
-;                          ^ constant.builtin
-;                                    ^ number
+;    ^ @keyword
+;             ^ @variable
+;                          ^ @constant.builtin
+;                                    ^ @number
 
     Go main
     RETURN
-;   ^ keyword.return
+;   ^ @keyword.return
 )
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/literals.cmm b/tests/query/highlights/t32/literals.cmm
index 6c6849aea..8c63ce96d 100644
--- a/tests/query/highlights/t32/literals.cmm
+++ b/tests/query/highlights/t32/literals.cmm
@@ -1,39 +1,39 @@
 WinPOS ,,1000.,,,,myWatchWindow
-;        ^ number
+;        ^ @number
 
 PRinTer.OPEN "~~~/varwatch.txt" ASCIIE
-;            ^ string
+;            ^ @string
 
 sYmbol.NEW _InitialSP   0x34000100
-;                       ^ number
+;                       ^ @number
 
 DO ~~~~/test.cmm
-;  ^ string.special
+;  ^ @string.special
 
 WAIT 1.ns
-;    ^ float
+;    ^ @float
 
 SYStem.JtagClock  100.GHZ
-;                 ^ float
+;                 ^ @float
 
 DATA.SET P:&HEAD+0x4 %LONG DATA.LONG(EA:&HEAD+0x4)&0xFFFFFF
-;                                    ^ constant.builtin
+;                                    ^ @constant.builtin
 
 List `main`
-;    ^ symbol
+;    ^ @symbol
 
 &range = 'a'--'z'||'0'--'9'
-;        ^ character
-;           ^ operator
-;                       ^ character
+;        ^ @character
+;           ^ @operator
+;                       ^ @character
 
 Data.Set N: 0xffff800000 0y0011xx01xx&&a
-;        ^ constant.builtin
-;           ^ number
-;                        ^ number
-;                                    ^ operator
+;        ^ @constant.builtin
+;           ^ @number
+;                        ^ @number
+;                                    ^ @operator
 
 WinPOS 0% 85% 100% 15%
-;             ^ float
+;             ^ @float
 
 // vim: set ft=t32:
diff --git a/tests/query/highlights/t32/var.cmm b/tests/query/highlights/t32/var.cmm
index d77de90c8..de67278a0 100644
--- a/tests/query/highlights/t32/var.cmm
+++ b/tests/query/highlights/t32/var.cmm
@@ -1,7 +1,7 @@
 Var.NEWGLOBAL char[4][32] \myarr
-; <- keyword
-;             ^ type.builtin
-;                          ^ variable.builtin
+; <- @keyword
+;             ^ @type.builtin
+;                          ^ @variable.builtin
 LOCAL &i &data
 
 &data="zero|one|two|three"
@@ -12,64 +12,64 @@ WHILE &i<4
     PRIVATE &val
     &val=STRing.SPLIT("&data","|",&i)
     Var.Assign \myarr[&i]="&val"
-;              ^ variable.builtin
-;                        ^ operator
+;              ^ @variable.builtin
+;                        ^ @operator
     &i=&i+1.
 )
 
 Var.NEWLOCAL \x
-; <- keyword
-;             ^ variable.builtin
+; <- @keyword
+;             ^ @variable.builtin
 Var.set \x=func3(5,3)
-;       ^ variable.builtin
-;          ^ function.call
-;                ^ number
+;       ^ @variable.builtin
+;          ^ @function.call
+;                ^ @number
 PRINT Var.VALUE(\x)
-;               ^ variable.builtin
+;               ^ @variable.builtin
 PRINT Var.VALUE('a')
-;               ^ character
+;               ^ @character
 Var.Assign (*ap)[2..4] = &a
-;            ^ variable
-;                         ^ variable
+;            ^ @variable
+;                         ^ @variable
 Var.Assign sp = &s.n+offset
-;          ^ variable
-;                ^ variable
-;                  ^ field
-;                    ^ variable
+;          ^ @variable
+;                ^ @variable
+;                  ^ @field
+;                    ^ @variable
 Var.Assign padd = (CAddition const * volatile)&d
-;          ^ variable
-;                  ^ type
-;                            ^ type.qualifier
-;                                    ^ type.qualifier
-;                                              ^ variable
+;          ^ @variable
+;                  ^ @type
+;                            ^ @type.qualifier
+;                                    ^ @type.qualifier
+;                                              ^ @variable
 Var.Assign e1 = (enum e2)&e
-;          ^ variable
-;                ^ keyword
-;                     ^ type
-;                         ^ variable
+;          ^ @variable
+;                ^ @keyword
+;                     ^ @type
+;                         ^ @variable
 Var.Assign *vector = (struct Vector3d*)&acceleration
-;           ^ variable
-;                     ^ keyword
-;                            ^ type
-;                                       ^ variable
+;           ^ @variable
+;                     ^ @keyword
+;                            ^ @type
+;                                       ^ @variable
 Var.Assign z = (union foo)x
-;          ^ variable
-;               ^ keyword
-;                     ^ type
-;                         ^ variable
+;          ^ @variable
+;               ^ @keyword
+;                     ^ @type
+;                         ^ @variable
 Var.Assign b = -a
-;          ^ variable
-;               ^ variable
+;          ^ @variable
+;               ^ @variable
 Var.Assign c = i++
-;          ^ variable
-;              ^ variable
+;          ^ @variable
+;              ^ @variable
 Var.Assign d = sizeof(int)
-;          ^ variable
-;              ^ keyword.operator
-;                     ^ type.builtin
+;          ^ @variable
+;              ^ @keyword.operator
+;                     ^ @type.builtin
 Var.call strcmp(key,buffer)
-;        ^ function.call
-;               ^ variable
-;                   ^ variable
+;        ^ @function.call
+;               ^ @variable
+;                   ^ @variable
 
 // vim: set ft=t32: