Improve comment.line match.

textmate · Nov 21, 2011 · 8ff10dd · 8ff10dd
1 parent 61a959c
commit 8ff10dd
Showing 1 changed file with 51 additions and 13 deletions.
diff --git a/Syntaxes/qmake Project.tmLanguage b/Syntaxes/qmake Project.tmLanguage
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>fileTypes</key>
@@ -233,18 +233,37 @@
 					</array>
 				</dict>
 				<dict>
-					<key>captures</key>
+					<key>begin</key>
+					<string>(^[ \t]+)?(?=#)</string>
+					<key>beginCaptures</key>
 					<dict>
 						<key>1</key>
 						<dict>
 							<key>name</key>
-							<string>punctuation.definition.comment.qmake</string>
+							<string>punctuation.whitespace.comment.leading.qmake</string>
 						</dict>
 					</dict>
-					<key>match</key>
+					<key>end</key>
-					<string>(#).*$\n?</string>
+					<string>(?!\G)</string>
-					<key>name</key>
+					<key>patterns</key>
-					<string>comment.line.number-sign.qmake</string>
+					<array>
+						<dict>
+							<key>begin</key>
+							<string>#</string>
+							<key>beginCaptures</key>
+							<dict>
+								<key>0</key>
+								<dict>
+									<key>name</key>
+									<string>punctuation.definition.comment.qmake</string>
+								</dict>
+							</dict>
+							<key>end</key>
+							<string>\n</string>
+							<key>name</key>
+							<string>comment.line.number-sign.qmake</string>
+						</dict>
+					</array>
 				</dict>
 			</array>
 		</dict>
@@ -286,18 +305,37 @@
 			<string>keyword.other.scope.qmake</string>
 		</dict>
 		<dict>
-			<key>captures</key>
+			<key>begin</key>
+			<string>(^[ \t]+)?(?=#)</string>
+			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.comment.qmake</string>
+					<string>punctuation.whitespace.comment.leading.qmake</string>
 				</dict>
 			</dict>
-			<key>match</key>
+			<key>end</key>
-			<string>(#).*$\n?</string>
+			<string>(?!\G)</string>
-			<key>name</key>
+			<key>patterns</key>
-			<string>comment.line.number-sign.qmake</string>
+			<array>
+				<dict>
+					<key>begin</key>
+					<string>#</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.comment.qmake</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>\n</string>
+					<key>name</key>
+					<string>comment.line.number-sign.qmake</string>
+				</dict>
+			</array>
 		</dict>
 	</array>
 	<key>scopeName</key>