Skip to content

Commit 0b28ab8

Browse files
committed
simplify injection query
1 parent 68d08e0 commit 0b28ab8

File tree

2 files changed

+7
-34
lines changed

2 files changed

+7
-34
lines changed

grammar.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ module.exports = grammar({
8686
[$._record_field_name, $.record_pattern],
8787
[$.decorator],
8888
[$._statement, $._one_or_more_statements],
89-
[$.extension_expression],
9089
[$._inline_type, $.function_type_parameters],
9190
[$.primary_expression, $.parameter, $._pattern],
9291
[$.parameter, $._pattern],
@@ -1135,7 +1134,7 @@ module.exports = grammar({
11351134
))
11361135
)),
11371136

1138-
extension_expression: $ => prec('call', seq(
1137+
extension_expression: $ => prec.right(seq(
11391138
repeat1('%'),
11401139
$.extension_identifier,
11411140
optional(

queries/injections.scm

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,21 @@
11
(comment) @comment
22

3-
; %re("")
3+
; %re
44
(extension_expression
55
(extension_identifier) @_name
66
(#eq? @_name "re")
7-
(expression_statement (string) @regex))
7+
(expression_statement (_) @regex))
88

9-
; %re(``)
10-
(extension_expression
11-
(extension_identifier) @_name
12-
(#eq? @_name "re")
13-
(expression_statement
14-
(template_string
15-
(template_string_content) @regex)))
16-
17-
; %raw("") or %%raw("")
18-
(extension_expression
19-
(extension_identifier) @_name
20-
(#eq? @_name "raw")
21-
(expression_statement
22-
(string
23-
(string_fragment) @javascript)))
24-
25-
; %raw(``) or %%raw(``)
9+
; %raw
2610
(extension_expression
2711
(extension_identifier) @_name
2812
(#eq? @_name "raw")
2913
(expression_statement
30-
(template_string
31-
(template_string_content) @javascript)))
14+
(_ (_) @javascript)))
3215

33-
; %graphql``
16+
; %graphql
3417
(extension_expression
3518
(extension_identifier) @_name
3619
(#eq? @_name "graphql")
3720
(expression_statement
38-
(string
39-
(string_fragment) @graphql)))
40-
41-
; %graphql""
42-
(extension_expression
43-
(extension_identifier) @_name
44-
(#eq? @_name "graphql")
45-
(expression_statement
46-
(string
47-
(string_fragment) @graphql)))
21+
(_ (_) @graphql)))

0 commit comments

Comments
 (0)