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

Update autocomplete to handle custom identifier regexprsw

Browse source
This commit is contained in:
William Candillon 2014-04-05 20:16:02 +02:00
commit a7297de55f
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ace/autocomplete.js
View file

@ -212,7 +212,7 @@ var Autocomplete = function() {
var pos = editor.getCursorPosition(); var pos = editor.getCursorPosition();
var line = session.getLine(pos.row); var line = session.getLine(pos.row);
callback(null, { callback(null, {
prefix: util.retrievePrecedingIdentifier(line, pos.column), prefix: util.retrievePrecedingIdentifier(line, pos.column, results.length > 0 ? results[0].identifierRegex : undefined),
matches: matches, matches: matches,
finished: (--total === 0) finished: (--total === 0)
}); });
@ -270,10 +270,7 @@ var Autocomplete = function() {
}.bind(this); }.bind(this);
// Calcul prefix // Calcul prefix
var session = this.editor.getSession(); var prefix = results.prefix;
var pos = this.editor.getCursorPosition();
var line = session.getLine(pos.row);
var prefix = util.retrievePrecedingIdentifier(line, pos.column);
// Results matches // Results matches
var matches = results && results.matches; var matches = results && results.matches;

12
lib/ace/ext/language_tools.js
View file

@ -122,7 +122,15 @@ var doLiveAutocomplete = function(e) {
var line = editor.session.getLine(pos.row); var line = editor.session.getLine(pos.row);
var hasCompleter = editor.completer && editor.completer.activated; var hasCompleter = editor.completer && editor.completer.activated;
var prefix = util.retrievePrecedingIdentifier(line, pos.column); var prefix = util.retrievePrecedingIdentifier(line, pos.column);
//Try to find custom prefixes on the completors
completers.forEach(function(completer){
if(completer.identifierRegexprs){
completer.identifierRegexprs.forEach(function(identifierRegex){
prefix = util.retrievePrecedingIdentifier(line, pos.column, identifierRegex);
});
}
});
// We don't want to autocomplete with no prefix // We don't want to autocomplete with no prefix
if (e.command.name === "backspace" && !prefix) { if (e.command.name === "backspace" && !prefix) {
if (hasCompleter) if (hasCompleter)
@ -185,4 +193,4 @@ require("../config").defineOptions(Editor.prototype, "editor", {
} }
}); });
}); });