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

use narcissus in the worker to detect syntax errors

Browse source
This commit is contained in:
Fabian Jakobs 2011-01-25 13:34:44 +01:00
commit d24cce4851
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ace/mode/javascript.js
View file

@ -144,7 +144,7 @@ oop.inherits(Mode, TextMode);
row: error.line-1,
column: error.character-1,
text: error.reason,
type: "error",
type: "warning",
lint: error
})
}
@ -152,6 +152,10 @@ oop.inherits(Mode, TextMode);
session.setAnnotations(errors)
});
worker.on("narcissus", function(e) {
session.setAnnotations([e.data]);
});
worker.on("terminate", function() {
session.clearAnnotations();
});

27
lib/ace/mode/javascript_worker.js
View file

@ -15,8 +15,31 @@ oop.inherits(JavaScriptWorker, Mirror);
(function() {
this.onUpdate = function() {
lint(this.doc.getValue(), {undef: false, onevar: false, passfail: false});
this.sender.emit("jslint", lint.errors);
var value = this.doc.getValue();
var start = new Date();
var parser = require("ace/narcissus/jsparse");
try {
parser.parse(value);
} catch(e) {
console.log("narcissus")
console.log(e);
sender.emit("narcissus", {
row: e.lineno-1,
column: null, // TODO convert e.cursor
text: e.message,
type: "error"
});
return;
} finally {
console.log("parse time: " + (new Date() - start));
}
var start = new Date();
console.log("jslint")
lint(value, {undef: false, onevar: false, passfail: false});
this.sender.emit("jslint", lint.errors);
console.log("lint time: " + (new Date() - start));
}
}).call(JavaScriptWorker.prototype);