Adds support for comments in JSON

PrismJS · Oct 25, 2018 · b4f456f · b4f456f
1 parent bfbe446
commit b4f456f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/components/prism-json.js b/components/prism-json.js
@@ -1,5 +1,9 @@
 Prism.languages.json = {
-	'property': /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/i,
+	'comment': /\/\/.*|\/\*[\s\S]*?(?:\*\/|$)/,
+	'property': {
+		pattern: /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/i,
+		greedy: true
+	},
 	'string': {
 		pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
 		greedy: true

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
@@ -0,0 +1,27 @@
+{
+	// Line comment
+	"//": "//",
+
+	/* Block comment */
+	"/*": "*/"
+}
+
+----------------------------------------------------
+
+[
+	["punctuation", "{"],
+	["comment", "// Line comment"],
+	["property", "\"//\""],
+	["operator", ":"],
+	["string", "\"//\""],
+	["punctuation", ","],
+	["comment", "/* Block comment */"],
+	["property", "\"/*\""],
+	["operator", ":"],
+	["string", "\"*/\""],
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for single-line and multi-line comments.