Merge pull request vuejs#37 from jpokrzyk/master

yyx990803 · yyx990803 · commit fbcccaee1043 · 2016-03-05T19:57:25.000-05:00
Properly highlight tags with dashes in their name
diff --git a/vue.YAML-tmLanguage b/vue.YAML-tmLanguage
@@ -7,7 +7,7 @@ uuid: 5512c10d-4cc5-434c-b8fc-53b912f55ab3
 
 patterns:
 - name: meta.tag.any.html
-  begin: (<)([a-zA-Z0-9:]++)(?=[^>]*></\2>)
+  begin: (<)([a-zA-Z0-9:-]++)(?=[^>]*></\2>)
   beginCaptures:
     '1': {name: punctuation.definition.tag.begin.html}
     '2': {name: entity.name.tag.html}
@@ -220,7 +220,7 @@ patterns:
   - include: '#tag-stuff'
 
 - name: meta.tag.other.html
-  begin: (</?)([a-zA-Z0-9:]+)
+  begin: (</?)([a-zA-Z0-9:-]+)
   beginCaptures:
     '1': {name: punctuation.definition.tag.begin.html}
     '2': {name: entity.name.tag.other.html}
diff --git a/vue.tmLanguage b/vue.tmLanguage
@@ -34,7 +34,7 @@
 	<array>
 		<dict>
 			<key>begin</key>
-			<string>(&lt;)([a-zA-Z0-9:]++)(?=[^&gt;]*&gt;&lt;/\2&gt;)</string>
+			<string>(&lt;)([a-zA-Z0-9:-]++)(?=[^&gt;]*&gt;&lt;/\2&gt;)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
@@ -741,7 +741,7 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(&lt;/?)([a-zA-Z0-9:]+)</string>
+			<string>(&lt;/?)([a-zA-Z0-9:-]+)</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
