jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor improvements in xquery semantic highlighting.

Browse source
This commit is contained in:
William Candillon 2012-11-08 06:37:39 -08:00 • committed by nightwing
commit 823abf4449
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/ace/mode/xquery_worker.js
View file

@ -51,12 +51,14 @@ oop.inherits(XQueryWorker, Mirror);
var value = this.doc.getValue(); var value = this.doc.getValue();
var h = new JSONParseTreeHandler(); var h = new JSONParseTreeHandler();
var parser = new XQueryParser(value, h); var parser = new XQueryParser(value, h);
var recover = false;
try { try {
parser.parse_XQuery(); parser.parse_XQuery();
this.sender.emit("ok"); this.sender.emit("ok");
} catch(e) { var ast = h.getParseTree();
var recover = true; var highlighter = new SyntaxHighlighter(value, ast);
var tokens = highlighter.getTokens();
this.sender.emit("highlight", tokens);
} catch(e) {
var prefix = value.substring(0, e.getBegin()); var prefix = value.substring(0, e.getBegin());
var line = prefix.split("\n").length; var line = prefix.split("\n").length;
var column = e.getBegin() - prefix.lastIndexOf("\n"); var column = e.getBegin() - prefix.lastIndexOf("\n");
@ -68,11 +70,7 @@ oop.inherits(XQueryWorker, Mirror);
type: "error" type: "error"
}); });
} }
var ast = h.getParseTree(); };
var highlighter = new SyntaxHighlighter(value, ast);
var tokens = highlighter.getTokens(recover);
this.sender.emit("highlight", tokens);
};
}).call(XQueryWorker.prototype); }).call(XQueryWorker.prototype);