PR feedback

This commit is contained in:
Matthew Hodgson 2016-03-17 16:46:54 +00:00
parent 4a90f262c6
commit 42479cf011

View file

@ -84,9 +84,38 @@ class TabComplete {
} }
startTabCompleting(passive) { startTabCompleting(passive) {
this.originalText = this.textArea.value; // cache starting text
// grab the partial word from the text which we'll be tab-completing
var res = MATCH_REGEX.exec(this.originalText);
if (!res) {
this.matchedList = [];
return;
}
// ES6 destructuring; ignore first element (the complete match)
var [ , boundaryGroup, partialGroup] = res;
if (partialGroup.length === 0 && passive) {
return;
}
this.isFirstWord = partialGroup.length === this.originalText.length;
this.completing = true; this.completing = true;
this.currentIndex = 0; this.currentIndex = 0;
this._calculateCompletions(passive);
this.matchedList = [
new Entry(partialGroup) // first entry is always the original partial
];
// find matching entries in the set of entries given to us
this.list.forEach((entry) => {
if (entry.text.toLowerCase().indexOf(partialGroup.toLowerCase()) === 0) {
this.matchedList.push(entry);
}
});
// console.log("calculated completions => %s", JSON.stringify(this.matchedList));
} }
/** /**
@ -270,38 +299,6 @@ class TabComplete {
}); });
} }
_calculateCompletions(passive) {
this.originalText = this.textArea.value; // cache starting text
// grab the partial word from the text which we'll be tab-completing
var res = MATCH_REGEX.exec(this.originalText);
if (!res) {
this.matchedList = [];
return;
}
// ES6 destructuring; ignore first element (the complete match)
var [ , boundaryGroup, partialGroup] = res;
this.isFirstWord = partialGroup.length === this.originalText.length;
if (partialGroup.length === 0 && passive) {
this.stopTabCompleting();
return;
}
this.matchedList = [
new Entry(partialGroup) // first entry is always the original partial
];
// find matching entries in the set of entries given to us
this.list.forEach((entry) => {
if (entry.text.toLowerCase().indexOf(partialGroup.toLowerCase()) === 0) {
this.matchedList.push(entry);
}
});
// console.log("_calculateCompletions => %s", JSON.stringify(this.matchedList));
}
_notifyStateChange() { _notifyStateChange() {
if (this.opts.onStateChange) { if (this.opts.onStateChange) {
this.opts.onStateChange(this.completing); this.opts.onStateChange(this.completing);