JSONP support fix

components.json

@@ -398,12 +398,13 @@
 		},
 		"json": {
 			"title": "JSON",
-			"alias": "jsonp",
-			"aliasTitles": {
-				"jsonp": "JSONP"
-			},
 			"owner": "CupOfTea696"
 		},
+		"jsonp": {
+			"title": "JSONP",
+			"require": "json",
+			"owner": "RunDevelopment"
+		},
 		"julia": {
 			"title": "Julia",
 			"owner": "cdagnino"

components/prism-json.js

@@ -17,5 +17,3 @@ Prism.languages.json = {
 		alias: 'keyword'
 	}
 };
-
-Prism.languages.jsonp = Prism.languages.json;

components/prism-jsonp.js

@@ -0,0 +1,7 @@
+Prism.languages.jsonp = Prism.languages.extend('json', {
+	'punctuation': /[{}[\]();,.]/
+});
+
+Prism.languages.insertBefore('jsonp', 'punctuation', {
+	'function': /[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\()/
+});

examples/prism-json.html

@@ -0,0 +1,19 @@
+<h2>Full example</h2>
+<pre><code>{
+    "data": {
+        "labels": [
+            "foo",
+            "bar"
+        ],
+        "series": [
+            [ 0, 1, 2, 3 ],
+            [ 0, -4, -8, -12 ]
+        ]
+    },
+    // we even support comments
+    "error": null,
+    "status": "Ok"
+}</code></pre>
+
+<h2>JSONP</h2>
+<pre><code>callback({ "data": null });</code></pre>

plugins/autoloader/prism-autoloader.js

@@ -4,7 +4,7 @@
 	}
 
 	// The dependencies map is built automatically with gulp
-	var lang_dependencies = /*languages_placeholder[*/{"javascript":"clike","actionscript":"javascript","arduino":"cpp","aspnet":["markup","csharp"],"bison":"c","c":"clike","csharp":"clike","cpp":"c","coffeescript":"javascript","crystal":"ruby","css-extras":"css","d":"clike","dart":"clike","django":"markup","erb":["ruby","markup-templating"],"fsharp":"clike","flow":"javascript","glsl":"clike","gml":"clike","go":"clike","groovy":"clike","haml":"ruby","handlebars":"markup-templating","haxe":"clike","java":"clike","jolie":"clike","kotlin":"clike","less":"css","markdown":"markup","markup-templating":"markup","n4js":"javascript","nginx":"clike","objectivec":"c","opencl":"cpp","parser":"markup","php":["clike","markup-templating"],"php-extras":"php","plsql":"sql","processing":"clike","protobuf":"clike","pug":"javascript","qore":"clike","jsx":["markup","javascript"],"tsx":["jsx","typescript"],"reason":"clike","ruby":"clike","sass":"css","scss":"css","scala":"java","smarty":"markup-templating","soy":"markup-templating","swift":"clike","tap":"yaml","textile":"markup","tt2":["clike","markup-templating"],"twig":"markup","typescript":"javascript","vala":"clike","vbnet":"basic","velocity":"markup","wiki":"markup","xeora":"markup","xquery":"markup"}/*]*/;
+	var lang_dependencies = /*languages_placeholder[*/{"javascript":"clike","actionscript":"javascript","arduino":"cpp","aspnet":["markup","csharp"],"bison":"c","c":"clike","csharp":"clike","cpp":"c","coffeescript":"javascript","crystal":"ruby","css-extras":"css","d":"clike","dart":"clike","django":"markup","erb":["ruby","markup-templating"],"fsharp":"clike","flow":"javascript","glsl":"clike","gml":"clike","go":"clike","groovy":"clike","haml":"ruby","handlebars":"markup-templating","haxe":"clike","java":"clike","jolie":"clike","jsonp":"json","kotlin":"clike","less":"css","markdown":"markup","markup-templating":"markup","n4js":"javascript","nginx":"clike","objectivec":"c","opencl":"cpp","parser":"markup","php":["clike","markup-templating"],"php-extras":"php","plsql":"sql","processing":"clike","protobuf":"clike","pug":"javascript","qore":"clike","jsx":["markup","javascript"],"tsx":["jsx","typescript"],"reason":"clike","ruby":"clike","sass":"css","scss":"css","scala":"java","smarty":"markup-templating","soy":"markup-templating","swift":"clike","tap":"yaml","textile":"markup","tt2":["clike","markup-templating"],"twig":"markup","typescript":"javascript","vala":"clike","vbnet":"basic","velocity":"markup","wiki":"markup","xeora":"markup","xquery":"markup"}/*]*/;
 
 	var lang_data = {};
 

tests/languages/json/punctuation_feature.test

@@ -8,11 +8,11 @@
 ----------------------------------------------------
 
 [
-	["punctuation", "{"],  ["punctuation", "}"],
-	["punctuation", "{"],  ["punctuation", "}"],
-	["punctuation", "["],  ["punctuation", "]"],
-	["punctuation", "]"],  ["punctuation", ","],
-	["punctuation", "}"],  ["punctuation", ","],
+	["punctuation", "{"], ["punctuation", "}"],
+	["punctuation", "{"], ["punctuation", "}"],
+	["punctuation", "["], ["punctuation", "]"],
+	["punctuation", "]"], ["punctuation", ","],
+	["punctuation", "}"], ["punctuation", ","],
 	["punctuation", ","]
 ]
 ----------------------------------------------------

tests/languages/jsonp/function_feature.test

@@ -0,0 +1,13 @@
+callback();
+
+----------------------------------------------------
+
+[
+	["function", "callback"],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["punctuation", ";"]
+]
+----------------------------------------------------
+
+Checks for callback functions.

tests/languages/jsonp/punctuation_feature.test

@@ -0,0 +1,24 @@
+{}
+{ }
+[]
+],
+},
+,
+;
+()
+
+----------------------------------------------------
+
+[
+	["punctuation", "{"], ["punctuation", "}"],
+	["punctuation", "{"], ["punctuation", "}"],
+	["punctuation", "["], ["punctuation", "]"],
+	["punctuation", "]"], ["punctuation", ","],
+	["punctuation", "}"], ["punctuation", ","],
+	["punctuation", ","],
+	["punctuation", ";"],
+	["punctuation", "("], ["punctuation", ")"]
+]
+----------------------------------------------------
+
+Checks for punctuation.