avoid highlighting & inside attribute values (fix #42)

yyx990803 · yyx990803 · commit c6b869648d2b · 2016-04-09T15:05:57.000-04:00
diff --git a/vue.YAML-tmLanguage b/vue.YAML-tmLanguage
@@ -240,15 +240,19 @@ patterns:
 
 repository:
 
-  entities:
+  string-entities:
     patterns:
     - name: constant.character.entity.html
       match: (&)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)
       captures:
         '1': {name: punctuation.definition.entity.html}
         '3': {name: punctuation.definition.entity.html}
+
+  entities:
+    patterns:
     - name: invalid.illegal.bad-ampersand.html
       match: '&'
+    - include: '#string-entities'
 
   string-double-quoted:
     name: string.quoted.double.html
@@ -259,7 +263,7 @@ repository:
     endCaptures:
       '0': {name: punctuation.definition.string.end.html}
     patterns:
-    - include: '#entities'
+    - include: '#string-entities'
 
   string-single-quoted:
     name: string.quoted.single.html
@@ -270,7 +274,7 @@ repository:
     endCaptures:
       '0': {name: punctuation.definition.string.end.html}
     patterns:
-    - include: '#entities'
+    - include: '#string-entities'
 
   tag-generic-attribute:
     name: entity.other.attribute-name.html
diff --git a/vue.tmLanguage b/vue.tmLanguage
@@ -796,31 +796,16 @@
 		<dict>
 			<key>patterns</key>
 			<array>
-				<dict>
-					<key>captures</key>
-					<dict>
-						<key>1</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.html</string>
-						</dict>
-						<key>3</key>
-						<dict>
-							<key>name</key>
-							<string>punctuation.definition.entity.html</string>
-						</dict>
-					</dict>
-					<key>match</key>
-					<string>(&amp;)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)</string>
-					<key>name</key>
-					<string>constant.character.entity.html</string>
-				</dict>
 				<dict>
 					<key>match</key>
 					<string>&amp;</string>
 					<key>name</key>
 					<string>invalid.illegal.bad-ampersand.html</string>
 				</dict>
+				<dict>
+					<key>include</key>
+					<string>#string-entities</string>
+				</dict>
 			</array>
 		</dict>
 		<key>string-double-quoted</key>
@@ -851,7 +836,32 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#entities</string>
+					<string>#string-entities</string>
+				</dict>
+			</array>
+		</dict>
+		<key>string-entities</key>
+		<dict>
+			<key>patterns</key>
+			<array>
+				<dict>
+					<key>captures</key>
+					<dict>
+						<key>1</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.entity.html</string>
+						</dict>
+						<key>3</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.entity.html</string>
+						</dict>
+					</dict>
+					<key>match</key>
+					<string>(&amp;)([a-zA-Z0-9]+|#[0-9]+|#x[0-9a-fA-F]+)(;)</string>
+					<key>name</key>
+					<string>constant.character.entity.html</string>
 				</dict>
 			</array>
 		</dict>
@@ -883,7 +893,7 @@
 			<array>
 				<dict>
 					<key>include</key>
-					<string>#entities</string>
+					<string>#string-entities</string>
 				</dict>
 			</array>
 		</dict>
