Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autocompletion: Don't add parenthesis if Callable is expected

Browse source
This commit is contained in:
HolonProduction 2024-08-31 12:12:19 +02:00
parent af2c713971
commit e7487263ad
16 changed files with 260 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/gdscript/gdscript_parser.cpp
View file

@ -269,6 +269,9 @@ void GDScriptParser::override_completion_context(const Node *p_for_node, Complet
context.current_argument = p_argument;
context.node = p_node;
context.parser = this;
if (!completion_call_stack.is_empty()) {
context.call = completion_call_stack.back()->get();
}
completion_context = context;
}
@ -288,6 +291,9 @@ void GDScriptParser::make_completion_context(CompletionType p_type, Node *p_node
context.current_argument = p_argument;
context.node = p_node;
context.parser = this;
if (!completion_call_stack.is_empty()) {
context.call = completion_call_stack.back()->get();
}
completion_context = context;
}
@ -306,6 +312,9 @@ void GDScriptParser::make_completion_context(CompletionType p_type, Variant::Typ
context.current_line = tokenizer->get_cursor_line();
context.builtin_type = p_builtin_type;
context.parser = this;
if (!completion_call_stack.is_empty()) {
context.call = completion_call_stack.back()->get();
}
completion_context = context;
}
@ -317,9 +326,6 @@ void GDScriptParser::push_completion_call(Node *p_call) {
call.call = p_call;
call.argument = 0;
completion_call_stack.push_back(call);
if (previous.cursor_place == GDScriptTokenizerText::CURSOR_MIDDLE || previous.cursor_place == GDScriptTokenizerText::CURSOR_END || current.cursor_place == GDScriptTokenizerText::CURSOR_BEGINNING) {
completion_call = call;
}
}
void GDScriptParser::pop_completion_call() {
@ -331,7 +337,7 @@ void GDScriptParser::pop_completion_call() {
}
void GDScriptParser::set_last_completion_call_arg(int p_argument) {
if (!for_completion || passed_cursor) {
if (!for_completion) {
return;
}
ERR_FAIL_COND_MSG(completion_call_stack.is_empty(), "Trying to set argument on empty completion call stack");
@ -477,12 +483,6 @@ GDScriptTokenizer::Token GDScriptParser::advance() {
if (current.type == GDScriptTokenizer::Token::TK_EOF) {
ERR_FAIL_COND_V_MSG(current.type == GDScriptTokenizer::Token::TK_EOF, current, "GDScript parser bug: Trying to advance past the end of stream.");
}
if (for_completion && !completion_call_stack.is_empty()) {
if (completion_call.call == nullptr && tokenizer->is_past_cursor()) {
completion_call = completion_call_stack.back()->get();
passed_cursor = true;
}
}
previous = current;
current = tokenizer->scan();
while (current.type == GDScriptTokenizer::Token::ERROR) {
@ -3340,6 +3340,7 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_pre
int argument_index = 0;
do {
make_completion_context(ct, call, argument_index);
set_last_completion_call_arg(argument_index);
if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
// Allow for trailing comma.
break;