C-like: Change order of comment patterns and make multi-line one gree…

…dy. Fix #1337
PrismJS · Mar 7, 2018 · b98e5b9 · b98e5b9
1 parent b70feb8
commit b98e5b9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/components/prism-clike.js b/components/prism-clike.js
@@ -1,12 +1,13 @@
 Prism.languages.clike = {
 	'comment': [
 		{
-			pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
+			pattern: /(^|[^\\:])\/\/.*/,
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^\\:])\/\/.*/,
-			lookbehind: true
+			pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
+			lookbehind: true,
+			greedy: true
 		}
 	],
 	'string': {

diff --git a/components/prism-clike.min.js b/components/prism-clike.min.js
diff --git a/prism.js b/prism.js
@@ -669,12 +669,13 @@ if (Prism.languages.markup) {
 Prism.languages.clike = {
 	'comment': [
 		{
-			pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
+			pattern: /(^|[^\\:])\/\/.*/,
 			lookbehind: true
 		},
 		{
-			pattern: /(^|[^\\:])\/\/.*/,
-			lookbehind: true
+			pattern: /(^|[^\\])\/\*[\s\S]*?(?:\*\/|$)/,
+			lookbehind: true,
+			greedy: true
 		}
 	],
 	'string': {