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

Minor JSONiq mode refactoring

Browse source
This commit is contained in:
William Candillon 2014-04-04 12:02:57 +02:00 • committed by nightwing
commit e87dfcce7a
2 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ace/mode/jsoniq.js
View file

@ -129,19 +129,6 @@ oop.inherits(Mode, TextMode);
that.addMarkers(e.data, session);
});
worker.on("highlight", function(tokens) {
that.$tokenizer.tokens = tokens.data.tokens;
that.$tokenizer.lines = session.getDocument().getAllLines();
var rows = Object.keys(that.$tokenizer.tokens);
for(var i=0; i < rows.length; i++) {
var row = parseInt(rows[i]);
delete session.bgTokenizer.lines[row];
delete session.bgTokenizer.states[row];
session.bgTokenizer.fireUpdateEvent(row, row);
}
});
return worker;
};

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

@ -72,10 +72,12 @@ var XQueryWorker = exports.XQueryWorker = function(sender) {
this.moduleResolver = getModuleResolverFromModules(Modules);
var that = this;
this.sender.on("complete", function(e){
var pos = { line: e.data.pos.row, col: e.data.pos.column };
var proposals = that.xqlint.getCompletions(pos);
that.sender.emit("complete", proposals);
this.sender.on("complete", function(e){
if(that.xqlint) {
var pos = { line: e.data.pos.row, col: e.data.pos.column };
var proposals = that.xqlint.getCompletions(pos);
that.sender.emit("complete", proposals);
}
});
this.sender.on("setAvailableModuleNamespaces", function(e){