mirrors/TiddlyWiki5
1
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5.git synced 2026-01-01 14:52:08 -08:00
Code Issues Projects Releases Packages Wiki Activity

Improved rendering of JavaScript that has parse errors

Browse source
This commit is contained in:
Jeremy Ruston 2012-03-02 12:09:06 +00:00
parent 488562bd95
commit 865a0ad7cc
6 changed files with 64 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/JavaScriptParser.js
View file

@ -21,13 +21,23 @@ var JavaScriptParser = function(options) {
// Parse a string of JavaScript code or JSON and return the parse tree as a wikitext parse tree
JavaScriptParser.prototype.parse = function(type,code) {
// Get the parse tree
var parseTree = esprima.parse(code,{
tokens: true,
range: true
}),
var parseTree,
result = [],
t,endLastToken = 0;
// Try to parse the code
try {
parseTree = esprima.parse(code,{tokens: true,range: true});
} catch(ex) {
// Return a helpful error if the parse failed
return new WikiTextParseTree([
Renderer.ElementNode("pre",{"class": "javascript-source"},[
Renderer.TextNode(code.substring(0,ex.index)),
Renderer.ErrorNode(ex),
Renderer.TextNode(code.substring(ex.index))
])
],new Dependencies(),this.store);
}
// Render the tokens with the appropriate class
for(t=0; t<parseTree.tokens.length; t++) {
var token = parseTree.tokens[t];
if(token.range[0] > endLastToken) {