godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31450 from GodotExplorer/fix-31425

Browse Source 
Fix filter quotes wraped insert completion options
This commit is contained in:
Rémi Verschelde 2019-08-21 17:20:11 +02:00 committed by GitHub
commit 14c2f2fe28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scene/gui/text_edit.cpp
View File

@ -6112,10 +6112,30 @@ void TextEdit::query_code_comple() {
c--; c--;
} }
if (ofs > 0 && (inquote || _is_completable(l[ofs - 1]) || completion_prefixes.has(String::chr(l[ofs - 1])))) bool ignored = completion_active && !completion_options.empty();
emit_signal("request_completion"); if (ignored) {
else if (ofs > 1 && l[ofs - 1] == ' ' && completion_prefixes.has(String::chr(l[ofs - 2]))) // Make it work with a space too, it's good enough. ScriptCodeCompletionOption::Kind kind = ScriptCodeCompletionOption::KIND_PLAIN_TEXT;
emit_signal("request_completion"); const ScriptCodeCompletionOption *previous_option = NULL;
for (int i = 0; i < completion_options.size(); i++) {
const ScriptCodeCompletionOption &current_option = completion_options[i];
if (!previous_option) {
previous_option = &current_option;
kind = current_option.kind;
}
if (previous_option->kind != current_option.kind) {
ignored = false;
break;
}
}
ignored = ignored && (kind == ScriptCodeCompletionOption::KIND_FILE_PATH || kind == ScriptCodeCompletionOption::KIND_NODE_PATH || kind == ScriptCodeCompletionOption::KIND_SIGNAL);
}
if (!ignored) {
if (ofs > 0 && (inquote || _is_completable(l[ofs - 1]) || completion_prefixes.has(String::chr(l[ofs - 1]))))
emit_signal("request_completion");
else if (ofs > 1 && l[ofs - 1] == ' ' && completion_prefixes.has(String::chr(l[ofs - 2]))) // Make it work with a space too, it's good enough.
emit_signal("request_completion");
}
} }
void TextEdit::set_code_hint(const String &p_hint) { void TextEdit::set_code_hint(const String &p_hint) {