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

Fix bug with XQuery semantic highlighter.

Browse source
This commit is contained in:
William Candillon 2012-05-22 14:01:47 +02:00
commit 6cef31c030
2 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

25
build/src/mode-xquery.js
View file

@ -119,12 +119,18 @@ oop.inherits(Mode, TextMode);
}; };
this.mergeLines = function(newLines, oldLines) { this.mergeLines = function(newLines, oldLines) {
var lines = new Array(newLines.length); console.log("New Lines: " + newLines.length);
for(var i in lines) console.log("Old Lines: " + oldLines.length);
{ if(newLines.length === oldLines.length) {
lines[i] = newLines[i].tokens[0].type === "_error" ? oldLines[i] : newLines[i]; var lines = new Array(newLines.length);
for(var i in lines)
{
lines[i] = newLines[i].tokens[0].type === "_error" ? oldLines[i] : newLines[i];
}
return lines;
} else {
return newLines;
} }
return lines;
}; };
this.createWorker = function(session) { this.createWorker = function(session) {
@ -189,14 +195,7 @@ oop.inherits(Mode, TextMode);
} }
} }
} }
//this.$highlighter = new XQueryBackgroundHighlighter(session); session.bgTokenizer.lines = that.mergeLines(lines, session.bgTokenizer.lines);
//this.$highlighter.lines = lines;
//for(var i=0; i < that.$deltas.length; i++)
//{
// var delta = that.$deltas[i];
// this.$highlighter.processDelta(delta);
//}
session.bgTokenizer.lines = this.mergeLines(lines, session.bgTokenizer);// this.$highlighter.lines;
session.bgTokenizer.fireUpdateEvent(firstRow, lastRow); session.bgTokenizer.fireUpdateEvent(firstRow, lastRow);
}); });

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

@ -119,12 +119,18 @@ oop.inherits(Mode, TextMode);
}; };
this.mergeLines = function(newLines, oldLines) { this.mergeLines = function(newLines, oldLines) {
var lines = new Array(newLines.length); console.log("New Lines: " + newLines.length);
for(var i in lines) console.log("Old Lines: " + oldLines.length);
{ if(newLines.length === oldLines.length) {
lines[i] = newLines[i].tokens[0].type === "_error" ? oldLines[i] : newLines[i]; var lines = new Array(newLines.length);
for(var i in lines)
{
lines[i] = newLines[i].tokens[0].type === "_error" ? oldLines[i] : newLines[i];
}
return lines;
} else {
return newLines;
} }
return lines;
}; };
this.createWorker = function(session) { this.createWorker = function(session) {
@ -189,14 +195,7 @@ oop.inherits(Mode, TextMode);
} }
} }
} }
//this.$highlighter = new XQueryBackgroundHighlighter(session); session.bgTokenizer.lines = that.mergeLines(lines, session.bgTokenizer.lines);
//this.$highlighter.lines = lines;
//for(var i=0; i < that.$deltas.length; i++)
//{
// var delta = that.$deltas[i];
// this.$highlighter.processDelta(delta);
//}
session.bgTokenizer.lines = this.mergeLines(lines, session.bgTokenizer);// this.$highlighter.lines;
session.bgTokenizer.fireUpdateEvent(firstRow, lastRow); session.bgTokenizer.fireUpdateEvent(firstRow, lastRow);
}); });