|
|
@@ -3702,17 +3702,15 @@
|
|
|
if (hueDebug.showSyntaxParseResult) {
|
|
|
console.log(e.data.syntaxError);
|
|
|
}
|
|
|
- if (!e.data.syntaxError.incompleteStatement) {
|
|
|
- var token = self.editor.getSession().getTokenAt(e.data.syntaxError.loc.first_line - 1, e.data.syntaxError.loc.first_column + 1);
|
|
|
- // If no token is found it likely means that the parserresponse came back after the text was changed,
|
|
|
- // at which point it will trigger another parse so we can ignore this.
|
|
|
- if (token) {
|
|
|
- token.syntaxError = e.data.syntaxError;
|
|
|
- var AceRange = ace.require('ace/range').Range;
|
|
|
- var range = new AceRange(e.data.syntaxError.loc.first_line - 1, e.data.syntaxError.loc.first_column, e.data.syntaxError.loc.last_line - 1, e.data.syntaxError.loc.first_column + e.data.syntaxError.text.length);
|
|
|
- var markerId = self.editor.getSession().addMarker(range, 'hue-ace-syntax-error');
|
|
|
- self.editor.getSession().$backMarkers[markerId].token = token;
|
|
|
- }
|
|
|
+ var token = self.editor.getSession().getTokenAt(e.data.syntaxError.loc.first_line - 1, e.data.syntaxError.loc.first_column + 1);
|
|
|
+ // If no token is found it likely means that the parser response came back after the text was changed,
|
|
|
+ // at which point it will trigger another parse so we can ignore this.
|
|
|
+ if (token) {
|
|
|
+ token.syntaxError = e.data.syntaxError;
|
|
|
+ var AceRange = ace.require('ace/range').Range;
|
|
|
+ var range = new AceRange(e.data.syntaxError.loc.first_line - 1, e.data.syntaxError.loc.first_column, e.data.syntaxError.loc.last_line - 1, e.data.syntaxError.loc.first_column + e.data.syntaxError.text.length);
|
|
|
+ var markerId = self.editor.getSession().addMarker(range, 'hue-ace-syntax-error');
|
|
|
+ self.editor.getSession().$backMarkers[markerId].token = token;
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -4485,7 +4483,7 @@
|
|
|
contextTooltip.show(tooltipText, endCoordinates.pageX, endCoordinates.pageY + editor.renderer.lineHeight + 3);
|
|
|
}
|
|
|
}, 500);
|
|
|
- } else if (token !== null && token.syntaxError && !token.syntaxError.incompleteStatement) {
|
|
|
+ } else if (token !== null && token.syntaxError) {
|
|
|
tooltipTimeout = window.setTimeout(function () {
|
|
|
// TODO: i18n
|
|
|
if (token.syntaxError) {
|