Minor improvements in xquery semantic highlighting.

This commit is contained in:
William Candillon 2012-11-08 06:37:39 -08:00 committed by nightwing
commit 823abf4449

View file

@ -51,12 +51,14 @@ oop.inherits(XQueryWorker, Mirror);
var value = this.doc.getValue();
var h = new JSONParseTreeHandler();
var parser = new XQueryParser(value, h);
var recover = false;
try {
parser.parse_XQuery();
this.sender.emit("ok");
} catch(e) {
var recover = true;
var ast = h.getParseTree();
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 line = prefix.split("\n").length;
var column = e.getBegin() - prefix.lastIndexOf("\n");
@ -68,11 +70,7 @@ oop.inherits(XQueryWorker, Mirror);
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);