also highlight interpolations

yyx990803 · yyx990803 · commit 16b6051f20b4 · 2016-04-10T13:39:11.000-04:00
diff --git a/vue.YAML-tmLanguage b/vue.YAML-tmLanguage
@@ -6,6 +6,8 @@ fileTypes: [vue]
 uuid: 5512c10d-4cc5-434c-b8fc-53b912f55ab3
 
 patterns:
+- include: '#vue-interpolations'
+
 - name: meta.tag.any.html
   begin: (<)([a-zA-Z0-9:-]++)(?=[^>]*></\2>)
   beginCaptures:
@@ -239,6 +241,48 @@ patterns:
   match: <
 
 repository:
+  vue-interpolations:
+    patterns:
+    - name: expression.embbeded.vue
+      begin: \{\{\{?
+      end: \}\}\}?
+      beginCaptures:
+        '0': {name: punctuation.definition.tag.begin.html}
+      endCaptures:
+        '0': {name: punctuation.definition.tag.end.html}
+      patterns:
+      - include: source.js
+
+  vue-directives:
+    name: meta.directive.vue
+    begin: (?:\b(v-)|(:|@))([a-zA-Z\-]+)(?:\:([a-zA-Z\-]+))?(?:\.([a-zA-Z\-]+))*\s*(=)
+    end: (?<='|")
+    captures:
+      '1': {name: entity.other.attribute-name.html}
+      '2': {name: punctuation.separator.key-value.html}
+      '3': {name: entity.other.attribute-name.html}
+      '4': {name: entity.other.attribute-name.html}
+      '5': {name: entity.other.attribute-name.html}
+      '6': {name: punctuation.separator.key-value.html}
+    patterns:
+    - name: source.directive.vue
+      begin: '"'
+      beginCaptures:
+        '0': {name: punctuation.definition.string.begin.html}
+      end: '"'
+      endCaptures:
+        '0': {name: punctuation.definition.string.end.html}
+      patterns:
+      - include: source.js
+    - name: source.directive.vue
+      begin: ''''
+      beginCaptures:
+        '0': {name: punctuation.definition.string.begin.html}
+      end: ''''
+      endCaptures:
+        '0': {name: punctuation.definition.string.end.html}
+      patterns:
+      - include: source.js
 
   entities:
     patterns:
@@ -259,6 +303,7 @@ repository:
     endCaptures:
       '0': {name: punctuation.definition.string.end.html}
     patterns:
+    - include: '#vue-interpolations'
     - include: '#entities'
 
   string-single-quoted:
@@ -270,39 +315,9 @@ repository:
     endCaptures:
       '0': {name: punctuation.definition.string.end.html}
     patterns:
+    - include: '#vue-interpolations'
     - include: '#entities'
 
-  vue-directive:
-    name: meta.directive.vue
-    begin: (?:\b(v-)|(:|@))([a-zA-Z\-]+)(?:\:([a-zA-Z\-]+))?(?:\.([a-zA-Z\-]+))*\s*(=)
-    end: (?<='|")
-    captures:
-      '1': {name: entity.other.attribute-name.html}
-      '2': {name: punctuation.separator.key-value.html}
-      '3': {name: entity.other.attribute-name.html}
-      '4': {name: entity.other.attribute-name.html}
-      '5': {name: entity.other.attribute-name.html}
-      '6': {name: punctuation.separator.key-value.html}
-    patterns:
-    - name: source.directive.vue
-      begin: '"'
-      beginCaptures:
-        '0': {name: punctuation.definition.string.begin.html}
-      end: '"'
-      endCaptures:
-        '0': {name: punctuation.definition.string.end.html}
-      patterns:
-      - include: source.js
-    - name: source.directive.vue
-      begin: ''''
-      beginCaptures:
-        '0': {name: punctuation.definition.string.begin.html}
-      end: ''''
-      endCaptures:
-        '0': {name: punctuation.definition.string.end.html}
-      patterns:
-      - include: source.js
-
   tag-generic-attribute:
     name: entity.other.attribute-name.html
     match: \b([a-zA-Z\-:]+)
@@ -324,6 +339,7 @@ repository:
       endCaptures:
         '0': {name: punctuation.definition.string.end.html}
       patterns:
+      - include: '#vue-interpolations'
       - include: '#entities'
     - name: string.quoted.single.html
       contentName: meta.toc-list.id.html
@@ -334,11 +350,12 @@ repository:
       endCaptures:
         '0': {name: punctuation.definition.string.end.html}
       patterns:
+      - include: '#vue-interpolations'
       - include: '#entities'
 
   tag-stuff:
     patterns:
-    - include: '#vue-directive'
+    - include: '#vue-directives'
     - include: '#tag-id-attribute'
     - include: '#tag-generic-attribute'
     - include: '#string-double-quoted'
diff --git a/vue.tmLanguage b/vue.tmLanguage
@@ -30,6 +30,10 @@
 	<string>Vue Component</string>
 	<key>patterns</key>
 	<array>
+		<dict>
+			<key>include</key>
+			<string>#vue-interpolations</string>
+		</dict>
 		<dict>
 			<key>begin</key>
 			<string>(&lt;)([a-zA-Z0-9:-]++)(?=[^&gt;]*&gt;&lt;/\2&gt;)</string>
@@ -849,6 +853,10 @@
 			<string>string.quoted.double.html</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#vue-interpolations</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#entities</string>
@@ -881,6 +889,10 @@
 			<string>string.quoted.single.html</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#vue-interpolations</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#entities</string>
@@ -944,6 +956,10 @@
 					<string>string.quoted.double.html</string>
 					<key>patterns</key>
 					<array>
+						<dict>
+							<key>include</key>
+							<string>#vue-interpolations</string>
+						</dict>
 						<dict>
 							<key>include</key>
 							<string>#entities</string>
@@ -977,6 +993,10 @@
 					<string>string.quoted.single.html</string>
 					<key>patterns</key>
 					<array>
+						<dict>
+							<key>include</key>
+							<string>#vue-interpolations</string>
+						</dict>
 						<dict>
 							<key>include</key>
 							<string>#entities</string>
@@ -991,7 +1011,7 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#vue-directive</string>
+					<string>#vue-directives</string>
 				</dict>
 				<dict>
 					<key>include</key>
@@ -1011,7 +1031,7 @@
 				</dict>
 			</array>
 		</dict>
-		<key>vue-directive</key>
+		<key>vue-directives</key>
 		<dict>
 			<key>begin</key>
 			<string>(?:\b(v-)|(:|@))([a-zA-Z\-]+)(?:\:([a-zA-Z\-]+))?(?:\.([a-zA-Z\-]+))*\s*(=)</string>
@@ -1118,6 +1138,43 @@
 				</dict>
 			</array>
 		</dict>
+		<key>vue-interpolations</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>\{\{\{?</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.begin.html</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>\}\}\}?</string>
+					<key>endCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.tag.end.html</string>
+						</dict>
+					</dict>
+					<key>name</key>
+					<string>expression.embbeded.vue</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>source.js</string>
+						</dict>
+					</array>
+				</dict>
+			</array>
+		</dict>
 	</dict>
 	<key>scopeName</key>
 	<string>text.html.vue</string>
