Use older style of embedding scope in syntax highlight

skyronic · skyronic · commit 3beb4ba2720c · 2017-11-15T15:12:43.000+05:30
diff --git a/Vue Component.sublime-syntax b/Vue Component.sublime-syntax
@@ -13,7 +13,6 @@ contexts:
         - match: "-->"
           scope: punctuation.definition.comment.begin.html
           pop: true
-
     - include: template_langs
     - match: '(<)(template).*(>)'
       captures:
@@ -28,26 +27,11 @@ contexts:
             2: entity.name.tag.custom.html
             3: punctuation.definition.tag.begin.html
           pop: true
-        - include: template_content
+        - include: template_embeds
     - include: scripts
     - include: styles
-    
-  template_langs:
-    - match: (<)(template)\b[^>]*(lang)\s*=\s*([\'\"]pug[\'\"])\s*.*(>)
-      captures:
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: entity.other.attribute-name.html
-        4: string.quoted.double.html
-        5: meta.tag.script.end.html
-      embed: scope:text.pug
-      escape: (</)(template)(>)
-      escape_captures: 
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
 
-  template_content:
+  template_embeds:
     - match: (?:^|\s+)(v-\S+|:\S+|@\S+)\b\s*(=)\s*(")\s*
       captures:
         1: entity.other.attribute-name.event.html
@@ -58,38 +42,69 @@ contexts:
           scope: punctuation.definition.string.end.html string.quoted.double.html
           pop: true
         - include: scope:source.js
-    - match: '{{'
-      embed: 'scope:source.js'
-      escape: '}}'
+    - match: (?:^|\s+)(v-\S+|:\S+|@\S+)\b\s*(=)\s*(')\s*
+      captures:
+        1: entity.other.attribute-name.event.html
+        2: punctuation.separator.key-value.html
+        3: punctuation.definition.string.begin.html string.quoted.single.html
+      push:
+        - match: "'"
+          scope: punctuation.definition.string.end.html string.quoted.single.html
+          pop: true
+        - include: scope:source.js
+    - match: '({{)'
+      push:
+        - match: '(}})'
+          pop: true
+        - include: scope:source.js
 
-  scripts:
-    - match: (<)(script)\b[^>]*(lang)\s*=\s*([\'\"]coffee[\'\"])\s*.*(>)
+  template_langs:
+    - match: (<)(template)\b[^>]*(lang)\s*=\s*([\'\"]pug[\'\"])\s*.*(>)
       captures:
         1: punctuation.definition.tag.begin.html
         2: entity.name.tag.script.html
         3: entity.other.attribute-name.html
         4: string.quoted.double.html
         5: meta.tag.script.end.html
-      embed: scope:source.coffee
-      escape: (</)(script)(>)
-      escape_captures: 
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
-    # If no lang is set, fall back to js
-    - match: (<)(script).*(>)
+      push:
+        - match: (</)(template)(>)
+          captures: 
+            1: punctuation.definition.tag.begin.html
+            2: entity.name.tag.style.html
+            3: punctuation.definition.tag.end.html
+          pop: true
+        - include: scope:text.pug
+
+
+  scripts:
+    - match: (<)(script)\b[^>]*(lang)\s*=\s*([\'\"]coffee[\'\"])\s*.*(>)
       captures:
         1: punctuation.definition.tag.begin.html
         2: entity.name.tag.script.html
         3: entity.other.attribute-name.html
         4: string.quoted.double.html
         5: meta.tag.script.end.html
-      embed: scope:source.js
-      escape: (</)(script)(>)
-      escape_captures: 
+      push:
+        - match: (</)(script)(>)
+          pop: true
+          captures: 
+            1: punctuation.definition.tag.begin.html
+            2: entity.name.tag.script.html
+            3: meta.tag.script.end.html
+        - include: scope:source.coffee
+    - match: (<)(script).*(>)
+      captures:
         1: punctuation.definition.tag.begin.html
         2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
+        3: punctuation.definition.tag.end.html
+      push:
+        - match: (</)(script)(>)
+          captures: 
+            1: punctuation.definition.tag.begin.html
+            2: entity.name.tag.script.html
+            3: punctuation.definition.tag.end.html
+          pop: true
+        - include: scope:source.js
 
   styles:
     - match: (<)(style)\b[^>]*(lang)\s*=\s*([\'\"]stylus[\'\"])\s*.*(>)
@@ -99,49 +114,57 @@ contexts:
         3: entity.other.attribute-name.html
         4: string.quoted.double.html
         5: meta.tag.script.end.html
-      embed: scope:source.stylus
-      escape: (</)(style).*(>)
-      escape_captures: 
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
+      push:
+        - match: (</)(style)(>)
+          captures: 
+            1: punctuation.definition.tag.begin.html
+            2: entity.name.tag.style.html
+            3: punctuation.definition.tag.end.html
+          pop: true
+        - include: scope:source.stylus
+
     - match: (<)(style)\b[^>]*(lang)\s*=\s*([\'\"]sass[\'\"])\s*.*(>)
       captures:
         1: punctuation.definition.tag.begin.html
         2: entity.name.tag.script.html
         3: entity.other.attribute-name.html
         4: string.quoted.double.html
         5: meta.tag.script.end.html
-      embed: scope:source.sass
-      escape: (</)(style).*(>)
-      escape_captures: 
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
+      push:
+        - match: (</)(style)(>)
+          captures: 
+            1: punctuation.definition.tag.begin.html
+            2: entity.name.tag.style.html
+            3: punctuation.definition.tag.end.html
+          pop: true
+        - include: scope:source.sass
     - match: (<)(style)\b[^>]*(lang)\s*=\s*([\'\"]scss[\'\"])\s*.*(>)
       captures:
         1: punctuation.definition.tag.begin.html
         2: entity.name.tag.script.html
         3: entity.other.attribute-name.html
         4: string.quoted.double.html
         5: meta.tag.script.end.html
-      embed: scope:source.scss
-      escape: (</)(style).*(>)
-      escape_captures: 
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
+      push:
+        - match: (</)(style)(>)
+          captures: 
+            1: punctuation.definition.tag.begin.html
+            2: entity.name.tag.style.html
+            3: punctuation.definition.tag.end.html
+          pop: true
+        - include: scope:source.scss
+
     - match: (<)(style).*(>)
       captures:
         1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
-      embed: scope:source.css
-      escape: (</)(style).*(>)
-      escape_captures: 
-        1: punctuation.definition.tag.begin.html
-        2: entity.name.tag.script.html
-        3: meta.tag.script.end.html
-
-
+        2: entity.name.tag.style.html
+        3: punctuation.definition.tag.end.html
+      push:
+        - match: (</)(style)(>)
+          captures: 
+            1: punctuation.definition.tag.begin.html
+            2: entity.name.tag.style.html
+            3: punctuation.definition.tag.end.html
+          pop: true
+        - include: scope:source.css
 
