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

Merge pull request #96693 from HolonProduction/annotation-arg-hint

Browse source 
Autocompletion: Add arghint for annotations
This commit is contained in:
Rémi Verschelde 2024-10-02 15:00:58 +02:00
commit 0b2446101c
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/gdscript/gdscript_editor.cpp
View file

@ -864,7 +864,8 @@ static void _get_directory_contents(EditorFileSystemDirectory *p_dir, HashMap<St
} }
} }
static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result) { static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, HashMap<String, ScriptLanguage::CodeCompletionOption> &r_result, String &r_arghint) {
r_arghint = _make_arguments_hint(p_annotation->info->info, p_argument, true);
if (p_annotation->name == SNAME("@export_range")) { if (p_annotation->name == SNAME("@export_range")) {
if (p_argument == 3 || p_argument == 4 || p_argument == 5) { if (p_argument == 3 || p_argument == 4 || p_argument == 5) {
// Slider hint. // Slider hint.
@ -3186,7 +3187,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
break; break;
} }
const GDScriptParser::AnnotationNode *annotation = static_cast<const GDScriptParser::AnnotationNode *>(completion_context.node); const GDScriptParser::AnnotationNode *annotation = static_cast<const GDScriptParser::AnnotationNode *>(completion_context.node);
_find_annotation_arguments(annotation, completion_context.current_argument, quote_style, options); _find_annotation_arguments(annotation, completion_context.current_argument, quote_style, options, r_call_hint);
r_forced = true; r_forced = true;
} break; } break;
case GDScriptParser::COMPLETION_BUILT_IN_TYPE_CONSTANT_OR_STATIC_METHOD: { case GDScriptParser::COMPLETION_BUILT_IN_TYPE_CONSTANT_OR_STATIC_METHOD: {

16
modules/gdscript/gdscript_parser.cpp
View file

@ -1640,23 +1640,29 @@ GDScriptParser::AnnotationNode *GDScriptParser::parse_annotation(uint32_t p_vali
advance(); advance();
// Arguments. // Arguments.
push_completion_call(annotation); push_completion_call(annotation);
make_completion_context(COMPLETION_ANNOTATION_ARGUMENTS, annotation, 0);
int argument_index = 0; int argument_index = 0;
do { do {
make_completion_context(COMPLETION_ANNOTATION_ARGUMENTS, annotation, argument_index);
set_last_completion_call_arg(argument_index);
if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) { if (check(GDScriptTokenizer::Token::PARENTHESIS_CLOSE)) {
// Allow for trailing comma. // Allow for trailing comma.
break; break;
} }
make_completion_context(COMPLETION_ANNOTATION_ARGUMENTS, annotation, argument_index);
set_last_completion_call_arg(argument_index++);
ExpressionNode *argument = parse_expression(false); ExpressionNode *argument = parse_expression(false);
if (argument == nullptr) { if (argument == nullptr) {
push_error("Expected expression as the annotation argument."); push_error("Expected expression as the annotation argument.");
valid = false; valid = false;
continue; } else {
annotation->arguments.push_back(argument);
if (argument->type == Node::LITERAL) {
override_completion_context(argument, COMPLETION_ANNOTATION_ARGUMENTS, annotation, argument_index);
}
} }
annotation->arguments.push_back(argument);
argument_index++;
} while (match(GDScriptTokenizer::Token::COMMA) && !is_at_end()); } while (match(GDScriptTokenizer::Token::COMMA) && !is_at_end());
pop_multiline(); pop_multiline();