asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #34288 from bojidar-bg/33425-always-suggest-subsequence

Browse source 
Always display subsequence autocompletion matches
This commit is contained in:
Rémi Verschelde 2020-02-10 11:25:35 +01:00 committed by GitHub
commit 9d8e095946
1 changed files with 60 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
scene/gui/text_edit.cpp
View file

@ -6530,6 +6530,10 @@ void TextEdit::_update_completion_candidates() {
Vector<float> sim_cache; Vector<float> sim_cache;
bool single_quote = s.begins_with("'"); bool single_quote = s.begins_with("'");
Vector<ScriptCodeCompletionOption> completion_options_casei; Vector<ScriptCodeCompletionOption> completion_options_casei;
Vector<ScriptCodeCompletionOption> completion_options_subseq;
Vector<ScriptCodeCompletionOption> completion_options_subseq_casei;
String s_lower = s.to_lower();
for (List<ScriptCodeCompletionOption>::Element *E = completion_sources.front(); E; E = E->next()) { for (List<ScriptCodeCompletionOption>::Element *E = completion_sources.front(); E; E = E->next()) {
ScriptCodeCompletionOption &option = E->get(); ScriptCodeCompletionOption &option = E->get();
@ -6544,30 +6548,67 @@ void TextEdit::_update_completion_candidates() {
option.insert_text = option.insert_text.quote(quote); option.insert_text = option.insert_text.quote(quote);
} }
if (option.display.begins_with(s)) { if (option.display.length() == 0) {
continue;
} else if (s.length() == 0) {
completion_options.push_back(option); completion_options.push_back(option);
} else if (option.display.to_lower().begins_with(s.to_lower())) { } else {
completion_options_casei.push_back(option);
// This code works the same as:
/*
if (option.display.begins_with(s)) {
completion_options.push_back(option);
} else if (option.display.to_lower().begins_with(s.to_lower())) {
completion_options_casei.push_back(option);
} else if (s.is_subsequence_of(option.display)) {
completion_options_subseq.push_back(option);
} else if (s.is_subsequence_ofi(option.display)) {
completion_options_subseq_casei.push_back(option);
}
*/
// But is more performant due to being inlined and looping over the characters only once
String display_lower = option.display.to_lower();
const CharType *ssq = &s[0];
const CharType *ssq_lower = &s_lower[0];
const CharType *tgt = &option.display[0];
const CharType *tgt_lower = &display_lower[0];
const CharType *ssq_last_tgt = NULL;
const CharType *ssq_lower_last_tgt = NULL;
for (; *tgt; tgt++, tgt_lower++) {
if (*ssq == *tgt) {
ssq++;
ssq_last_tgt = tgt;
}
if (*ssq_lower == *tgt_lower) {
ssq_lower++;
ssq_lower_last_tgt = tgt;
}
}
if (!*ssq) { // Matched the whole subsequence in s
if (ssq_last_tgt == &option.display[s.length() - 1]) { // Finished matching in the first s.length() characters
completion_options.push_back(option);
} else {
completion_options_subseq.push_back(option);
}
} else if (!*ssq_lower) { // Matched the whole subsequence in s_lower
if (ssq_lower_last_tgt == &option.display[s.length() - 1]) { // Finished matching in the first s.length() characters
completion_options_casei.push_back(option);
} else {
completion_options_subseq_casei.push_back(option);
}
}
} }
} }
completion_options.append_array(completion_options_casei); completion_options.append_array(completion_options_casei);
completion_options.append_array(completion_options_subseq);
if (completion_options.size() == 0) { completion_options.append_array(completion_options_subseq_casei);
for (int i = 0; i < completion_sources.size(); i++) {
if (s.is_subsequence_of(completion_sources[i].display)) {
completion_options.push_back(completion_sources[i]);
}
}
}
if (completion_options.size() == 0) {
for (int i = 0; i < completion_sources.size(); i++) {
if (s.is_subsequence_ofi(completion_sources[i].display)) {
completion_options.push_back(completion_sources[i]);
}
}
}
if (completion_options.size() == 0) { if (completion_options.size() == 0) {
// No options to complete, cancel. // No options to complete, cancel.