godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #102698 from HolonProduction/no-null-safety

Browse Source 
Autocompletion: Account for invalid annotations when making arghint
This commit is contained in:
Rémi Verschelde
2025-02-11 10:54:42 +01:00
parent 65b81646a4 62eebf1266
commit 172fc62c80
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gdscript/gdscript_editor.cpp
View File

@@ -889,7 +889,11 @@ 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, String &r_arghint) {
r_arghint = _make_arguments_hint(p_annotation->info->info, p_argument, true);
ERR_FAIL_NULL(p_annotation);
if (p_annotation->info != nullptr) {
r_arghint = _make_arguments_hint(p_annotation->info->info, p_argument, true);
}
if (p_annotation->name == SNAME("@export_range")) {
if (p_argument == 3 || p_argument == 4 || p_argument == 5) {
// Slider hint.

1
modules/gdscript/gdscript_parser.h
View File

@@ -372,6 +372,7 @@ public:
Vector<ExpressionNode *> arguments;
Vector<Variant> resolved_arguments;
/** Information of the annotation. Might be null for unknown annotations. */
AnnotationInfo *info = nullptr;
PropertyInfo export_info;
bool is_resolved = false;