Improve comment.line match.

textmate · Nov 13, 2011 · 1f44892 · 1f44892
1 parent e5fad42
commit 1f44892
Showing 1 changed file with 50 additions and 16 deletions.
diff --git a/Syntaxes/Fortran - Modern.tmLanguage b/Syntaxes/Fortran - Modern.tmLanguage
@@ -202,47 +202,81 @@
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>(!-)</string>
+			<string>(^[ \t]+)?(?=!-)</string>
 			<key>beginCaptures</key>
 			<dict>
-				<key>0</key>
+				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.comment.fortran</string>
+					<string>punctuation.whitespace.comment.leading.ruby</string>
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>$\n?</string>
-			<key>name</key>
-			<string>comment.line.exclamation.mark.fortran.modern</string>
+			<string>(?!\G)</string>
 			<key>patterns</key>
 			<array>
 				<dict>
-					<key>match</key>
-					<string>\\\s*\n</string>
+					<key>begin</key>
+					<string>!-</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.comment.fortran</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>\n</string>
+					<key>name</key>
+					<string>comment.line.exclamation.mark.fortran.modern</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>match</key>
+							<string>\\\s*\n</string>
+						</dict>
+					</array>
 				</dict>
 			</array>
 		</dict>
 		<dict>
 			<key>begin</key>
-			<string>[!]</string>
+			<string>(^[ \t]+)?(?=!)</string>
 			<key>beginCaptures</key>
 			<dict>
-				<key>0</key>
+				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.comment.fortran</string>
+					<string>punctuation.whitespace.comment.leading.ruby</string>
 				</dict>
 			</dict>
 			<key>end</key>
-			<string>$\n?</string>
-			<key>name</key>
-			<string>comment.line.exclamation.fortran.modern</string>
+			<string>(?!\G)</string>
 			<key>patterns</key>
 			<array>
 				<dict>
-					<key>match</key>
-					<string>\\\s*\n</string>
+					<key>begin</key>
+					<string>!</string>
+					<key>beginCaptures</key>
+					<dict>
+						<key>0</key>
+						<dict>
+							<key>name</key>
+							<string>punctuation.definition.comment.fortran</string>
+						</dict>
+					</dict>
+					<key>end</key>
+					<string>\n</string>
+					<key>name</key>
+					<string>comment.line.exclamation.fortran.modern</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>match</key>
+							<string>\\\s*\n</string>
+						</dict>
+					</array>
 				</dict>
 			</array>
 		</dict>