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

Fix completion for built-in load function

Browse Source
This commit is contained in:
Gustav 2020-11-06 09:53:51 +01:00
parent 263f731924
commit 0ddd4097a6
2 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gdscript/gdscript_editor.cpp
View File

@ -2315,11 +2315,6 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
if (GDScriptParser::get_builtin_function(call->function_name) < GDScriptFunctions::FUNC_MAX) { if (GDScriptParser::get_builtin_function(call->function_name) < GDScriptFunctions::FUNC_MAX) {
MethodInfo info = GDScriptFunctions::get_info(GDScriptParser::get_builtin_function(call->function_name)); MethodInfo info = GDScriptFunctions::get_info(GDScriptParser::get_builtin_function(call->function_name));
if ((info.name == "load" || info.name == "preload") && bool(EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths"))) {
_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), r_result);
}
r_arghint = _make_arguments_hint(info, p_argidx); r_arghint = _make_arguments_hint(info, p_argidx);
return; return;
} else if (GDScriptParser::get_builtin_type(call->function_name) < Variant::VARIANT_MAX) { } else if (GDScriptParser::get_builtin_type(call->function_name) < Variant::VARIANT_MAX) {

10
modules/gdscript/gdscript_parser.cpp
View File

@ -2486,13 +2486,15 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_pre
} }
} }
if (!check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
// Arguments. // Arguments.
CompletionType ct = COMPLETION_CALL_ARGUMENTS;
if (get_builtin_function(call->function_name) == GDScriptFunctions::RESOURCE_LOAD) {
ct = COMPLETION_RESOURCE_PATH;
}
push_completion_call(call); push_completion_call(call);
make_completion_context(COMPLETION_CALL_ARGUMENTS, call, 0, true);
int argument_index = 0; int argument_index = 0;
do { do {
make_completion_context(COMPLETION_CALL_ARGUMENTS, call, argument_index++, true); make_completion_context(ct, call, argument_index++, true);
if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) { if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
// Allow for trailing comma. // Allow for trailing comma.
break; break;
@ -2503,9 +2505,9 @@ GDScriptParser::ExpressionNode *GDScriptParser::parse_call(ExpressionNode *p_pre
} else { } else {
call->arguments.push_back(argument); call->arguments.push_back(argument);
} }
ct = COMPLETION_CALL_ARGUMENTS;
} while (match(GDScriptTokenizer::Token::COMMA)); } while (match(GDScriptTokenizer::Token::COMMA));
pop_completion_call(); pop_completion_call();
}
pop_multiline(); pop_multiline();
consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected closing ")" after call arguments.)*"); consume(GDScriptTokenizer::Token::PARENTHESIS_CLOSE, R"*(Expected closing ")" after call arguments.)*");