Revert "C-like: Change order of comment patterns and make multi-line …

…one greedy. Fix #1337" This reverts commit b98e5b9
PrismJS · Mar 8, 2018 · cebacdf · cebacdf
1 parent 5d65847
commit cebacdf
Show file tree

Hide file tree

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