Skip to content

JSONP support fix #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 26, 2019
Merged

JSONP support fix #1745

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e7d767
JSONP fix
RunDevelopment Feb 16, 2019
923e826
Added JSON/JSONP examples
RunDevelopment Feb 16, 2019
6194f57
Fixed JSONP example...
RunDevelopment Feb 16, 2019
08ada23
Made JSONP its own language
RunDevelopment Feb 25, 2019
50dde29
I forgot to change the tests
RunDevelopment Feb 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion components/prism-json.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Prism.languages.json = {
greedy: true
},
'number': /-?\d+\.?\d*(e[+-]?\d+)?/i,
'punctuation': /[{}[\],]/,
// function is for JSONP
'function': /[_$a-zA-Z\xA0-\uFFFF][$\w\xA0-\uFFFF]*(?=\s*\()/,
'punctuation': /[{}[\]();,]/,
'operator': /:/,
'boolean': /\b(?:true|false)\b/,
'null': {
Expand Down
2 changes: 1 addition & 1 deletion components/prism-json.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions examples/prism-json.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
13 changes: 13 additions & 0 deletions tests/languages/json/function_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
callback();

----------------------------------------------------

[
["function", "callback"],
["punctuation", "("],
["punctuation", ")"],
["punctuation", ";"]
]
----------------------------------------------------

Checks for callback functions.
16 changes: 10 additions & 6 deletions tests/languages/json/punctuation_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@
],
},
,
;
()

----------------------------------------------------

[
["punctuation", "{"], ["punctuation", "}"],
["punctuation", "{"], ["punctuation", "}"],
["punctuation", "["], ["punctuation", "]"],
["punctuation", "]"], ["punctuation", ","],
["punctuation", "}"], ["punctuation", ","],
["punctuation", ","]
["punctuation", "{"], ["punctuation", "}"],
["punctuation", "{"], ["punctuation", "}"],
["punctuation", "["], ["punctuation", "]"],
["punctuation", "]"], ["punctuation", ","],
["punctuation", "}"], ["punctuation", ","],
["punctuation", ","],
["punctuation", ";"],
["punctuation", "("], ["punctuation", ")"]
]
----------------------------------------------------

Expand Down