JSON: Fixed issues with properties and strings + added tests. Fix #1025

Author: Golmote

components/prism-json.js

@@ -1,11 +1,11 @@
 Prism.languages.json = {
-    'property': /".*?"(?=\s*:)/ig,
-    'string': /"(?!:)(\\?[^"])*?"(?!:)/g,
-    'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee]-?\d+)?)\b/g,
+    'property': /"(?:\\.|[^|"])*"(?=\s*:)/ig,
+    'string': /"(?!:)(?:\\.|[^|"])*"(?!:)/g,
+    'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)\b/g,
     'punctuation': /[{}[\]);,]/g,
     'operator': /:/g,
     'boolean': /\b(true|false)\b/gi,
-    'null': /\bnull\b/gi,
+    'null': /\bnull\b/gi
 };
 
 Prism.languages.jsonp = Prism.languages.json;

components/prism-json.min.js

@@ -0,0 +1,13 @@
+true
+false
+
+----------------------------------------------------
+
+[
+	["boolean", "true"],
+	["boolean", "false"]
+]
+
+----------------------------------------------------
+
+Checks for booleans.

tests/languages/json/boolean_feature.test

@@ -0,0 +1,11 @@
+null
+
+----------------------------------------------------
+
+[
+	["null", "null"]
+]
+
+----------------------------------------------------
+
+Checks for null.

tests/languages/json/null_feature.test

@@ -0,0 +1,21 @@
+0
+123
+3.14159
+5.0e8
+0.2E+2
+47e-5
+
+----------------------------------------------------
+
+[
+	["number", "0"],
+	["number", "123"],
+	["number", "3.14159"],
+	["number", "5.0e8"],
+	["number", "0.2E+2"],
+	["number", "47e-5"]
+]
+
+----------------------------------------------------
+
+Checks for numbers.

tests/languages/json/number_feature.test

@@ -0,0 +1,33 @@
+{"foo\"bar\"baz":1,"foo":2}
+{
+	"foo": 1,
+	"b\"ar": 2
+}
+
+----------------------------------------------------
+
+[
+	["punctuation", "{"],
+	["property", "\"foo\\\"bar\\\"baz\""],
+	["operator", ":"],
+	["number", "1"],
+	["punctuation", ","],
+	["property", "\"foo\""],
+	["operator", ":"],
+	["number", "2"],
+	["punctuation", "}"],
+
+	["punctuation", "{"],
+	["property", "\"foo\""],
+	["operator", ":"],
+	["number", "1"],
+	["punctuation", ","],
+	["property", "\"b\\\"ar\""],
+	["operator", ":"],
+	["number", "2"],
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for features.

tests/languages/json/property_feature.test

@@ -0,0 +1,27 @@
+""
+"foo"
+"foo\"bar\"baz"
+"\u2642\\ "
+{"foo":"bar","baz":"\""}
+
+----------------------------------------------------
+
+[
+	["string", "\"\""],
+	["string", "\"foo\""],
+	["string", "\"foo\\\"bar\\\"baz\""],
+	["string", "\"\\u2642\\\\ \""],
+	["punctuation", "{"],
+	["property", "\"foo\""],
+	["operator", ":"],
+	["string", "\"bar\""],
+	["punctuation", ","],
+	["property", "\"baz\""],
+	["operator", ":"],
+	["string", "\"\\\"\""],
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for strings.