Reorganize lang-attribute contexts

deathaxe · skyronic · commit 15fd1882e8fd · 2021-09-09T09:45:06.000-04:00
This commit applies a structural change from HTML.sublime-syntax, which
turns various "lang" attribute related anonymous contexts into named
contexts as those help debugging syntax errors when using ST's new
scope name popup. They also help inheriting syntaxes more fine grained.
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
@@ -160,15 +160,20 @@ contexts:
   style-lang-attribute:
     - match: (?i:lang){{attribute_name_break}}
       scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set:
-        - meta_content_scope: meta.tag.style.begin.html meta.attribute-with-value.html
-        - match: =
-          scope: punctuation.separator.key-value.html
-          set:
-            - meta_scope: meta.tag.style.begin.html meta.attribute-with-value.html
-            - include: style-lang-decider
-        - match: (?=\S)
-          set: style-css
+      set: style-lang-attribute-assignment
+
+  style-lang-attribute-assignment:
+    - meta_content_scope: meta.tag.style.begin.html meta.attribute-with-value.html
+    - match: =
+      scope: punctuation.separator.key-value.html
+      set: style-lang-attribute-value
+    - match: (?=\S)
+      set: style-css
+
+  style-lang-attribute-value:
+    - meta_include_prototype: false
+    - meta_scope: meta.tag.style.begin.html meta.attribute-with-value.html
+    - include: style-lang-decider
 
   style-lang-decider:
     - match: (?i)(?=sass{{unquoted_attribute_break}}|\'sass\'|"sass")
@@ -352,15 +357,20 @@ contexts:
   script-lang-attribute:
     - match: (?i:lang){{attribute_name_break}}
       scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set:
-        - meta_content_scope: meta.tag.script.begin.html meta.attribute-with-value.html
-        - match: =
-          scope: punctuation.separator.key-value.html
-          set:
-            - meta_scope: meta.tag.script.begin.html meta.attribute-with-value.html
-            - include: script-lang-decider
-        - match: (?=\S)
-          set: script-javascript
+      set: script-lang-attribute-assignment
+
+  script-lang-attribute-assignment:
+    - meta_content_scope: meta.tag.script.begin.html meta.attribute-with-value.html
+    - match: =
+      scope: punctuation.separator.key-value.html
+      set: script-lang-attribute-value
+    - match: (?=\S)
+      set: script-javascript
+
+  script-lang-attribute-value:
+    - meta_include_prototype: false
+    - meta_scope: meta.tag.script.begin.html meta.attribute-with-value.html
+    - include: script-lang-decider
 
   script-lang-decider:
     - match: (?i)(?=coffee{{unquoted_attribute_break}}|\'coffee\'|"coffee")
@@ -464,15 +474,20 @@ contexts:
   template-lang-attribute:
     - match: (?i:lang){{attribute_name_break}}
       scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set:
-        - meta_content_scope: meta.tag.template.begin.html meta.attribute-with-value.html
-        - match: =
-          scope: punctuation.separator.key-value.html
-          set:
-            - meta_scope: meta.tag.template.begin.html meta.attribute-with-value.html
-            - include: template-lang-decider
-        - match: (?=\S)
-          set: template-mustache
+      set: template-lang-attribute-assignment
+
+  template-lang-attribute-assignment:
+    - meta_content_scope: meta.tag.template.begin.html meta.attribute-with-value.html
+    - match: =
+      scope: punctuation.separator.key-value.html
+      set: template-lang-attribute-value
+    - match: (?=\S)
+      set: template-mustache
+
+  template-lang-attribute-value:
+    - meta_include_prototype: false
+    - meta_scope: meta.tag.template.begin.html meta.attribute-with-value.html
+    - include: template-lang-decider
 
   template-lang-decider:
     - match: (?i)(?=jade{{unquoted_attribute_break}}|\'jade\'|"jade")
diff --git a/Vue Component.sublime-syntax.yaml-macros b/Vue Component.sublime-syntax.yaml-macros
@@ -169,15 +169,20 @@ contexts:
   style-lang-attribute:
     - match: (?i:lang){{attribute_name_break}}
       scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set:
-        - meta_content_scope: meta.tag.style.begin.html meta.attribute-with-value.html
-        - match: =
-          scope: punctuation.separator.key-value.html
-          set:
-            - meta_scope: meta.tag.style.begin.html meta.attribute-with-value.html
-            - include: style-lang-decider
-        - match: (?=\S)
-          set: style-css
+      set: style-lang-attribute-assignment
+
+  style-lang-attribute-assignment:
+    - meta_content_scope: meta.tag.style.begin.html meta.attribute-with-value.html
+    - match: =
+      scope: punctuation.separator.key-value.html
+      set: style-lang-attribute-value
+    - match: (?=\S)
+      set: style-css
+
+  style-lang-attribute-value:
+    - meta_include_prototype: false
+    - meta_scope: meta.tag.style.begin.html meta.attribute-with-value.html
+    - include: style-lang-decider
 
   style-lang-decider:
     - !style_language [ sass, source.sass ]
@@ -235,15 +240,20 @@ contexts:
   script-lang-attribute:
     - match: (?i:lang){{attribute_name_break}}
       scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set:
-        - meta_content_scope: meta.tag.script.begin.html meta.attribute-with-value.html
-        - match: =
-          scope: punctuation.separator.key-value.html
-          set:
-            - meta_scope: meta.tag.script.begin.html meta.attribute-with-value.html
-            - include: script-lang-decider
-        - match: (?=\S)
-          set: script-javascript
+      set: script-lang-attribute-assignment
+
+  script-lang-attribute-assignment:
+    - meta_content_scope: meta.tag.script.begin.html meta.attribute-with-value.html
+    - match: =
+      scope: punctuation.separator.key-value.html
+      set: script-lang-attribute-value
+    - match: (?=\S)
+      set: script-javascript
+
+  script-lang-attribute-value:
+    - meta_include_prototype: false
+    - meta_scope: meta.tag.script.begin.html meta.attribute-with-value.html
+    - include: script-lang-decider
 
   script-lang-decider:
     - !script_language [ coffee, source.coffee ]
@@ -284,15 +294,20 @@ contexts:
   template-lang-attribute:
     - match: (?i:lang){{attribute_name_break}}
       scope: meta.attribute-with-value.html entity.other.attribute-name.html
-      set:
-        - meta_content_scope: meta.tag.template.begin.html meta.attribute-with-value.html
-        - match: =
-          scope: punctuation.separator.key-value.html
-          set:
-            - meta_scope: meta.tag.template.begin.html meta.attribute-with-value.html
-            - include: template-lang-decider
-        - match: (?=\S)
-          set: template-mustache
+      set: template-lang-attribute-assignment
+
+  template-lang-attribute-assignment:
+    - meta_content_scope: meta.tag.template.begin.html meta.attribute-with-value.html
+    - match: =
+      scope: punctuation.separator.key-value.html
+      set: template-lang-attribute-value
+    - match: (?=\S)
+      set: template-mustache
+
+  template-lang-attribute-value:
+    - meta_include_prototype: false
+    - meta_scope: meta.tag.template.begin.html meta.attribute-with-value.html
+    - include: template-lang-decider
 
   template-lang-decider:
     - !template_language [ jade, text.jade ]
