|
|
@@ -392,7 +392,7 @@ void GDScriptLanguage::debug_get_globals(List<String> *p_globals, List<Variant>
|
|
|
get_public_constants(&cinfo);
|
|
|
|
|
|
for (const KeyValue<StringName, int> &E : name_idx) {
|
|
|
- if (ClassDB::class_exists(E.key) || Engine::get_singleton()->has_singleton(E.key)) {
|
|
|
+ if (GDScriptAnalyzer::class_exists(E.key) || Engine::get_singleton()->has_singleton(E.key)) {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
@@ -710,7 +710,7 @@ static String _trim_parent_class(const String &p_class, const String &p_base_cla
|
|
|
Vector<String> names = p_class.split(".", false, 1);
|
|
|
if (names.size() == 2) {
|
|
|
const String &first = names[0];
|
|
|
- if (ClassDB::class_exists(p_base_class) && ClassDB::class_exists(first) && ClassDB::is_parent_class(p_base_class, first)) {
|
|
|
+ if (GDScriptAnalyzer::class_exists(p_base_class) && GDScriptAnalyzer::class_exists(first) && ClassDB::is_parent_class(p_base_class, first)) {
|
|
|
const String &rest = names[1];
|
|
|
return rest;
|
|
|
}
|
|
|
@@ -1347,7 +1347,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|
|
} break;
|
|
|
case GDScriptParser::DataType::NATIVE: {
|
|
|
StringName type = base_type.native_type;
|
|
|
- if (!ClassDB::class_exists(type)) {
|
|
|
+ if (!GDScriptAnalyzer::class_exists(type)) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -1627,7 +1627,7 @@ static void _find_identifiers(const GDScriptParser::CompletionContext &p_context
|
|
|
// Native classes and global constants.
|
|
|
for (const KeyValue<StringName, int> &E : GDScriptLanguage::get_singleton()->get_global_map()) {
|
|
|
ScriptLanguage::CodeCompletionOption option;
|
|
|
- if (ClassDB::class_exists(E.key) || Engine::get_singleton()->has_singleton(E.key)) {
|
|
|
+ if (GDScriptAnalyzer::class_exists(E.key) || Engine::get_singleton()->has_singleton(E.key)) {
|
|
|
option = ScriptLanguage::CodeCompletionOption(E.key.operator String(), ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
|
|
} else {
|
|
|
option = ScriptLanguage::CodeCompletionOption(E.key.operator String(), ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
|
|
@@ -2510,7 +2510,7 @@ static bool _guess_identifier_type(GDScriptParser::CompletionContext &p_context,
|
|
|
}
|
|
|
|
|
|
// Check ClassDB.
|
|
|
- if (ClassDB::class_exists(p_identifier->name) && ClassDB::is_class_exposed(p_identifier->name)) {
|
|
|
+ if (GDScriptAnalyzer::class_exists(p_identifier->name)) {
|
|
|
r_type.type.type_source = GDScriptParser::DataType::ANNOTATED_EXPLICIT;
|
|
|
r_type.type.kind = GDScriptParser::DataType::NATIVE;
|
|
|
r_type.type.builtin_type = Variant::OBJECT;
|
|
|
@@ -2658,7 +2658,7 @@ static bool _guess_identifier_type_from_base(GDScriptParser::CompletionContext &
|
|
|
} break;
|
|
|
case GDScriptParser::DataType::NATIVE: {
|
|
|
StringName class_name = base_type.native_type;
|
|
|
- if (!ClassDB::class_exists(class_name)) {
|
|
|
+ if (!GDScriptAnalyzer::class_exists(class_name)) {
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
@@ -2849,7 +2849,7 @@ static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContex
|
|
|
}
|
|
|
} break;
|
|
|
case GDScriptParser::DataType::NATIVE: {
|
|
|
- if (!ClassDB::class_exists(base_type.native_type)) {
|
|
|
+ if (!GDScriptAnalyzer::class_exists(base_type.native_type)) {
|
|
|
return false;
|
|
|
}
|
|
|
MethodBind *mb = ClassDB::get_method(base_type.native_type, p_method);
|
|
|
@@ -2925,7 +2925,7 @@ static void _find_enumeration_candidates(GDScriptParser::CompletionContext &p_co
|
|
|
String class_name = p_enum_hint.get_slicec('.', 0);
|
|
|
String enum_name = p_enum_hint.get_slicec('.', 1);
|
|
|
|
|
|
- if (!ClassDB::class_exists(class_name)) {
|
|
|
+ if (!GDScriptAnalyzer::class_exists(class_name)) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
@@ -2998,7 +2998,7 @@ static void _list_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|
|
} break;
|
|
|
case GDScriptParser::DataType::NATIVE: {
|
|
|
StringName class_name = base_type.native_type;
|
|
|
- if (!ClassDB::class_exists(class_name)) {
|
|
|
+ if (!GDScriptAnalyzer::class_exists(class_name)) {
|
|
|
base_type.kind = GDScriptParser::DataType::UNRESOLVED;
|
|
|
break;
|
|
|
}
|
|
|
@@ -3720,7 +3720,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|
|
}
|
|
|
|
|
|
StringName class_name = native_type.native_type;
|
|
|
- if (!ClassDB::class_exists(class_name)) {
|
|
|
+ if (!GDScriptAnalyzer::class_exists(class_name)) {
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
@@ -4101,7 +4101,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|
|
case GDScriptParser::DataType::NATIVE: {
|
|
|
const StringName &class_name = base_type.native_type;
|
|
|
|
|
|
- ERR_FAIL_COND_V(!ClassDB::class_exists(class_name), ERR_BUG);
|
|
|
+ ERR_FAIL_COND_V(!GDScriptAnalyzer::class_exists(class_name), ERR_BUG);
|
|
|
|
|
|
if (ClassDB::has_method(class_name, p_symbol, true)) {
|
|
|
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
|
|
|
@@ -4295,7 +4295,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.
|
|
|
- if (ClassDB::class_exists(p_symbol)) {
|
|
|
+ if (GDScriptAnalyzer::class_exists(p_symbol)) {
|
|
|
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS;
|
|
|
r_result.class_name = p_symbol;
|
|
|
return OK;
|