diff --git a/CHANGELOG.md b/CHANGELOG.md index 03a5326..370391f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.4.0 - not yet released + +feature: +* add named "key" and "val" fields to left and right side of object elements +* unhide the `template_interpolation_(start|end)` and `quoted_template_(start|end)` tokens + ## 0.3.2 - 2021-07-01 fix: diff --git a/example/example.hcl b/example/example.hcl index a203e2a..048a113 100644 --- a/example/example.hcl +++ b/example/example.hcl @@ -8,7 +8,7 @@ resource_1 "strlit1" "strlit2" { attr1 = "val1" tupl1 = [ 1, 2, 3.4, "foo" ] tupl2 = [] - obj1 = { foo = "baz" } + obj1 = { foo = "bar", baz = quoz } null1 = null bool1 = true bool2 = false @@ -28,15 +28,18 @@ resource_1 "strlit1" "strlit2" { tpl1 = "prefix-${var.bar}" tpl2 = "prefix-${func("bar")}" tpl3 = "prefix-${func("nested-${var.bar}")}" + tpl4 = < [ - $._quoted_template_start, - $._quoted_template_end, + $.quoted_template_start, + $.quoted_template_end, $._template_literal_chunk, - $._template_interpolation_start, - $._template_interpolation_end, + $.template_interpolation_start, + $.template_interpolation_end, $.heredoc_identifier, ], @@ -105,9 +105,9 @@ module.exports = grammar({ null_lit: $ => 'null', string_lit: $ => prec(PREC.string_lit, seq( - $._quoted_template_start, + $.quoted_template_start, $.template_literal, - $._quoted_template_end, + $.quoted_template_end, )), @@ -155,9 +155,9 @@ module.exports = grammar({ ), object_elem: $ => seq( - $.expression, + field("key", $.expression), choice('=', ':'), - $.expression, + field("val", $.expression), ), index: $ => choice($.new_index, $.legacy_index), @@ -268,13 +268,13 @@ module.exports = grammar({ ), quoted_template: $ => prec(PREC.quoted_template, seq( - $._quoted_template_start, + $.quoted_template_start, optional(repeat(choice( $.template_literal, $.template_interpolation, $.template_directive, ))), - $._quoted_template_end, + $.quoted_template_end, )), heredoc_template: $ => seq( @@ -297,11 +297,11 @@ module.exports = grammar({ )), template_interpolation: $ => seq( - $._template_interpolation_start, + $.template_interpolation_start, optional($.strip_marker), optional($.expression), optional($.strip_marker), - $._template_interpolation_end, + $.template_interpolation_end, ), // TODO diff --git a/src/grammar.json b/src/grammar.json index 814aa43..17a57c2 100644 --- a/src/grammar.json +++ b/src/grammar.json @@ -310,7 +310,7 @@ "members": [ { "type": "SYMBOL", - "name": "_quoted_template_start" + "name": "quoted_template_start" }, { "type": "SYMBOL", @@ -318,7 +318,7 @@ }, { "type": "SYMBOL", - "name": "_quoted_template_end" + "name": "quoted_template_end" } ] } @@ -492,8 +492,12 @@ "type": "SEQ", "members": [ { - "type": "SYMBOL", - "name": "expression" + "type": "FIELD", + "name": "key", + "content": { + "type": "SYMBOL", + "name": "expression" + } }, { "type": "CHOICE", @@ -509,8 +513,12 @@ ] }, { - "type": "SYMBOL", - "name": "expression" + "type": "FIELD", + "name": "val", + "content": { + "type": "SYMBOL", + "name": "expression" + } } ] }, @@ -1179,7 +1187,7 @@ "members": [ { "type": "SYMBOL", - "name": "_quoted_template_start" + "name": "quoted_template_start" }, { "type": "CHOICE", @@ -1211,7 +1219,7 @@ }, { "type": "SYMBOL", - "name": "_quoted_template_end" + "name": "quoted_template_end" } ] } @@ -1294,7 +1302,7 @@ "members": [ { "type": "SYMBOL", - "name": "_template_interpolation_start" + "name": "template_interpolation_start" }, { "type": "CHOICE", @@ -1334,7 +1342,7 @@ }, { "type": "SYMBOL", - "name": "_template_interpolation_end" + "name": "template_interpolation_end" } ] }, @@ -1416,11 +1424,11 @@ "externals": [ { "type": "SYMBOL", - "name": "_quoted_template_start" + "name": "quoted_template_start" }, { "type": "SYMBOL", - "name": "_quoted_template_end" + "name": "quoted_template_end" }, { "type": "SYMBOL", @@ -1428,11 +1436,11 @@ }, { "type": "SYMBOL", - "name": "_template_interpolation_start" + "name": "template_interpolation_start" }, { "type": "SYMBOL", - "name": "_template_interpolation_end" + "name": "template_interpolation_end" }, { "type": "SYMBOL", diff --git a/src/node-types.json b/src/node-types.json index 60a71e1..80ec2d4 100644 --- a/src/node-types.json +++ b/src/node-types.json @@ -551,16 +551,27 @@ { "type": "object_elem", "named": true, - "fields": {}, - "children": { - "multiple": true, - "required": true, - "types": [ - { - "type": "expression", - "named": true - } - ] + "fields": { + "key": { + "multiple": false, + "required": true, + "types": [ + { + "type": "expression", + "named": true + } + ] + }, + "val": { + "multiple": false, + "required": true, + "types": [ + { + "type": "expression", + "named": true + } + ] + } } }, { @@ -588,8 +599,16 @@ "fields": {}, "children": { "multiple": true, - "required": false, + "required": true, "types": [ + { + "type": "quoted_template_end", + "named": true + }, + { + "type": "quoted_template_start", + "named": true + }, { "type": "template_directive", "named": true @@ -629,9 +648,17 @@ "named": true, "fields": {}, "children": { - "multiple": false, + "multiple": true, "required": true, "types": [ + { + "type": "quoted_template_end", + "named": true + }, + { + "type": "quoted_template_start", + "named": true + }, { "type": "template_literal", "named": true @@ -669,7 +696,7 @@ "fields": {}, "children": { "multiple": true, - "required": false, + "required": true, "types": [ { "type": "expression", @@ -678,6 +705,14 @@ { "type": "strip_marker", "named": true + }, + { + "type": "template_interpolation_end", + "named": true + }, + { + "type": "template_interpolation_start", + "named": true } ] } @@ -916,10 +951,26 @@ "type": "null_lit", "named": true }, + { + "type": "quoted_template_end", + "named": true + }, + { + "type": "quoted_template_start", + "named": true + }, { "type": "strip_marker", "named": true }, + { + "type": "template_interpolation_end", + "named": true + }, + { + "type": "template_interpolation_start", + "named": true + }, { "type": "true", "named": false diff --git a/src/parser.c b/src/parser.c index 0ebfe45..b0c1136 100644 --- a/src/parser.c +++ b/src/parser.c @@ -12,9 +12,9 @@ #define ALIAS_COUNT 0 #define TOKEN_COUNT 51 #define EXTERNAL_TOKEN_COUNT 6 -#define FIELD_COUNT 0 +#define FIELD_COUNT 2 #define MAX_ALIAS_SEQUENCE_LENGTH 8 -#define PRODUCTION_ID_COUNT 1 +#define PRODUCTION_ID_COUNT 2 enum { anon_sym_EQ = 1, @@ -61,11 +61,11 @@ enum { sym_strip_marker = 42, sym_comment = 43, sym__whitespace = 44, - sym__quoted_template_start = 45, - sym__quoted_template_end = 46, + sym_quoted_template_start = 45, + sym_quoted_template_end = 46, sym__template_literal_chunk = 47, - sym__template_interpolation_start = 48, - sym__template_interpolation_end = 49, + sym_template_interpolation_start = 48, + sym_template_interpolation_end = 49, sym_heredoc_identifier = 50, sym_config_file = 51, sym_body = 52, @@ -173,11 +173,11 @@ static const char * const ts_symbol_names[] = { [sym_strip_marker] = "strip_marker", [sym_comment] = "comment", [sym__whitespace] = "_whitespace", - [sym__quoted_template_start] = "_quoted_template_start", - [sym__quoted_template_end] = "_quoted_template_end", + [sym_quoted_template_start] = "quoted_template_start", + [sym_quoted_template_end] = "quoted_template_end", [sym__template_literal_chunk] = "_template_literal_chunk", - [sym__template_interpolation_start] = "_template_interpolation_start", - [sym__template_interpolation_end] = "_template_interpolation_end", + [sym_template_interpolation_start] = "template_interpolation_start", + [sym_template_interpolation_end] = "template_interpolation_end", [sym_heredoc_identifier] = "heredoc_identifier", [sym_config_file] = "config_file", [sym_body] = "body", @@ -285,11 +285,11 @@ static const TSSymbol ts_symbol_map[] = { [sym_strip_marker] = sym_strip_marker, [sym_comment] = sym_comment, [sym__whitespace] = sym__whitespace, - [sym__quoted_template_start] = sym__quoted_template_start, - [sym__quoted_template_end] = sym__quoted_template_end, + [sym_quoted_template_start] = sym_quoted_template_start, + [sym_quoted_template_end] = sym_quoted_template_end, [sym__template_literal_chunk] = sym__template_literal_chunk, - [sym__template_interpolation_start] = sym__template_interpolation_start, - [sym__template_interpolation_end] = sym__template_interpolation_end, + [sym_template_interpolation_start] = sym_template_interpolation_start, + [sym_template_interpolation_end] = sym_template_interpolation_end, [sym_heredoc_identifier] = sym_heredoc_identifier, [sym_config_file] = sym_config_file, [sym_body] = sym_body, @@ -532,24 +532,24 @@ static const TSSymbolMetadata ts_symbol_metadata[] = { .visible = false, .named = true, }, - [sym__quoted_template_start] = { - .visible = false, + [sym_quoted_template_start] = { + .visible = true, .named = true, }, - [sym__quoted_template_end] = { - .visible = false, + [sym_quoted_template_end] = { + .visible = true, .named = true, }, [sym__template_literal_chunk] = { .visible = false, .named = true, }, - [sym__template_interpolation_start] = { - .visible = false, + [sym_template_interpolation_start] = { + .visible = true, .named = true, }, - [sym__template_interpolation_end] = { - .visible = false, + [sym_template_interpolation_end] = { + .visible = true, .named = true, }, [sym_heredoc_identifier] = { @@ -790,6 +790,27 @@ static const TSSymbolMetadata ts_symbol_metadata[] = { }, }; +enum { + field_key = 1, + field_val = 2, +}; + +static const char * const ts_field_names[] = { + [0] = NULL, + [field_key] = "key", + [field_val] = "val", +}; + +static const TSFieldMapSlice ts_field_map_slices[PRODUCTION_ID_COUNT] = { + [1] = {.index = 0, .length = 2}, +}; + +static const TSFieldMapEntry ts_field_map_entries[] = { + [0] = + {field_key, 0}, + {field_val, 2}, +}; + static const TSSymbol ts_alias_sequences[PRODUCTION_ID_COUNT][MAX_ALIAS_SEQUENCE_LENGTH] = { [0] = {0}, }; @@ -10881,54 +10902,54 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = { }; enum { - ts_external_token__quoted_template_start = 0, - ts_external_token__quoted_template_end = 1, + ts_external_token_quoted_template_start = 0, + ts_external_token_quoted_template_end = 1, ts_external_token__template_literal_chunk = 2, - ts_external_token__template_interpolation_start = 3, - ts_external_token__template_interpolation_end = 4, + ts_external_token_template_interpolation_start = 3, + ts_external_token_template_interpolation_end = 4, ts_external_token_heredoc_identifier = 5, }; static const TSSymbol ts_external_scanner_symbol_map[EXTERNAL_TOKEN_COUNT] = { - [ts_external_token__quoted_template_start] = sym__quoted_template_start, - [ts_external_token__quoted_template_end] = sym__quoted_template_end, + [ts_external_token_quoted_template_start] = sym_quoted_template_start, + [ts_external_token_quoted_template_end] = sym_quoted_template_end, [ts_external_token__template_literal_chunk] = sym__template_literal_chunk, - [ts_external_token__template_interpolation_start] = sym__template_interpolation_start, - [ts_external_token__template_interpolation_end] = sym__template_interpolation_end, + [ts_external_token_template_interpolation_start] = sym_template_interpolation_start, + [ts_external_token_template_interpolation_end] = sym_template_interpolation_end, [ts_external_token_heredoc_identifier] = sym_heredoc_identifier, }; static const bool ts_external_scanner_states[11][EXTERNAL_TOKEN_COUNT] = { [1] = { - [ts_external_token__quoted_template_start] = true, - [ts_external_token__quoted_template_end] = true, + [ts_external_token_quoted_template_start] = true, + [ts_external_token_quoted_template_end] = true, [ts_external_token__template_literal_chunk] = true, - [ts_external_token__template_interpolation_start] = true, - [ts_external_token__template_interpolation_end] = true, + [ts_external_token_template_interpolation_start] = true, + [ts_external_token_template_interpolation_end] = true, [ts_external_token_heredoc_identifier] = true, }, [2] = { - [ts_external_token__quoted_template_start] = true, + [ts_external_token_quoted_template_start] = true, }, [3] = { - [ts_external_token__quoted_template_start] = true, - [ts_external_token__template_interpolation_end] = true, + [ts_external_token_quoted_template_start] = true, + [ts_external_token_template_interpolation_end] = true, }, [4] = { - [ts_external_token__template_interpolation_end] = true, + [ts_external_token_template_interpolation_end] = true, }, [5] = { [ts_external_token__template_literal_chunk] = true, - [ts_external_token__template_interpolation_start] = true, + [ts_external_token_template_interpolation_start] = true, [ts_external_token_heredoc_identifier] = true, }, [6] = { - [ts_external_token__quoted_template_end] = true, + [ts_external_token_quoted_template_end] = true, [ts_external_token__template_literal_chunk] = true, - [ts_external_token__template_interpolation_start] = true, + [ts_external_token_template_interpolation_start] = true, }, [7] = { - [ts_external_token__quoted_template_end] = true, + [ts_external_token_quoted_template_end] = true, [ts_external_token__template_literal_chunk] = true, }, [8] = { @@ -10938,7 +10959,7 @@ static const bool ts_external_scanner_states[11][EXTERNAL_TOKEN_COUNT] = { [ts_external_token_heredoc_identifier] = true, }, [10] = { - [ts_external_token__quoted_template_end] = true, + [ts_external_token_quoted_template_end] = true, }, }; @@ -10987,11 +11008,11 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = { [sym_strip_marker] = ACTIONS(1), [sym_comment] = ACTIONS(3), [sym__whitespace] = ACTIONS(3), - [sym__quoted_template_start] = ACTIONS(1), - [sym__quoted_template_end] = ACTIONS(1), + [sym_quoted_template_start] = ACTIONS(1), + [sym_quoted_template_end] = ACTIONS(1), [sym__template_literal_chunk] = ACTIONS(1), - [sym__template_interpolation_start] = ACTIONS(1), - [sym__template_interpolation_end] = ACTIONS(1), + [sym_template_interpolation_start] = ACTIONS(1), + [sym_template_interpolation_end] = ACTIONS(1), [sym_heredoc_identifier] = ACTIONS(1), }, [1] = { @@ -11035,7 +11056,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(11), 1, @@ -11110,7 +11131,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(39), 1, anon_sym_RBRACE, STATE(4), 1, @@ -11187,7 +11208,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(41), 1, anon_sym_RBRACE, STATE(4), 1, @@ -11264,7 +11285,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(43), 1, anon_sym_RBRACE, STATE(4), 1, @@ -11341,7 +11362,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(45), 1, anon_sym_RBRACK, STATE(4), 1, @@ -11414,7 +11435,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(47), 1, anon_sym_RBRACE, ACTIONS(49), 1, @@ -11490,7 +11511,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(51), 1, anon_sym_RBRACK, STATE(4), 1, @@ -11565,7 +11586,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(53), 1, anon_sym_RBRACK, STATE(4), 1, @@ -11642,7 +11663,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(90), 1, anon_sym_LT_LT_DASH, ACTIONS(93), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -11712,7 +11733,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(96), 1, anon_sym_RBRACE, ACTIONS(98), 1, @@ -11788,7 +11809,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(100), 1, anon_sym_RBRACK, STATE(4), 1, @@ -11861,7 +11882,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(41), 1, anon_sym_RBRACE, STATE(4), 1, @@ -11934,7 +11955,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(102), 1, anon_sym_RPAREN, STATE(4), 1, @@ -12005,7 +12026,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(104), 1, anon_sym_RPAREN, STATE(4), 1, @@ -12076,7 +12097,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(106), 1, anon_sym_RPAREN, STATE(4), 1, @@ -12147,7 +12168,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(108), 1, anon_sym_RPAREN, STATE(4), 1, @@ -12218,7 +12239,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(47), 1, anon_sym_RBRACE, STATE(4), 1, @@ -12287,7 +12308,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(110), 1, anon_sym_RBRACE, STATE(4), 1, @@ -12358,9 +12379,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(130), 1, sym_strip_marker, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(134), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -12425,11 +12446,11 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(136), 1, sym_strip_marker, ACTIONS(138), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -12494,11 +12515,11 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(140), 1, sym_strip_marker, ACTIONS(142), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -12563,11 +12584,11 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(144), 1, sym_strip_marker, ACTIONS(146), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -12632,7 +12653,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -12707,7 +12728,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(148), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -12747,7 +12768,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(152), 1, anon_sym_RBRACK, STATE(4), 1, @@ -12826,7 +12847,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(148), 18, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -12896,7 +12917,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_BANG, anon_sym_LT_LT, ACTIONS(158), 8, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -12932,7 +12953,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(182), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -12991,7 +13012,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_BANG, anon_sym_LT_LT, ACTIONS(148), 14, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -13040,7 +13061,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(148), 16, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -13098,7 +13119,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_BANG, anon_sym_LT_LT, ACTIONS(148), 12, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -13154,7 +13175,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_BANG, anon_sym_LT_LT, ACTIONS(148), 11, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -13185,7 +13206,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(186), 1, anon_sym_RBRACK, STATE(4), 1, @@ -13252,7 +13273,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -13317,7 +13338,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -13382,7 +13403,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -13447,7 +13468,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -13512,7 +13533,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -13577,7 +13598,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -13642,7 +13663,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -13707,7 +13728,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -13772,7 +13793,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -13837,7 +13858,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -13902,7 +13923,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -13967,7 +13988,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14032,7 +14053,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -14097,7 +14118,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14162,7 +14183,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14227,7 +14248,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14292,7 +14313,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -14357,7 +14378,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14422,7 +14443,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14487,7 +14508,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -14552,7 +14573,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14617,7 +14638,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -14682,7 +14703,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -14747,7 +14768,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14812,7 +14833,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14877,7 +14898,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -14942,7 +14963,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -15007,7 +15028,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -15072,7 +15093,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -15137,7 +15158,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -15202,7 +15223,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -15267,7 +15288,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -15332,7 +15353,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -15397,7 +15418,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -15469,7 +15490,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(228), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -15516,7 +15537,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(238), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -15563,7 +15584,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(242), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -15610,7 +15631,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(246), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -15657,7 +15678,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(250), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -15697,7 +15718,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -15758,7 +15779,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -15819,7 +15840,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -15880,7 +15901,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -15941,7 +15962,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -16002,7 +16023,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -16063,7 +16084,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -16124,7 +16145,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -16185,7 +16206,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -16246,7 +16267,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -16307,7 +16328,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -16368,7 +16389,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -16429,7 +16450,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -16490,7 +16511,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -16551,7 +16572,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -16612,7 +16633,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -16673,7 +16694,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -16734,7 +16755,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -16795,7 +16816,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(126), 1, anon_sym_LBRACK, ACTIONS(132), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(5), 1, sym__object_start, STATE(6), 1, @@ -16856,7 +16877,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -16917,7 +16938,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -16978,7 +16999,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -17039,7 +17060,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -17100,7 +17121,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -17161,7 +17182,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(35), 1, anon_sym_LT_LT_DASH, ACTIONS(37), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(4), 1, sym__object_start, STATE(12), 1, @@ -17222,7 +17243,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(222), 1, anon_sym_LBRACK, ACTIONS(226), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(2), 1, sym__object_start, STATE(9), 1, @@ -17283,7 +17304,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -17344,7 +17365,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(202), 1, anon_sym_LBRACK, ACTIONS(206), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(3), 1, sym__object_start, STATE(8), 1, @@ -17794,7 +17815,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(278), 19, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, aux_sym_numeric_lit_token2, @@ -18046,7 +18067,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(290), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18084,7 +18105,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(294), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18122,7 +18143,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(298), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18160,7 +18181,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(302), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18198,7 +18219,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(306), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18236,7 +18257,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(310), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18274,7 +18295,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(314), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18312,7 +18333,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(318), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18350,7 +18371,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(322), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18388,7 +18409,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(326), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18426,7 +18447,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(330), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18464,7 +18485,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(334), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18502,7 +18523,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(338), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18540,7 +18561,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(342), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18578,7 +18599,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(346), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18616,7 +18637,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(350), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18654,7 +18675,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(354), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18692,7 +18713,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(358), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18730,7 +18751,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(362), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18768,7 +18789,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(366), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18806,7 +18827,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(370), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18844,7 +18865,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(374), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18882,7 +18903,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(378), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18920,7 +18941,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(382), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18958,7 +18979,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(386), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -18996,7 +19017,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(390), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -19034,7 +19055,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(394), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -19072,7 +19093,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(398), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -19110,7 +19131,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(402), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -19148,7 +19169,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_LT, anon_sym_LT_LT, ACTIONS(406), 20, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -20712,7 +20733,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, sym_splat, ACTIONS(148), 6, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -20753,7 +20774,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, sym_splat, ACTIONS(148), 7, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -20792,7 +20813,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, sym_splat, ACTIONS(148), 9, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -20829,7 +20850,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(148), 11, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -20861,7 +20882,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(148), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -20901,7 +20922,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(148), 13, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -20972,7 +20993,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(182), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -21027,7 +21048,7 @@ static const uint16_t ts_small_parse_table[] = { sym_attr_splat, sym_full_splat, ACTIONS(158), 3, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_QMARK, sym_strip_marker, STATE(252), 3, @@ -21091,7 +21112,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, aux_sym_attr_splat_repeat1, ACTIONS(228), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -21126,7 +21147,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, aux_sym_attr_splat_repeat1, ACTIONS(238), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -21161,7 +21182,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, aux_sym_attr_splat_repeat1, ACTIONS(242), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -21196,7 +21217,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, aux_sym_attr_splat_repeat1, ACTIONS(250), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -21231,7 +21252,7 @@ static const uint16_t ts_small_parse_table[] = { sym_get_attr, aux_sym_attr_splat_repeat1, ACTIONS(246), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22049,7 +22070,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(278), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22159,7 +22180,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(330), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22185,7 +22206,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(334), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22211,7 +22232,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(362), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22237,7 +22258,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(346), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22263,7 +22284,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(386), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22289,7 +22310,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(358), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22315,7 +22336,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(366), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22341,7 +22362,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(354), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22367,7 +22388,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(322), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22393,7 +22414,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(374), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22419,7 +22440,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(390), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22445,7 +22466,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(406), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22471,7 +22492,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(306), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22497,7 +22518,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(326), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22523,7 +22544,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(290), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22549,7 +22570,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(318), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22575,7 +22596,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(302), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22601,7 +22622,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(398), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22627,7 +22648,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(314), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22653,7 +22674,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(350), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22679,7 +22700,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(394), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22705,7 +22726,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(382), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22731,7 +22752,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(298), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22757,7 +22778,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(310), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22783,7 +22804,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(402), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22809,7 +22830,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(294), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22835,7 +22856,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(342), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22861,7 +22882,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(338), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22887,7 +22908,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(370), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22913,7 +22934,7 @@ static const uint16_t ts_small_parse_table[] = { anon_sym_GT, anon_sym_LT, ACTIONS(378), 15, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_DOT_STAR, anon_sym_LBRACK_STAR_RBRACK, anon_sym_QMARK, @@ -22940,7 +22961,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(476), 11, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -22965,7 +22986,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(480), 10, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -22987,7 +23008,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(158), 11, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -23010,7 +23031,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(58), 10, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_RBRACE, anon_sym_LPAREN, @@ -23034,7 +23055,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(488), 8, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_LPAREN, aux_sym_numeric_lit_token2, @@ -23056,7 +23077,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(488), 8, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_LPAREN, aux_sym_numeric_lit_token2, @@ -23076,7 +23097,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(496), 8, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_LPAREN, aux_sym_numeric_lit_token2, @@ -23096,7 +23117,7 @@ static const uint16_t ts_small_parse_table[] = { sym_null_lit, anon_sym_LT_LT, ACTIONS(500), 8, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, anon_sym_LPAREN, aux_sym_numeric_lit_token2, @@ -23142,7 +23163,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(504), 1, sym__template_literal_chunk, ACTIONS(507), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(510), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23157,11 +23178,11 @@ static const uint16_t ts_small_parse_table[] = { aux_sym_quoted_template_repeat1, [15152] = 7, ACTIONS(512), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, STATE(315), 1, aux_sym_template_literal_repeat1, STATE(335), 1, @@ -23175,11 +23196,11 @@ static const uint16_t ts_small_parse_table[] = { aux_sym_quoted_template_repeat1, [15177] = 6, ACTIONS(510), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(518), 1, sym__template_literal_chunk, ACTIONS(521), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, STATE(315), 1, aux_sym_template_literal_repeat1, ACTIONS(3), 2, @@ -23194,7 +23215,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(528), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23211,9 +23232,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(530), 1, - sym__quoted_template_end, + sym_quoted_template_end, STATE(315), 1, aux_sym_template_literal_repeat1, ACTIONS(3), 2, @@ -23228,9 +23249,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(532), 1, - sym__quoted_template_end, + sym_quoted_template_end, STATE(315), 1, aux_sym_template_literal_repeat1, ACTIONS(3), 2, @@ -23245,7 +23266,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(534), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23262,7 +23283,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(536), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23279,9 +23300,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(538), 1, - sym__quoted_template_end, + sym_quoted_template_end, STATE(315), 1, aux_sym_template_literal_repeat1, ACTIONS(3), 2, @@ -23296,7 +23317,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(540), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23313,9 +23334,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(542), 1, - sym__quoted_template_end, + sym_quoted_template_end, STATE(315), 1, aux_sym_template_literal_repeat1, STATE(349), 1, @@ -23331,7 +23352,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(544), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23348,9 +23369,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(546), 1, - sym__quoted_template_end, + sym_quoted_template_end, STATE(315), 1, aux_sym_template_literal_repeat1, ACTIONS(3), 2, @@ -23365,7 +23386,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(548), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23382,7 +23403,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(550), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23399,9 +23420,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(552), 1, - sym__quoted_template_end, + sym_quoted_template_end, STATE(315), 1, aux_sym_template_literal_repeat1, STATE(343), 1, @@ -23417,7 +23438,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(524), 1, sym__template_literal_chunk, ACTIONS(526), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(554), 1, sym_heredoc_identifier, STATE(320), 1, @@ -23434,9 +23455,9 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(514), 1, sym__template_literal_chunk, ACTIONS(516), 1, - sym__template_interpolation_start, + sym_template_interpolation_start, ACTIONS(556), 1, - sym__quoted_template_end, + sym_quoted_template_end, STATE(315), 1, aux_sym_template_literal_repeat1, STATE(345), 1, @@ -23456,7 +23477,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(562), 1, sym_identifier, ACTIONS(564), 1, - sym__quoted_template_start, + sym_quoted_template_start, STATE(295), 1, sym__block_start, ACTIONS(3), 2, @@ -23528,7 +23549,7 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, [15659] = 6, ACTIONS(564), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(580), 1, anon_sym_LBRACE, ACTIONS(582), 1, @@ -23690,7 +23711,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(624), 1, sym_identifier, ACTIONS(627), 1, - sym__quoted_template_start, + sym_quoted_template_start, ACTIONS(3), 2, sym_comment, sym__whitespace, @@ -23769,8 +23790,8 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(638), 2, - sym__quoted_template_end, - sym__template_interpolation_start, + sym_quoted_template_end, + sym_template_interpolation_start, [15999] = 5, ACTIONS(574), 1, anon_sym_if, @@ -23814,8 +23835,8 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(648), 2, - sym__quoted_template_end, - sym__template_interpolation_start, + sym_quoted_template_end, + sym_template_interpolation_start, [16061] = 4, ACTIONS(653), 1, sym__template_literal_chunk, @@ -23825,7 +23846,7 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(638), 2, - sym__template_interpolation_start, + sym_template_interpolation_start, sym_heredoc_identifier, [16076] = 4, ACTIONS(655), 1, @@ -23836,7 +23857,7 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(648), 2, - sym__template_interpolation_start, + sym_template_interpolation_start, sym_heredoc_identifier, [16091] = 5, ACTIONS(574), 1, @@ -23876,7 +23897,7 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, [16142] = 4, ACTIONS(638), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(664), 1, sym__template_literal_chunk, STATE(340), 1, @@ -23888,7 +23909,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(136), 1, sym_strip_marker, ACTIONS(138), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(666), 1, anon_sym_QMARK, ACTIONS(3), 2, @@ -23900,7 +23921,7 @@ static const uint16_t ts_small_parse_table[] = { ACTIONS(668), 1, sym_strip_marker, ACTIONS(670), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(3), 2, sym_comment, sym__whitespace, @@ -23910,7 +23931,7 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, ACTIONS(672), 3, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, sym_heredoc_identifier, [16194] = 4, ACTIONS(674), 1, @@ -23927,7 +23948,7 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(158), 3, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_QMARK, sym_strip_marker, [16218] = 2, @@ -23936,7 +23957,7 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, ACTIONS(676), 3, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, sym_heredoc_identifier, [16228] = 3, ACTIONS(607), 1, @@ -23952,7 +23973,7 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(476), 3, - sym__template_interpolation_end, + sym_template_interpolation_end, anon_sym_QMARK, sym_strip_marker, [16250] = 2, @@ -23961,22 +23982,22 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, ACTIONS(680), 3, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, sym_heredoc_identifier, [16260] = 3, ACTIONS(682), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(3), 2, sym_comment, sym__whitespace, ACTIONS(684), 2, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16272] = 4, ACTIONS(140), 1, sym_strip_marker, ACTIONS(142), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(666), 1, anon_sym_QMARK, ACTIONS(3), 2, @@ -23987,9 +24008,9 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(686), 3, - sym__quoted_template_end, + sym_quoted_template_end, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16296] = 2, ACTIONS(3), 2, sym_comment, @@ -24008,7 +24029,7 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, [16316] = 4, ACTIONS(648), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(692), 1, sym__template_literal_chunk, STATE(340), 1, @@ -24021,7 +24042,7 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(394), 3, - sym__quoted_template_start, + sym_quoted_template_start, anon_sym_LBRACE, sym_identifier, [16340] = 2, @@ -24030,17 +24051,17 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, ACTIONS(686), 3, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, sym_heredoc_identifier, [16350] = 3, ACTIONS(695), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(3), 2, sym_comment, sym__whitespace, ACTIONS(684), 2, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16362] = 2, ACTIONS(3), 2, sym_comment, @@ -24051,20 +24072,20 @@ static const uint16_t ts_small_parse_table[] = { sym_identifier, [16372] = 3, ACTIONS(699), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(3), 2, sym_comment, sym__whitespace, ACTIONS(684), 2, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16384] = 4, ACTIONS(666), 1, anon_sym_QMARK, ACTIONS(701), 1, sym_strip_marker, ACTIONS(703), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(3), 2, sym_comment, sym__whitespace, @@ -24073,26 +24094,26 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(676), 3, - sym__quoted_template_end, + sym_quoted_template_end, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16408] = 2, ACTIONS(3), 2, sym_comment, sym__whitespace, ACTIONS(672), 3, - sym__quoted_template_end, + sym_quoted_template_end, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16418] = 3, ACTIONS(705), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(3), 2, sym_comment, sym__whitespace, ACTIONS(684), 2, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16430] = 3, ACTIONS(607), 1, anon_sym_QMARK, @@ -24107,9 +24128,9 @@ static const uint16_t ts_small_parse_table[] = { sym_comment, sym__whitespace, ACTIONS(680), 3, - sym__quoted_template_end, + sym_quoted_template_end, sym__template_literal_chunk, - sym__template_interpolation_start, + sym_template_interpolation_start, [16452] = 3, ACTIONS(709), 1, anon_sym_RBRACK, @@ -24522,13 +24543,13 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, [17015] = 2, ACTIONS(813), 1, - sym__quoted_template_end, + sym_quoted_template_end, ACTIONS(3), 2, sym_comment, sym__whitespace, [17023] = 2, ACTIONS(670), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(3), 2, sym_comment, sym__whitespace, @@ -24552,7 +24573,7 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, [17055] = 2, ACTIONS(819), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(3), 2, sym_comment, sym__whitespace, @@ -24570,13 +24591,13 @@ static const uint16_t ts_small_parse_table[] = { sym__whitespace, [17079] = 2, ACTIONS(823), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(3), 2, sym_comment, sym__whitespace, [17087] = 2, ACTIONS(703), 1, - sym__template_interpolation_end, + sym_template_interpolation_end, ACTIONS(3), 2, sym_comment, sym__whitespace, @@ -25256,8 +25277,8 @@ static const TSParseActionEntry ts_parse_actions[] = { [474] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16), [476] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_conditional, 5), [478] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_conditional, 5), - [480] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_object_elem, 3), - [482] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_object_elem, 3), + [480] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_object_elem, 3, .production_id = 1), + [482] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_object_elem, 3, .production_id = 1), [484] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59), [486] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__object_elems_repeat1, 2), [488] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__comma, 1), @@ -25459,6 +25480,9 @@ extern const TSLanguage *tree_sitter_hcl(void) { .small_parse_table_map = ts_small_parse_table_map, .parse_actions = ts_parse_actions, .symbol_names = ts_symbol_names, + .field_names = ts_field_names, + .field_map_slices = ts_field_map_slices, + .field_map_entries = ts_field_map_entries, .symbol_metadata = ts_symbol_metadata, .public_symbol_map = ts_symbol_map, .alias_map = ts_non_terminal_alias_map, diff --git a/test/corpus/attributes.txt b/test/corpus/attributes.txt index 41bbec3..59979d7 100644 --- a/test/corpus/attributes.txt +++ b/test/corpus/attributes.txt @@ -13,7 +13,9 @@ foo = "bar" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ attribute with variable diff --git a/test/corpus/blocks.txt b/test/corpus/blocks.txt index 53d3aca..ba720b4 100644 --- a/test/corpus/blocks.txt +++ b/test/corpus/blocks.txt @@ -40,16 +40,22 @@ block_1 "strlit1" "strlit2" { (block (identifier) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (body (attribute (identifier) (expression (literal_value (string_lit - (template_literal))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))) ================================================================================ nested block @@ -135,7 +141,11 @@ locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") } (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (template_expr - (quoted_template))))))))))) + (quoted_template + (quoted_template_start) + (quoted_template_end)))))))))))) diff --git a/test/corpus/collections.txt b/test/corpus/collections.txt index aa810e5..274339d 100644 --- a/test/corpus/collections.txt +++ b/test/corpus/collections.txt @@ -22,7 +22,9 @@ foo = [1, 2, "foo"] (expression (literal_value (string_lit - (template_literal)))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))))) ================================================================================ multiline tuple @@ -52,7 +54,9 @@ foo = [ (expression (literal_value (string_lit - (template_literal)))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))))) ================================================================================ empty tuple @@ -113,11 +117,15 @@ foo = {1: 2, "foo"="bar"} (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal))))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))))) ================================================================================ multiline object @@ -148,11 +156,15 @@ foo = { (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal))))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))))) ================================================================================ empty object @@ -216,11 +228,15 @@ foo = { 1: 2, (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal))))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))))) ================================================================================ complex object @@ -247,7 +263,9 @@ foo = { (expression (literal_value (string_lit - (template_literal))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))) (object_elem (expression (variable_expr @@ -255,7 +273,9 @@ foo = { (expression (literal_value (string_lit - (template_literal))))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))))) ================================================================================ complex from real world @@ -295,7 +315,9 @@ worker_groups = [ (expression (literal_value (string_lit - (template_literal))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))) (object_elem (expression (variable_expr @@ -303,7 +325,9 @@ worker_groups = [ (expression (literal_value (string_lit - (template_literal))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))) (object_elem (expression (variable_expr @@ -335,7 +359,9 @@ worker_groups = [ (expression (literal_value (string_lit - (template_literal))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))) (object_elem (expression (variable_expr @@ -343,7 +369,9 @@ worker_groups = [ (expression (literal_value (string_lit - (template_literal))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))) (object_elem (expression (variable_expr @@ -365,4 +393,3 @@ worker_groups = [ (expression (literal_value (numeric_lit))))))))))))) - diff --git a/test/corpus/conditionals.txt b/test/corpus/conditionals.txt index 7702228..ac0183c 100644 --- a/test/corpus/conditionals.txt +++ b/test/corpus/conditionals.txt @@ -51,11 +51,15 @@ foo = ( true ? false : true ) ? "yes" : "no" (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))) ================================================================================ nested conditional expression expression without parentheses @@ -85,8 +89,12 @@ foo = true ? false : true ? "yes" : "no" (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))) diff --git a/test/corpus/for_expressions.txt b/test/corpus/for_expressions.txt index 3b3aa00..aa8cb01 100644 --- a/test/corpus/for_expressions.txt +++ b/test/corpus/for_expressions.txt @@ -21,11 +21,15 @@ foo = [for v in ["a", "b"]: v] (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))) (expression (variable_expr (identifier))))))))) @@ -54,11 +58,15 @@ foo = [for i, v in ["a", "b"]: i] (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))) (expression (variable_expr (identifier))))))))) @@ -87,15 +95,21 @@ foo = [for i, v in ["a", "b", "c"]: v if pred(i)] (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))) (expression (variable_expr (identifier))) @@ -132,11 +146,15 @@ foo = {for i, v in ["a", "b"]: v => i} (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))) (expression (variable_expr (identifier))) @@ -168,11 +186,15 @@ foo = {for i, v in ["a", "b"]: v => i...} (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))) (expression (variable_expr (identifier))) diff --git a/test/corpus/function_calls.txt b/test/corpus/function_calls.txt index 985e628..af821e1 100644 --- a/test/corpus/function_calls.txt +++ b/test/corpus/function_calls.txt @@ -33,7 +33,9 @@ foo = bar("foo") (expression (literal_value (string_lit - (template_literal)))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))))) ================================================================================ variadic function call @@ -79,12 +81,18 @@ foo = bar( (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) (expression (literal_value (string_lit - (template_literal)))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))))))))) diff --git a/test/corpus/real_world.txt b/test/corpus/real_world.txt index 4ec7a2a..de8d1a5 100644 --- a/test/corpus/real_world.txt +++ b/test/corpus/real_world.txt @@ -15,7 +15,9 @@ provider "kubernetes" { (block (identifier) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (body (attribute (identifier) @@ -122,7 +124,9 @@ resource "azurerm_storage_blob" "proxy_cert" { (get_attr (identifier)) (template_expr - (quoted_template))))) + (quoted_template + (quoted_template_start) + (quoted_template_end)))))) (expression (variable_expr (identifier)) @@ -152,7 +156,9 @@ resource "azurerm_storage_blob" "proxy_cert" { (get_attr (identifier)) (template_expr - (quoted_template))))) + (quoted_template + (quoted_template_start) + (quoted_template_end)))))) (expression (variable_expr (identifier)) @@ -173,9 +179,13 @@ resource "azurerm_storage_blob" "proxy_cert" { (block (identifier) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (body (attribute (identifier) @@ -189,7 +199,9 @@ resource "azurerm_storage_blob" "proxy_cert" { (get_attr (identifier)) (template_expr - (quoted_template))))) + (quoted_template + (quoted_template_start) + (quoted_template_end)))))) (expression (literal_value (numeric_lit))) @@ -215,13 +227,19 @@ resource "azurerm_storage_blob" "proxy_cert" { (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) (block (identifier) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (body (attribute (identifier) @@ -235,7 +253,9 @@ resource "azurerm_storage_blob" "proxy_cert" { (get_attr (identifier)) (template_expr - (quoted_template))))) + (quoted_template + (quoted_template_start) + (quoted_template_end)))))) (expression (literal_value (numeric_lit))) @@ -261,13 +281,19 @@ resource "azurerm_storage_blob" "proxy_cert" { (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) (block (identifier) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (body (attribute (identifier) @@ -281,7 +307,9 @@ resource "azurerm_storage_blob" "proxy_cert" { (get_attr (identifier)) (template_expr - (quoted_template))))) + (quoted_template + (quoted_template_start) + (quoted_template_end)))))) (expression (literal_value (numeric_lit))) @@ -328,13 +356,19 @@ resource "azurerm_storage_blob" "proxy_cert" { (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) (block (identifier) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (string_lit - (template_literal)) + (quoted_template_start) + (template_literal) + (quoted_template_end)) (body (attribute (identifier) @@ -352,13 +386,17 @@ resource "azurerm_storage_blob" "proxy_cert" { (get_attr (identifier)) (template_expr - (quoted_template)))) + (quoted_template + (quoted_template_start) + (quoted_template_end))))) (variable_expr (identifier)))) (get_attr (identifier)) (template_expr - (quoted_template))))) + (quoted_template + (quoted_template_start) + (quoted_template_end)))))) (expression (literal_value (numeric_lit))) @@ -405,7 +443,9 @@ resource "azurerm_storage_blob" "proxy_cert" { (expression (literal_value (string_lit - (template_literal))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))))) ================================================================================ example 3 @@ -460,7 +500,9 @@ locals { (expression (template_expr (quoted_template + (quoted_template_start) (template_interpolation + (template_interpolation_start) (expression (conditional (expression @@ -486,4 +528,6 @@ locals { (get_attr (identifier)) (get_attr - (identifier)))))))))))))) + (identifier))))) + (template_interpolation_end)) + (quoted_template_end))))))))) diff --git a/test/corpus/strings.txt b/test/corpus/strings.txt index 4cd71a5..d4cebbd 100644 --- a/test/corpus/strings.txt +++ b/test/corpus/strings.txt @@ -13,7 +13,9 @@ foo = "foo bar" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ escaped backslash at end @@ -30,7 +32,9 @@ foo = "foo\\" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ string literal escaped template interpolation @@ -47,7 +51,9 @@ foo = "$${foo.bar}" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ template chars but no template 1 @@ -64,7 +70,9 @@ foo = "$$$" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ template chars but no template 2 @@ -81,7 +89,9 @@ foo = "100%" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ template chars but no template 3 @@ -98,7 +108,9 @@ foo = "%\n\t" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ template chars but no template 4 @@ -115,7 +127,9 @@ foo = "%%\n\t" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ template chars but no template 5 @@ -132,7 +146,9 @@ foo = "$$" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ template chars but no template 6 @@ -149,7 +165,9 @@ foo = "%%{\n\t" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ escaped template @@ -166,4 +184,6 @@ foo = "$${ var.bar }" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) diff --git a/test/corpus/templates.txt b/test/corpus/templates.txt index 16c0ca7..1a8bf88 100644 --- a/test/corpus/templates.txt +++ b/test/corpus/templates.txt @@ -13,12 +13,16 @@ foo = "${ var.bar }" (expression (template_expr (quoted_template + (quoted_template_start) (template_interpolation + (template_interpolation_start) (expression (variable_expr (identifier)) (get_attr - (identifier)))))))))) + (identifier))) + (template_interpolation_end)) + (quoted_template_end))))))) ================================================================================ empty template interpolation @@ -35,7 +39,11 @@ foo = "${}" (expression (template_expr (quoted_template - (template_interpolation))))))) + (quoted_template_start) + (template_interpolation + (template_interpolation_start) + (template_interpolation_end)) + (quoted_template_end))))))) ================================================================================ empty heredoc template @@ -94,11 +102,17 @@ foo = "${ " ~ " }" (expression (template_expr (quoted_template + (quoted_template_start) (template_interpolation + (template_interpolation_start) (expression (literal_value (string_lit - (template_literal))))))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) + (template_interpolation_end)) + (quoted_template_end))))))) ================================================================================ quoted template with nested quoted template @@ -115,8 +129,10 @@ foo = "p-${ foo("v-${a.b}") }" (expression (template_expr (quoted_template + (quoted_template_start) (template_literal) (template_interpolation + (template_interpolation_start) (expression (function_call (identifier) @@ -124,13 +140,19 @@ foo = "p-${ foo("v-${a.b}") }" (expression (template_expr (quoted_template + (quoted_template_start) (template_literal) (template_interpolation + (template_interpolation_start) (expression (variable_expr (identifier)) (get_attr - (identifier))))))))))))))))) + (identifier))) + (template_interpolation_end)) + (quoted_template_end))))))) + (template_interpolation_end)) + (quoted_template_end))))))) ================================================================================ quoted template interpolation with strip markers @@ -147,15 +169,21 @@ foo = "hello ${~ "world" ~} hello" (expression (template_expr (quoted_template + (quoted_template_start) (template_literal) (template_interpolation + (template_interpolation_start) (strip_marker) (expression (literal_value (string_lit - (template_literal)))) - (strip_marker)) - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end)))) + (strip_marker) + (template_interpolation_end)) + (template_literal) + (quoted_template_end))))))) ================================================================================ quoted template object expression in template @@ -172,7 +200,9 @@ foo = "${ {a=b}[a] }" (expression (template_expr (quoted_template + (quoted_template_start) (template_interpolation + (template_interpolation_start) (expression (collection_value (object @@ -187,7 +217,9 @@ foo = "${ {a=b}[a] }" (new_index (expression (variable_expr - (identifier))))))))))))) + (identifier)))))) + (template_interpolation_end)) + (quoted_template_end))))))) ================================================================================ escaped template interpolation start @@ -204,7 +236,9 @@ foo = "hello $${ world" (expression (literal_value (string_lit - (template_literal))))))) + (quoted_template_start) + (template_literal) + (quoted_template_end))))))) ================================================================================ tricky heredoc