From d68ee9c1f7005fed3cbb5f996480bf5b649bcc29 Mon Sep 17 00:00:00 2001
From: ExE Boss <3889017+ExE-Boss@users.noreply.github.com>
Date: Mon, 14 Jan 2019 22:00:00 +0100
Subject: [PATCH] =?UTF-8?q?Bug=C2=A01520004:=20Update=20Prism=20to=C2=A0ve?=
 =?UTF-8?q?rsion=C2=A01.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bower.json                                         |  3 ++-
 kuma/settings/common.py                            |  2 +-
 kuma/static/js/libs/prism/prism-json.js            | 14 ++++++++++++++
 kuma/static/js/prism-mdn/components/prism-json.css |  3 ---
 kuma/static/js/prism-mdn/components/prism-json.js  |  4 ----
 kuma/static/styles/libs/prism/prism.css            |  8 +++++---
 6 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 kuma/static/js/libs/prism/prism-json.js
 delete mode 100644 kuma/static/js/prism-mdn/components/prism-json.css
 delete mode 100644 kuma/static/js/prism-mdn/components/prism-json.js

diff --git a/bower.json b/bower.json
index 1ca654f4b5..c1ee47b753 100644
--- a/bower.json
+++ b/bower.json
@@ -3,7 +3,7 @@
     "dependencies": {
         "html5shiv": "3.6.2",
         "jquery": "2.2.0",
-        "prism": "1.2.0",
+        "prism": "1.15.0",
         "selectivizr": "https://github.com/keithclark/selectivizr.git#1.0.2"
     },
     "install": {
@@ -19,6 +19,7 @@
                 "bower_components/prism/components/prism-css.js",
                 "bower_components/prism/components/prism-clike.js",
                 "bower_components/prism/components/prism-javascript.js",
+                "bower_components/prism/components/prism-json.js",
                 "bower_components/prism/components/prism-css-extras.js",
                 "bower_components/prism/components/prism-rust.js",
                 "bower_components/prism/plugins/line-highlight/prism-line-highlight.js",
diff --git a/kuma/settings/common.py b/kuma/settings/common.py
index e1045f2836..34181a92f0 100644
--- a/kuma/settings/common.py
+++ b/kuma/settings/common.py
@@ -988,12 +988,12 @@ def pipeline_one_scss(slug, **kwargs):
             "js/libs/prism/prism-css.js",
             "js/libs/prism/prism-clike.js",
             "js/libs/prism/prism-javascript.js",
+            "js/libs/prism/prism-json.js",
             "js/libs/prism/prism-css-extras.js",
             "js/libs/prism/prism-rust.js",
             "js/libs/prism/prism-line-highlight.js",
             "js/libs/prism/prism-line-numbers.js",
 
-            'js/prism-mdn/components/prism-json.js',
             'js/syntax-prism.js',
         ),
         'output_filename': 'build/js/syntax-prism.js',
diff --git a/kuma/static/js/libs/prism/prism-json.js b/kuma/static/js/libs/prism/prism-json.js
new file mode 100644
index 0000000000..06e847ec60
--- /dev/null
+++ b/kuma/static/js/libs/prism/prism-json.js
@@ -0,0 +1,14 @@
+Prism.languages.json = {
+	'property': /"(?:\\.|[^\\"\r\n])*"(?=\s*:)/i,
+	'string': {
+		pattern: /"(?:\\.|[^\\"\r\n])*"(?!\s*:)/,
+		greedy: true
+	},
+	'number': /\b0x[\dA-Fa-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)(?:[Ee][+-]?\d+)?/,
+	'punctuation': /[{}[\]);,]/,
+	'operator': /:/g,
+	'boolean': /\b(?:true|false)\b/i,
+	'null': /\bnull\b/i
+};
+
+Prism.languages.jsonp = Prism.languages.json;
diff --git a/kuma/static/js/prism-mdn/components/prism-json.css b/kuma/static/js/prism-mdn/components/prism-json.css
deleted file mode 100644
index ed7e06cdb1..0000000000
--- a/kuma/static/js/prism-mdn/components/prism-json.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.token.key {
-	color: #960;
-}
\ No newline at end of file
diff --git a/kuma/static/js/prism-mdn/components/prism-json.js b/kuma/static/js/prism-mdn/components/prism-json.js
deleted file mode 100644
index aa22b0d589..0000000000
--- a/kuma/static/js/prism-mdn/components/prism-json.js
+++ /dev/null
@@ -1,4 +0,0 @@
-Prism.languages.json = Prism.languages.extend('javascript');
-Prism.languages.insertBefore('json', 'string', {
-    'key': /("|')(\\?.)*?\1(\s+)?\:/g
-});
diff --git a/kuma/static/styles/libs/prism/prism.css b/kuma/static/styles/libs/prism/prism.css
index e81ebeddc6..9010cb637e 100644
--- a/kuma/static/styles/libs/prism/prism.css
+++ b/kuma/static/styles/libs/prism/prism.css
@@ -7,9 +7,9 @@
 code[class*="language-"],
 pre[class*="language-"] {
 	color: black;
+	background: none;
 	text-shadow: 0 1px white;
 	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-	direction: ltr;
 	text-align: left;
 	white-space: pre;
 	word-spacing: normal;
@@ -62,6 +62,7 @@ pre[class*="language-"] {
 :not(pre) > code[class*="language-"] {
 	padding: .1em;
 	border-radius: .3em;
+	white-space: normal;
 }
 
 .token.comment,
@@ -103,7 +104,7 @@ pre[class*="language-"] {
 .token.url,
 .language-css .token.string,
 .style .token.string {
-	color: #a67f59;
+	color: #9a6e3a;
 	background: hsla(0, 0%, 100%, .5);
 }
 
@@ -113,7 +114,8 @@ pre[class*="language-"] {
 	color: #07a;
 }
 
-.token.function {
+.token.function,
+.token.class-name {
 	color: #DD4A68;
 }