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

Improve handling of the xquery semantic token cache.

Browse source
This commit is contained in:
William Candillon 2013-02-15 15:48:35 +01:00 • committed by nightwing
commit 94a088e31f
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/ace/mode/xquery.js
View file

@ -135,12 +135,17 @@ oop.inherits(Mode, TextMode);
}); });
worker.on("highlight", function(tokens) { worker.on("highlight", function(tokens) {
//if(that.$deltas.length > 0) return; if(that.$deltas.length > 0) return;
that.$tokenizer.tokens = tokens.data.tokens; that.$tokenizer.tokens = tokens.data.tokens;
that.$tokenizer.lines = tokens.data.lines; that.$tokenizer.lines = session.getDocument().getAllLines();
session.bgTokenizer.lines = []; session.bgTokenizer.lines = [];
session.bgTokenizer.states = []; session.bgTokenizer.states = [];
session.bgTokenizer.fireUpdateEvent(0, session.getLength() - 1);
var rows = Object.keys(that.$tokenizer.tokens);
for(var i=0; i < rows.length; i++) {
var row = parseInt(rows[i]);
session.bgTokenizer.fireUpdateEvent(row, row);
}
}); });
return worker; return worker;

5
lib/ace/mode/xquery/visitors/SemanticHighlighter.js
View file

@ -30,10 +30,9 @@
define(function(require, exports, module) { define(function(require, exports, module) {
var SemanticHighlighter = exports.SemanticHighlighter = function(ast, code) { var SemanticHighlighter = exports.SemanticHighlighter = function(ast) {
this.lines = code.split("\n"); this.tokens = {};
this.tokens = new Array(ast.pos.el + 1);
this.getTokens = function() { this.getTokens = function() {
this.visit(ast); this.visit(ast);