JSON: Greedy comments (#2479)

Comments are now greedy allowing them to break strings, properties, and each other.
PrismJS · Jul 30, 2020 · 158caf5 · 158caf5
1 parent f0f8210
commit 158caf5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/components/prism-json.js b/components/prism-json.js
@@ -8,7 +8,10 @@ Prism.languages.json = {
 		pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
 		greedy: true
 	},
-	'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
+	'comment': {
+		pattern: /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
+		greedy: true
+	},
 	'number': /-?\b\d+(?:\.\d+)?(?:e[+-]?\d+)?\b/i,
 	'punctuation': /[{}[\],]/,
 	'operator': /:/,

diff --git a/components/prism-json.min.js b/components/prism-json.min.js
diff --git a/tests/languages/json/comment_feature.test b/tests/languages/json/comment_feature.test
@@ -1,5 +1,5 @@
 {
-	// Line comment
+	// Line comment ""
 	"//": "//",
 
 	/* Block comment */
@@ -10,7 +10,7 @@
 
 [
 	["punctuation", "{"],
-	["comment", "// Line comment"],
+	["comment", "// Line comment \"\""],
 	["property", "\"//\""],
 	["operator", ":"],
 	["string", "\"//\""],