diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-25 18:38:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 18:38:29 +0200 |
| commit | e465b72b9bca92370f8e3c63a197586d9645b6db (patch) | |
| tree | b4795c006811e74ba7abec850987969a6fe820e2 /modules/gdscript | |
| parent | 40da29341e4a850eef9204b556a31279f4eeb836 (diff) | |
| parent | 3a87d1acae69737daf8ebabb415f5f3e5c5fa882 (diff) | |
Merge pull request #61389 from snailrhymer/lookup-fix
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 9a9ce0bc6a..202d1dcdf4 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -3155,7 +3155,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co } ::Error GDScriptLanguage::lookup_code(const String &p_code, const String &p_symbol, const String &p_path, Object *p_owner, LookupResult &r_result) { - // Before parsing, try the usual stuff + // Before parsing, try the usual stuff. if (ClassDB::class_exists(p_symbol)) { r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS; r_result.class_name = p_symbol; @@ -3171,7 +3171,9 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co } } - if (GDScriptUtilityFunctions::function_exists(p_symbol)) { + // Need special checks for assert and preload as they are technically + // keywords, so are not registered in GDScriptUtilityFunctions. + if (GDScriptUtilityFunctions::function_exists(p_symbol) || "assert" == p_symbol || "preload" == p_symbol) { r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD; r_result.class_name = "@GDScript"; r_result.class_member = p_symbol; |