aboutsummaryrefslogtreecommitdiffstats
path: root/queries
diff options
context:
space:
mode:
authorBenny Powers <web@bennypowers.com>2023-03-18 21:59:44 +0200
committerAmaan Qureshi <amaanq12@gmail.com>2023-03-19 08:20:16 -0400
commitf15db0b652e44c6233d05099eaa7ad4eeea095fc (patch)
tree07899117542350b5f808ac73d40a0e7d7650ac87 /queries
parentfix(ecma): template literal injections (diff)
downloadnvim-treesitter-f15db0b652e44c6233d05099eaa7ad4eeea095fc.tar
nvim-treesitter-f15db0b652e44c6233d05099eaa7ad4eeea095fc.tar.gz
nvim-treesitter-f15db0b652e44c6233d05099eaa7ad4eeea095fc.tar.bz2
nvim-treesitter-f15db0b652e44c6233d05099eaa7ad4eeea095fc.tar.lz
nvim-treesitter-f15db0b652e44c6233d05099eaa7ad4eeea095fc.tar.xz
nvim-treesitter-f15db0b652e44c6233d05099eaa7ad4eeea095fc.tar.zst
nvim-treesitter-f15db0b652e44c6233d05099eaa7ad4eeea095fc.zip
style: alternation in template literal query
Diffstat (limited to 'queries')
-rw-r--r--queries/ecma/injections.scm35
1 files changed, 18 insertions, 17 deletions
diff --git a/queries/ecma/injections.scm b/queries/ecma/injections.scm
index 7ea48dec4..ef3b9ba72 100644
--- a/queries/ecma/injections.scm
+++ b/queries/ecma/injections.scm
@@ -3,26 +3,27 @@
(comment) @comment
-; html(`...`), sql(...) etc
-(call_expression
- function: ((identifier) @language)
- arguments: (arguments
- (template_string) @content
- (#offset! @content 0 1 0 -1))
-)
-
-; html`...`, sql`...` etc
-(call_expression
+; html(`...`), html`...`, sql(...) etc
+(call_expression
function: ((identifier) @language)
- arguments: ((template_string) @content
- (#offset! @content 0 1 0 -1))
-)
+ arguments: [
+ (arguments
+ (template_string) @content)
+ (template_string) @content
+ ]
+ (#offset! @content 0 1 0 -1)
+ (#not-eq? @content "svg"))
-; svg`...`, which uses the html parser
+; svg`...` or svg(`...`), which uses the html parser, so is not included in the previous query
(call_expression
- function: ((identifier) @_name (#eq? @_name "svg"))
- arguments: ((template_string) @html
- (#offset! @html 0 1 0 -1)))
+ function: ((identifier) @svg)
+ arguments: [
+ (arguments
+ (template_string) @content)
+ (template_string) @content
+ ]
+ (#offset! @content 0 1 0 -1)
+ (#eq? @content "svg"))
(call_expression
function: ((identifier) @_name