study/uTools-quickcommand
1
0
Fork 0
mirror of https://github.com/fofolee/uTools-quickcommand.git synced 2025-06-08 22:51:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加anyword和specialVars提示，适配实时补全

Browse Source
This commit is contained in:
fofolee 2020-06-14 10:26:05 +08:00
parent 8227be9cbf
commit b97174187f
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/assets/plugins/codemirror/addon/hint/show-hint.js vendored
View File

@ -104,14 +104,9 @@
this.debounce = 0; this.debounce = 0;
} }
var identStart = this.startPos;
if(this.data) {
identStart = this.data.from;
}
var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line); var pos = this.cm.getCursor(), line = this.cm.getLine(pos.line);
if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch || if (pos.line != this.startPos.line || line.length - pos.ch != this.startLen - this.startPos.ch ||
pos.ch < identStart.ch || this.cm.somethingSelected() || pos.ch < this.startPos.ch || this.cm.somethingSelected() ||
(!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) { (!pos.ch || this.options.closeCharacters.test(line.charAt(pos.ch - 1)))) {
this.close(); this.close();
} else { } else {
@ -173,7 +168,7 @@
PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);}, PageDown: function() {handle.moveFocus(handle.menuSize() - 1, true);},
Home: function() {handle.setFocus(0);}, Home: function() {handle.setFocus(0);},
End: function() {handle.setFocus(handle.length - 1);}, End: function() {handle.setFocus(handle.length - 1);},
Enter: handle.pick, // Enter: handle.pick,
Tab: handle.pick, Tab: handle.pick,
Esc: handle.close Esc: handle.close
}; };
@ -449,12 +444,31 @@
term = "" term = ""
from = cur from = cur
} }
// -------------------------------------------------------
var tokenstring = token.string.trim()
var found = []; var found = [];
for (var i = 0; i < options.words.length; i++) { for (var i = 0; i < options.words.length; i++) {
var word = options.words[i]; var word = options.words[i];
if (word.slice(0, term.length) == term) if (word.slice(0, tokenstring.length) == tokenstring)
found.push(word); if(word != tokenstring && !found.includes(word)) found.push(word);
} }
if (!term) {
if (!tokenstring) return { list: {} }
} else {
// add anyword
var anyword = CodeMirror.hint.anyword(cm, options).list
if (anyword[0] != tokenstring) {
anyword.forEach(a => {
if (!found.includes(a)) found.push(a)
})
}
// add specialVars
var specialVars = localStorage['specialVars'].split(',')
specialVars.forEach(s => {
if (s.toUpperCase().slice(2, tokenstring.length + 2) == tokenstring.toUpperCase()) found.push(s)
})
}
// --------------------------------------------------------
if (found.length) return {list: found, from: from, to: to}; if (found.length) return {list: found, from: from, to: to};
}); });