Drop meta.template

deathaxe · skyronic · commit fc9fc777d16c · 2023-02-01T15:13:55.000-05:00
This commit follows a scope naming scheme introduced to Astro, Blade, Liquid, PHP and Slim recently, which uses

1. `meta.embedded.&lt;template-name&gt;` for those template code sections,
   which are used for control structures primarily.

   This scope has already been in use in PHP syntax to scope all
   `&lt;?php ... ?&gt;` code sections.

2. `meta.interpolation.&lt;template-name&gt;` for those template code
    sections, which primarily emit data to the output document.

    That's what Mustage tags `{{ expr }}` do primarily.
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
@@ -557,18 +557,17 @@ contexts:
 
   mustache-interpolation-content:
     - clear_scopes: 1
-    - meta_scope: meta.interpolation.vue
     - include: mustache-templates
     - include: immediately-pop
 
   mustache-templates:
     - match: '{{'
-      scope: meta.template.vue punctuation.definition.template.begin.html
+      scope: meta.interpolation.vue punctuation.definition.interpolation.begin.html
       embed: scope:source.js
-      embed_scope: meta.template.vue source.js.embedded.vue
+      embed_scope: meta.interpolation.vue source.js.embedded.vue
       escape: '}}'
       escape_captures:
-        0: meta.template.vue punctuation.definition.template.end.html
+        0: meta.interpolation.vue punctuation.definition.interpolation.end.html
 
 ###[ VUE DIRECTIVES ]#########################################################
 
diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros
@@ -318,18 +318,17 @@ contexts:
 
   mustache-interpolation-content:
     - clear_scopes: 1
-    - meta_scope: meta.interpolation.vue
     - include: mustache-templates
     - include: immediately-pop
 
   mustache-templates:
     - match: '{{'
-      scope: meta.template.vue punctuation.definition.template.begin.html
+      scope: meta.interpolation.vue punctuation.definition.interpolation.begin.html
       embed: scope:source.js
-      embed_scope: meta.template.vue source.js.embedded.vue
+      embed_scope: meta.interpolation.vue source.js.embedded.vue
       escape: '}}'
       escape_captures:
-        0: meta.template.vue punctuation.definition.template.end.html
+        0: meta.interpolation.vue punctuation.definition.interpolation.end.html
 
 ###[ VUE DIRECTIVES ]#########################################################
 
diff --git a/tests/syntax_tests_mustage.vue b/tests/syntax_tests_mustage.vue
@@ -1,42 +1,42 @@
 // SYNTAX TEST "Vue Component.sublime-syntax"
 
     <h1> {{ foo.text }} </h1>
-//       ^^^^^^^^^^^^^^ meta.template.vue
-//       ^^ punctuation.definition.template.begin.html
+//       ^^^^^^^^^^^^^^ meta.interpolation.vue
+//       ^^ punctuation.definition.interpolation.begin.html
 //         ^^^^^^^^^^ source.js.embedded.vue
-//                   ^^ punctuation.definition.template.end.html
+//                   ^^ punctuation.definition.interpolation.end.html
 
     <p {{foo.attrib}}>
-//     ^^^^^^^^^^^^^^ meta.template.vue
-//     ^^ punctuation.definition.template.begin.html
+//     ^^^^^^^^^^^^^^ meta.interpolation.vue
+//     ^^ punctuation.definition.interpolation.begin.html
 //       ^^^^^^^^^^ source.js.embedded.vue
-//                 ^^ punctuation.definition.template.end.html
+//                 ^^ punctuation.definition.interpolation.end.html
 
     <p attrib="{{ foo.value }}" >
 //            ^ meta.tag meta.attribute-with-value.html meta.string.html - meta.interpolation
 //             ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html meta.string.html meta.interpolation.vue
 //                            ^ meta.tag meta.attribute-with-value.html meta.string.html - meta.interpolation
 //            ^ string.quoted.double.html punctuation.definition.string.begin.html
-//             ^^ punctuation.definition.template.begin.html - source.js
+//             ^^ punctuation.definition.interpolation.begin.html - source.js
 //               ^^^^^^^^^^^ source.js.embedded.vue
-//                          ^^ punctuation.definition.template.end.html - source.js
+//                          ^^ punctuation.definition.interpolation.end.html - source.js
 //                            ^ string.quoted.double.html punctuation.definition.string.end.html
 
     <p attrib='{{ foo.value }}' >
 //            ^ meta.tag meta.attribute-with-value.html meta.string.html - meta.interpolation
 //             ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html meta.string.html meta.interpolation.vue
 //                            ^ meta.tag meta.attribute-with-value.html meta.string.html - meta.interpolation
 //            ^ string.quoted.single.html punctuation.definition.string.begin.html
-//             ^^ punctuation.definition.template.begin.html - source.js
+//             ^^ punctuation.definition.interpolation.begin.html - source.js
 //               ^^^^^^^^^^^ source.js.embedded.vue
-//                          ^^ punctuation.definition.template.end.html - source.js
+//                          ^^ punctuation.definition.interpolation.end.html - source.js
 //                            ^ string.quoted.single.html punctuation.definition.string.end.html
 
     <p attrib={{ foo.value }} >
 //            ^^^^^^^^^^^^^^^ meta.tag meta.attribute-with-value.html meta.string.html meta.interpolation.vue
-//            ^^ punctuation.definition.template.begin.html - source.js
+//            ^^ punctuation.definition.interpolation.begin.html - source.js
 //              ^^^^^^^^^^^ source.js.embedded.vue
-//                         ^^ punctuation.definition.template.end.html - source.js
+//                         ^^ punctuation.definition.interpolation.end.html - source.js
 
     <p v-attrib="{'key': 'value'}">
 //  ^^^ meta.tag - meta.attribute-with-value
