Fix meta scopes of template tags

deathaxe · skyronic · commit dbe9f0a82549 · 2023-02-01T15:13:55.000-05:00
This commit...

1. fixes duplicated meta.tag scopes in `&lt;template&gt;` tags
2. fixes missing meta.tag scope at the closing `&gt;` in `&lt;template&gt;` tags
3. adds syntax tests for template tags
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
@@ -448,7 +448,6 @@ contexts:
   template-tag:
     - match: (<)((?i:template)){{tag_name_break}}
       captures:
-        0: meta.tag.template.begin.html
         1: punctuation.definition.tag.begin.html
         2: entity.name.tag.template.html
       push: template-mustache
@@ -465,12 +464,10 @@ contexts:
   template-common:
     - include: template-lang-attribute
     - include: tag-attributes
-    - match: />
-      scope: punctuation.definition.tag.end.html
-      pop: true
+    - include: tag-end-self-closing
 
   template-mustache:
-    - meta_content_scope: meta.tag.template.begin.html
+    - meta_scope: meta.tag.template.begin.html
     - include: template-common
     - match: '>'
       scope: punctuation.definition.tag.end.html
diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros
@@ -268,7 +268,6 @@ contexts:
   template-tag:
     - match: (<)((?i:template)){{tag_name_break}}
       captures:
-        0: meta.tag.template.begin.html
         1: punctuation.definition.tag.begin.html
         2: entity.name.tag.template.html
       push: template-mustache
@@ -285,12 +284,10 @@ contexts:
   template-common:
     - include: template-lang-attribute
     - include: tag-attributes
-    - match: '/>'
-      scope: punctuation.definition.tag.end.html
-      pop: true
+    - include: tag-end-self-closing
 
   template-mustache:
-    - meta_content_scope: meta.tag.template.begin.html
+    - meta_scope: meta.tag.template.begin.html
     - include: template-common
     - match: '>'
       scope: punctuation.definition.tag.end.html
diff --git a/tests/syntax_test_template.vue b/tests/syntax_test_template.vue
@@ -0,0 +1,101 @@
+// SYNTAX TEST "Vue Component.sublime-syntax"
+
+
+    <template lang="jade"> foo </template>
+//  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
+//                        ^^^^^ text.jade.embedded.html - meta.tag
+//                             ^^^^^^^^^^^ meta.tag - source
+
+    <template lang="jade"> foo --> </template>
+//  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
+//                        ^^^^^ text.jade.embedded.html - meta.tag
+//                             ^^^^ - meta.tag - source
+//                             ^^^ comment.block.html punctuation.definition.comment.end.html
+//                                 ^^^^^^^^^^^ meta.tag - source
+
+    <template lang="jade"> <!-- foo </template>
+//  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
+//                        ^^^^^ - meta.tag - source
+//                         ^^^^ punctuation.definition.comment.begin.html
+//                             ^^^^^ text.jade.embedded.html - meta.tag
+//                                  ^^^^^^^^^^^ meta.tag - source
+
+    <template lang="jade"> <!-- foo --> </template>
+//  ^^^^^^^^^^^^^^^^^^^^^^ meta.tag - source
+//                        ^^^^^ - meta.tag - source
+//                         ^^^^ punctuation.definition.comment.begin.html
+//                             ^^^^^ text.jade.embedded.html - meta.tag
+//                                  ^^^^ - meta.tag - source
+//                                  ^^^ comment.block.html punctuation.definition.comment.end.html
+//                                      ^^^^^^^^^^^ meta.tag - source
+
+
+    <template lang="jade">
+
+// <- text.jade.embedded.html
+
+    </template>
+// <- text.jade.embedded.html
+//^^ text.jade.embedded.html
+//  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
+
+
+    <template lang="jade">
+//  ^^^^^^^^^^ meta.tag - meta.tag meta.tag - meta.attribute-with-value
+//            ^^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.tag meta.tag
+//                       ^ meta.tag.template.begin.html - meta.tag meta.tag
+//  ^ punctuation.definition.tag.begin.html
+//   ^^^^^^^^ entity.name.tag.template.html
+//            ^^^^ entity.other.attribute-name.html
+//                ^ punctuation.separator.key-value.html
+//                       ^ punctuation.definition.tag.end.html
+//                        ^ - text.jade
+
+// <- text.jade.embedded.html
+    </template>
+// <- text.jade.embedded.html
+//^^ text.jade.embedded.html
+//  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.jade
+//  ^^ punctuation.definition.tag.begin.html
+//    ^^^^^^^^ entity.name.tag.template.html
+//            ^ punctuation.definition.tag.end.html
+
+    <template lang="pug">
+//  ^^^^^^^^^^ meta.tag - meta.tag meta.tag - meta.attribute-with-value
+//            ^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.tag meta.tag
+//                      ^ meta.tag.template.begin.html - meta.tag meta.tag
+//  ^ punctuation.definition.tag.begin.html
+//   ^^^^^^^^ entity.name.tag.template.html
+//            ^^^^ entity.other.attribute-name.html
+//                ^ punctuation.separator.key-value.html
+//                      ^ punctuation.definition.tag.end.html
+//                       ^ - text.pug
+
+// <- text.pug.embedded.html
+    </template>
+// <- text.pug.embedded.html
+//^^ text.pug.embedded.html
+//  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.pug
+//  ^^ punctuation.definition.tag.begin.html
+//    ^^^^^^^^ entity.name.tag.template.html
+//            ^ punctuation.definition.tag.end.html
+
+    <template lang="slm">
+//  ^^^^^^^^^^ meta.tag - meta.tag meta.tag - meta.attribute-with-value
+//            ^^^^^^^^^^ meta.tag meta.attribute-with-value.html - meta.tag meta.tag
+//                      ^ meta.tag.template.begin.html - meta.tag meta.tag
+//  ^ punctuation.definition.tag.begin.html
+//   ^^^^^^^^ entity.name.tag.template.html
+//            ^^^^ entity.other.attribute-name.html
+//                ^ punctuation.separator.key-value.html
+//                      ^ punctuation.definition.tag.end.html
+//                       ^ - text.slm
+
+// <- text.slm.embedded.html
+    </template>
+// <- text.slm.embedded.html
+//^^ text.slm.embedded.html
+//  ^^^^^^^^^^^ meta.tag - meta.tag meta.tag - text.slm
+//  ^^ punctuation.definition.tag.begin.html
+//    ^^^^^^^^ entity.name.tag.template.html
+//            ^ punctuation.definition.tag.end.html
