@@ -25,11 +25,11 @@
2525 arguments: (arguments (raw_string_literal) @injection.content)
2626 (#set! injection.language "regex"))
2727
28−; Highlight SQL in `sqlx::query!()`
28+; Highlight SQL in `sqlx::query!()`, `sqlx::query_scalar!()`, and `sqlx::query_scalar_unchecked!()`
2929(macro_invocation
3030 macro: (scoped_identifier
3131 path: (identifier) @_sqlx (#eq? @_sqlx "sqlx")
32− name: (identifier) @_query (#eq? @_query "query"))
32+ name: (identifier) @_query (#match? @_query "^query(_scalar|_scalar_unchecked)?$"))
3333 (token_tree
3434 ; Only the first argument is SQL
3535 .
@@ -37,38 +37,11 @@
3737 )
3838 (#set! injection.language "sql"))
3939
40−; Highlight SQL in `sqlx::query_as!()`
40+; Highlight SQL in `sqlx::query_as!()` and `sqlx::query_as_unchecked!()`
4141(macro_invocation
4242 macro: (scoped_identifier
4343 path: (identifier) @_sqlx (#eq? @_sqlx "sqlx")
44− name: (identifier) @_query_as (#eq? @_query_as "query_as"))
45− (token_tree
46− ; Only the second argument is SQL
47− .
48− ; Allow anything as the first argument in case the user has lower case type
49− ; names for some reason
50− (_)
51− [(string_literal) (raw_string_literal)] @injection.content
52− )
53− (#set! injection.language "sql"))
54−
55−; Highlight SQL in `sqlx::query_unchecked!()`
56−(macro_invocation
57− macro: (scoped_identifier
58− path: (identifier) @_sqlx (#eq? @_sqlx "sqlx")
59− name: (identifier) @_query_as (#eq? @_query_as "query_unchecked"))
60− (token_tree
61− ; Only the first argument is SQL
62− .
63− [(string_literal) (raw_string_literal)] @injection.content
64− )
65− (#set! injection.language "sql"))
66−
67−; Highlight SQL in `sqlx::query_as_unchecked!()`
68−(macro_invocation
69− macro: (scoped_identifier
70− path: (identifier) @_sqlx (#eq? @_sqlx "sqlx")
71− name: (identifier) @_query_as (#eq? @_query_as "query_as_unchecked"))
44+ name: (identifier) @_query_as (#match? @_query_as "^query_as(_unchecked)?$"))
7245 (token_tree
7346 ; Only the second argument is SQL
7447 .