jenterkin/tree-sitter-jhcl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow empty templates and template interpolations

Browse Source
This commit is contained in:
mhoffm
2021-06-27 13:54:05 +02:00
parent 13acf1bcc7
commit 6c5f3eba28
5 changed files with 10369 additions and 10289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
grammar.js
View File

@@ -269,22 +269,22 @@ module.exports = grammar({
quoted_template: $ => prec(PREC.quoted_template, seq(
$._quoted_template_start,
repeat(choice(
optional(repeat(choice(
$.template_literal,
$.template_interpolation,
$.template_directive,
)),
))),
$._quoted_template_end,
)),
heredoc_template: $ => seq(
$.heredoc_start,
$.heredoc_identifier,
repeat(choice(
optional(repeat(choice(
$.template_literal,
$.template_interpolation,
$.template_directive,
)),
))),
$.heredoc_identifier,
),
@@ -299,7 +299,7 @@ module.exports = grammar({
template_interpolation: $ => seq(
$._template_interpolation_start,
optional($.strip_marker),
$.expression,
optional($.expression),
optional($.strip_marker),
$._template_interpolation_end,
),

96
src/grammar.json
View File

@@ -1182,24 +1182,32 @@
"name": "_quoted_template_start"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "template_interpolation"
},
{
"type": "SYMBOL",
"name": "template_directive"
"type": "CHOICE",
"members": [
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "template_interpolation"
},
{
"type": "SYMBOL",
"name": "template_directive"
}
]
}
]
}
},
{
"type": "BLANK"
}
]
},
{
"type": "SYMBOL",
@@ -1220,24 +1228,32 @@
"name": "heredoc_identifier"
},
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "template_interpolation"
},
{
"type": "SYMBOL",
"name": "template_directive"
"type": "CHOICE",
"members": [
{
"type": "REPEAT",
"content": {
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "template_literal"
},
{
"type": "SYMBOL",
"name": "template_interpolation"
},
{
"type": "SYMBOL",
"name": "template_directive"
}
]
}
]
}
},
{
"type": "BLANK"
}
]
},
{
"type": "SYMBOL",
@@ -1293,8 +1309,16 @@
]
},
{
"type": "SYMBOL",
"name": "expression"
"type": "CHOICE",
"members": [
{
"type": "SYMBOL",
"name": "expression"
},
{
"type": "BLANK"
}
]
},
{
"type": "CHOICE",

2
src/node-types.json
View File

@@ -669,7 +669,7 @@
"fields": {},
"children": {
"multiple": true,
"required": true,
"required": false,
"types": [
{
"type": "expression",

20533
src/parser.c
View File

File diff suppressed because it is too large Load Diff

17
test/corpus/templates.txt
View File

@@ -20,6 +20,23 @@ foo = "${ var.bar }"
(get_attr
(identifier))))))))))
================================================================================
empty template
================================================================================
foo = "${}"
--------------------------------------------------------------------------------
(config_file
(body
(attribute
(identifier)
(expression
(template_expr
(quoted_template
(template_interpolation)))))))
================================================================================
quoted template expression with escaped strings and fake strip marker
================================================================================