JSON: Kinda fixed comment issue (#1853)

RunDevelopment · web-flow · commit cbe05ec391f7 · 2019-04-23T20:52:47.000+02:00
This is a partial workaround for the greedy matching bug so that pure JSON will always be matched correctly while JSON + comments might suffer from some issues.
diff --git a/components/prism-json.js b/components/prism-json.js
@@ -1,5 +1,4 @@
 Prism.languages.json = {
-	'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
 	'property': {
 		pattern: /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/,
 		greedy: true
@@ -8,6 +7,7 @@ Prism.languages.json = {
 		pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
 		greedy: true
 	},
+	'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
 	'number': /-?\d+\.?\d*(e[+-]?\d+)?/i,
 	'punctuation': /[{}[\],]/,
 	'operator': /:/,
diff --git a/components/prism-json.min.js b/components/prism-json.min.js
diff --git a/tests/languages/json/issue1852.test b/tests/languages/json/issue1852.test
@@ -0,0 +1,27 @@
+{
+	"A": "/*",
+	"B": "B",
+	"C": "C"
+}
+
+----------------------------------------------------
+
+[
+	["punctuation", "{"],
+	["property", "\"A\""],
+	["operator", ":"],
+	["string", "\"/*\""],
+	["punctuation", ","],
+	["property", "\"B\""],
+	["operator", ":"],
+	["string", "\"B\""],
+	["punctuation", ","],
+	["property", "\"C\""],
+	["operator", ":"],
+	["string", "\"C\""],
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for issue #1852.
