Fixed end of line bug. Added javascript highlighting for - and =

ChrisWroe · May 21, 2011 · 9507c7f · 9507c7f
1 parent 721c46d
commit 9507c7f
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/Syntaxes/Jade.tmLanguage b/Syntaxes/Jade.tmLanguage
@@ -10,33 +10,25 @@
 	<string>Jade</string>
 	<key>patterns</key>
 	<array>
-		<dict>
-			<key>begin</key>
-			<string>//</string>
-			<key>end</key>
-			<string>$\n?</string>
-			<key>name</key>
-			<string>comment.line.double-slash.jade</string>
-		</dict>
 		<dict>
 			<key>match</key>
 			<string>^(!!!)(\s*[a-zA-Z0-9-_]+)?</string>
 			<key>name</key>
 			<string>keyword.other.doctype.jade</string>
 		</dict>
-		<!--
 		<dict>
-			<key>match</key>
-			<string>^\s*\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|dd|del|details|dfn|div|dl|dt|em|fieldset|figcaption|figure|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|nav|noframes|noscript|object|ol|optgroup|option|p|param|pre|q|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|var_keys|video|\w+)\b(?!:)</string>
+			<key>begin</key>
+			<string>\s*//</string>
+			<key>end</key>
+			<string>$\n?</string>
 			<key>name</key>
-			<string>meta.tag.jade</string>
+			<string>comment.line.double-slash.jade</string>
 		</dict>
-		-->
 		<dict>
 			<key>begin</key>
 			<string>^\s*</string>
 			<key>end</key>
-			<string>\s</string>
+			<string>(\s+|$)</string>
 			<key>patterns</key>
 			<array>
 				<dict>
@@ -59,10 +51,23 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>\:[^$]+$</string>
+					<string>\:.+$</string>
 					<key>name</key>
 					<string>support.class.jade</string>
 				</dict>
+				<dict>
+					<key>begin</key>
+					<string>(=|-)\s+</string>
+					<key>end</key>
+					<string>$</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>source.js</string>
+						</dict>
+					</array>
+				</dict>
 				<dict>
 					<key>begin</key>
 					<string>\(</string>