Skip to content

Commit a2ef079

Browse files
committed
feat!: remove glimmer template tags
There is now a glimmer parser that's been out for a while now, glimmer parsers should be using this.
1 parent c4ce9dc commit a2ef079

File tree

7 files changed

+49853
-52135
lines changed

7 files changed

+49853
-52135
lines changed

grammar.js

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,6 @@ module.exports = grammar({
480480

481481
expression: $ => choice(
482482
$.primary_expression,
483-
$.glimmer_template,
484483
$._jsx_element,
485484
$.assignment_expression,
486485
$.augmented_assignment_expression,
@@ -586,24 +585,6 @@ module.exports = grammar({
586585
']',
587586
),
588587

589-
glimmer_template: $ => choice(
590-
seq(
591-
field('open_tag', $.glimmer_opening_tag),
592-
field('content', repeat($._glimmer_template_content)),
593-
field('close_tag', $.glimmer_closing_tag),
594-
),
595-
// empty template has no content
596-
// <template></template>
597-
seq(
598-
field('open_tag', $.glimmer_opening_tag),
599-
field('close_tag', $.glimmer_closing_tag),
600-
),
601-
),
602-
603-
_glimmer_template_content: _ => /.{1,}/,
604-
glimmer_opening_tag: _ => '<template>',
605-
glimmer_closing_tag: _ => '</template>',
606-
607588
_jsx_element: $ => choice($.jsx_element, $.jsx_self_closing_element),
608589

609590
jsx_element: $ => seq(
@@ -1086,17 +1067,15 @@ module.exports = grammar({
10861067
),
10871068

10881069
identifier: _ => {
1089-
// eslint-disable-next-line max-len
10901070
const alpha = /[^\x00-\x1F\s\p{Zs}0-9:;`"'@#.,|^&<=>+\-*/\\%?!~()\[\]{}\uFEFF\u2060\u200B\u2028\u2029]|\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]+\}/;
1091-
// eslint-disable-next-line max-len
1071+
10921072
const alphanumeric = /[^\x00-\x1F\s\p{Zs}:;`"'@#.,|^&<=>+\-*/\\%?!~()\[\]{}\uFEFF\u2060\u200B\u2028\u2029]|\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]+\}/;
10931073
return token(seq(alpha, repeat(alphanumeric)));
10941074
},
10951075

10961076
private_property_identifier: _ => {
1097-
// eslint-disable-next-line max-len
10981077
const alpha = /[^\x00-\x1F\s\p{Zs}0-9:;`"'@#.,|^&<=>+\-*/\\%?!~()\[\]{}\uFEFF\u2060\u200B\u2028\u2029]|\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]+\}/;
1099-
// eslint-disable-next-line max-len
1078+
11001079
const alphanumeric = /[^\x00-\x1F\s\p{Zs}:;`"'@#.,|^&<=>+\-*/\\%?!~()\[\]{}\uFEFF\u2060\u200B\u2028\u2029]|\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]+\}/;
11011080
return token(seq('#', alpha, repeat(alphanumeric)));
11021081
},
@@ -1152,7 +1131,6 @@ module.exports = grammar({
11521131
seq(field('member', $.method_definition), optional(';')),
11531132
seq(field('member', $.field_definition), $._semicolon),
11541133
field('member', $.class_static_block),
1155-
field('template', $.glimmer_template),
11561134
';',
11571135
)),
11581136
'}',
@@ -1253,8 +1231,7 @@ module.exports = grammar({
12531231
*
12541232
* @param {Rule} rule
12551233
*
1256-
* @return {SeqRule}
1257-
*
1234+
* @returns {SeqRule}
12581235
*/
12591236
function commaSep1(rule) {
12601237
return seq(rule, repeat(seq(',', rule)));
@@ -1265,8 +1242,7 @@ function commaSep1(rule) {
12651242
*
12661243
* @param {Rule} rule
12671244
*
1268-
* @return {ChoiceRule}
1269-
*
1245+
* @returns {ChoiceRule}
12701246
*/
12711247
function commaSep(rule) {
12721248
return optional(commaSep1(rule));

queries/highlights.scm

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747

4848
; Special identifiers
4949
;--------------------
50-
(glimmer_opening_tag) @tag.builtin
51-
(glimmer_closing_tag) @tag.builtin
5250

5351
((identifier) @constructor
5452
(#match? @constructor "^[A-Z]"))

queries/injections.scm

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,3 @@
2929
(#eq? @_name "hbs"))
3030
arguments: ((template_string) @glimmer
3131
(#offset! @glimmer 0 1 0 -1)))
32-
33-
; Ember Unified <template> syntax
34-
; e.g.: <template><SomeComponent @arg={{double @value}} /></template>
35-
((glimmer_template) @glimmer)

src/grammar.json

Lines changed: 0 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node-types.json

Lines changed: 0 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)