Fortran: more bullet-proof pattern for comments inside strings.

PrismJS · Jul 18, 2015 · 40ae215 · 40ae215
1 parent fa286aa
commit 40ae215
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/components/prism-fortran.js b/components/prism-fortran.js
@@ -4,9 +4,12 @@ Prism.languages.fortran = {
 		alias: 'number'
 	},
 	'string': {
-		pattern: /(?:\w+_)?(['"])(?:\1\1|&\n(?:\s*!.+\n)?|(?!\1).)*(?:\1|&)/,
+		pattern: /(?:\w+_)?(['"])(?:\1\1|&(?:\r\n?|\n)(?:\s*!.+(?:\r\n?|\n))?|(?!\1).)*(?:\1|&)/,
 		inside: {
-			'comment': /!.*/
+			'comment': {
+				pattern: /(&(?:\r\n?|\n)\s*)!.*/,
+				lookbehind: true
+			}
 		}
 	},
 	'comment': /!.*/,

diff --git a/components/prism-fortran.min.js b/components/prism-fortran.min.js