Commit 98acd2d7f36e82b49e2f1e227e935968b1751c2b

Golmote 2017-10-21T14:44:09

JSON: Make strings greedy, remove negative look-ahead for ":". Fix #1204

diff --git a/components/prism-json.js b/components/prism-json.js
index 8ae3747..90c2598 100644
--- a/components/prism-json.js
+++ b/components/prism-json.js
@@ -1,6 +1,9 @@
 Prism.languages.json = {
 	'property': /"(?:\\.|[^\\"])*"(?=\s*:)/ig,
-	'string': /"(?!:)(?:\\.|[^\\"])*"(?!:)/g,
+	'string': {
+		pattern: /"(?:\\.|[^\\"])*"(?!:)/g,
+		greedy: true
+	},
 	'number': /\b-?(0x[\dA-Fa-f]+|\d*\.?\d+([Ee][+-]?\d+)?)\b/g,
 	'punctuation': /[{}[\]);,]/g,
 	'operator': /:/g,
diff --git a/components/prism-json.min.js b/components/prism-json.min.js
index e53db90..8a8623c 100644
--- a/components/prism-json.min.js
+++ b/components/prism-json.min.js
@@ -1 +1 @@
-Prism.languages.json={property:/"(?:\\.|[^\\"])*"(?=\s*:)/gi,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},Prism.languages.jsonp=Prism.languages.json;
\ No newline at end of file
+Prism.languages.json={property:/"(?:\\.|[^\\"])*"(?=\s*:)/gi,string:{pattern:/"(?:\\.|[^\\"])*"(?!:)/g,greedy:!0},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},Prism.languages.jsonp=Prism.languages.json;
\ No newline at end of file