Reorganize and group contexts in sections

deathaxe · skyronic · commit 37a98cf1b41f · 2023-02-01T15:13:55.000-05:00
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
@@ -69,20 +69,12 @@ contexts:
         - match: ''
           pop: true
 
+###[ TAG ATTRIBUTES ]#########################################################
+
   tag-attributes:
     - meta_prepend: true
     - include: vue-directive
 
-  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
-
-###[ TAG ATTRIBUTES ]#########################################################
-
   vue-directive:
     - match: (?=v-)
       push:
@@ -453,12 +445,13 @@ contexts:
 
 ###[ TEMPLATE TAG ]###########################################################
 
-  template-common:
-    - include: template-lang-attribute
-    - include: tag-attributes
-    - match: />
-      scope: punctuation.definition.tag.end.html
-      pop: true
+  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
 
   template-close-tag:
     - match: (</)((?i:template))(>)
@@ -469,6 +462,13 @@ contexts:
         3: punctuation.definition.tag.end.html
       pop: true
 
+  template-common:
+    - include: template-lang-attribute
+    - include: tag-attributes
+    - match: />
+      scope: punctuation.definition.tag.end.html
+      pop: true
+
   template-mustache:
     - meta_content_scope: meta.tag.template.begin.html
     - include: template-common
diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros
@@ -70,20 +70,12 @@ contexts:
         - match: ''
           pop: true
 
+###[ TAG ATTRIBUTES ]#########################################################
+
   tag-attributes:
     - meta_prepend: true
     - include: vue-directive
 
-  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
-
-###[ TAG ATTRIBUTES ]#########################################################
-
   vue-directive:
     - match: (?=v-)
       push:
@@ -273,12 +265,13 @@ contexts:
 
 ###[ TEMPLATE TAG ]###########################################################
 
-  template-common:
-    - include: template-lang-attribute
-    - include: tag-attributes
-    - match: '/>'
-      scope: punctuation.definition.tag.end.html
-      pop: true
+  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
 
   template-close-tag:
     - match: (</)((?i:template))(>)
@@ -289,6 +282,13 @@ contexts:
         3: punctuation.definition.tag.end.html
       pop: true
 
+  template-common:
+    - include: template-lang-attribute
+    - include: tag-attributes
+    - match: '/>'
+      scope: punctuation.definition.tag.end.html
+      pop: true
+
   template-mustache:
     - meta_content_scope: meta.tag.template.begin.html
     - include: template-common
