mirror of
https://github.com/godotengine/godot.git
synced 2025-10-20 00:13:30 +00:00
Add GDExtension support to Script
* Ability to create script languages from GDExtension * Some additions to gdnative_extension.h to make this happen * Moved the GDExtension binder to core This now allows creating scripting languages from GDExtension, with the same ease as if it was a module. It replaces the old PluginScript from Godot 3.x. Warning: GodotCPP will need to be updated to support this (it may be a bit of work as ScriptInstance needs to be created over there again).
This commit is contained in:
reduz
parent
a5eed70fa2
commit
360dea5348
38 changed files with 2019 additions and 267 deletions
|
|
@ -637,11 +637,11 @@ static String _make_arguments_hint(const GDScriptParser::FunctionNode *p_functio
|
|||
return arghint;
|
||||
}
|
||||
|
||||
static void _get_directory_contents(EditorFileSystemDirectory *p_dir, Map<String, ScriptCodeCompletionOption> &r_list) {
|
||||
static void _get_directory_contents(EditorFileSystemDirectory *p_dir, Map<String, ScriptLanguage::CodeCompletionOption> &r_list) {
|
||||
const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
|
||||
|
||||
for (int i = 0; i < p_dir->get_file_count(); i++) {
|
||||
ScriptCodeCompletionOption option(p_dir->get_file_path(i), ScriptCodeCompletionOption::KIND_FILE_PATH);
|
||||
ScriptLanguage::CodeCompletionOption option(p_dir->get_file_path(i), ScriptLanguage::CODE_COMPLETION_KIND_FILE_PATH);
|
||||
option.insert_text = option.display.quote(quote_style);
|
||||
r_list.insert(option.display, option);
|
||||
}
|
||||
|
|
@ -651,29 +651,29 @@ static void _get_directory_contents(EditorFileSystemDirectory *p_dir, Map<String
|
|||
}
|
||||
}
|
||||
|
||||
static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, Map<String, ScriptCodeCompletionOption> &r_result) {
|
||||
static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_annotation, int p_argument, const String p_quote_style, Map<String, ScriptLanguage::CodeCompletionOption> &r_result) {
|
||||
if (p_annotation->name == SNAME("@export_range")) {
|
||||
if (p_argument == 3 || p_argument == 4) {
|
||||
// Slider hint.
|
||||
ScriptCodeCompletionOption slider1("or_greater", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption slider1("or_greater", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
slider1.insert_text = slider1.display.quote(p_quote_style);
|
||||
r_result.insert(slider1.display, slider1);
|
||||
ScriptCodeCompletionOption slider2("or_lesser", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption slider2("or_lesser", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
slider2.insert_text = slider2.display.quote(p_quote_style);
|
||||
r_result.insert(slider2.display, slider2);
|
||||
}
|
||||
} else if (p_annotation->name == SNAME("@export_exp_easing")) {
|
||||
if (p_argument == 0 || p_argument == 1) {
|
||||
// Easing hint.
|
||||
ScriptCodeCompletionOption hint1("attenuation", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption hint1("attenuation", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
hint1.insert_text = hint1.display.quote(p_quote_style);
|
||||
r_result.insert(hint1.display, hint1);
|
||||
ScriptCodeCompletionOption hint2("inout", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption hint2("inout", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
hint2.insert_text = hint2.display.quote(p_quote_style);
|
||||
r_result.insert(hint2.display, hint2);
|
||||
}
|
||||
} else if (p_annotation->name == SNAME("@export_node_path")) {
|
||||
ScriptCodeCompletionOption node("Node", ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption node("Node", ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(node.display, node);
|
||||
List<StringName> node_types;
|
||||
ClassDB::get_inheriters_from_class("Node", &node_types);
|
||||
|
|
@ -681,23 +681,23 @@ static void _find_annotation_arguments(const GDScriptParser::AnnotationNode *p_a
|
|||
if (!ClassDB::is_class_exposed(E)) {
|
||||
continue;
|
||||
}
|
||||
ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
} else if (p_annotation->name == SNAME("@warning_ignore")) {
|
||||
for (int warning_code = 0; warning_code < GDScriptWarning::WARNING_MAX; warning_code++) {
|
||||
ScriptCodeCompletionOption warning(GDScriptWarning::get_name_from_code((GDScriptWarning::Code)warning_code).to_lower(), ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption warning(GDScriptWarning::get_name_from_code((GDScriptWarning::Code)warning_code).to_lower(), ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
r_result.insert(warning.display, warning);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void _list_available_types(bool p_inherit_only, GDScriptParser::CompletionContext &p_context, Map<String, ScriptCodeCompletionOption> &r_result) {
|
||||
static void _list_available_types(bool p_inherit_only, GDScriptParser::CompletionContext &p_context, Map<String, ScriptLanguage::CodeCompletionOption> &r_result) {
|
||||
List<StringName> native_types;
|
||||
ClassDB::get_class_list(&native_types);
|
||||
for (const StringName &E : native_types) {
|
||||
if (ClassDB::is_class_exposed(E) && !Engine::get_singleton()->has_singleton(E)) {
|
||||
ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -708,7 +708,7 @@ static void _list_available_types(bool p_inherit_only, GDScriptParser::Completio
|
|||
List<StringName> enums;
|
||||
ClassDB::get_enum_list(p_context.current_class->base_type.native_type, &enums);
|
||||
for (const StringName &E : enums) {
|
||||
ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_ENUM);
|
||||
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_ENUM);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -719,18 +719,18 @@ static void _list_available_types(bool p_inherit_only, GDScriptParser::Completio
|
|||
const GDScriptParser::ClassNode::Member &member = current->members[i];
|
||||
switch (member.type) {
|
||||
case GDScriptParser::ClassNode::Member::CLASS: {
|
||||
ScriptCodeCompletionOption option(member.m_class->identifier->name, ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption option(member.m_class->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(option.display, option);
|
||||
} break;
|
||||
case GDScriptParser::ClassNode::Member::ENUM: {
|
||||
if (!p_inherit_only) {
|
||||
ScriptCodeCompletionOption option(member.m_enum->identifier->name, ScriptCodeCompletionOption::KIND_ENUM);
|
||||
ScriptLanguage::CodeCompletionOption option(member.m_enum->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_ENUM);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
} break;
|
||||
case GDScriptParser::ClassNode::Member::CONSTANT: {
|
||||
if (member.constant->get_datatype().is_meta_type && p_context.current_class->outer != nullptr) {
|
||||
ScriptCodeCompletionOption option(member.constant->identifier->name, ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption option(member.constant->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
} break;
|
||||
|
|
@ -746,7 +746,7 @@ static void _list_available_types(bool p_inherit_only, GDScriptParser::Completio
|
|||
List<StringName> global_classes;
|
||||
ScriptServer::get_global_class_list(&global_classes);
|
||||
for (const StringName &E : global_classes) {
|
||||
ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
||||
|
|
@ -757,19 +757,19 @@ static void _list_available_types(bool p_inherit_only, GDScriptParser::Completio
|
|||
if (!info.is_singleton || info.path.get_extension().to_lower() != "gd") {
|
||||
continue;
|
||||
}
|
||||
ScriptCodeCompletionOption option(info.name, ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption option(info.name, ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
||||
static void _find_identifiers_in_suite(const GDScriptParser::SuiteNode *p_suite, Map<String, ScriptCodeCompletionOption> &r_result) {
|
||||
static void _find_identifiers_in_suite(const GDScriptParser::SuiteNode *p_suite, Map<String, ScriptLanguage::CodeCompletionOption> &r_result) {
|
||||
for (int i = 0; i < p_suite->locals.size(); i++) {
|
||||
ScriptCodeCompletionOption option;
|
||||
ScriptLanguage::CodeCompletionOption option;
|
||||
if (p_suite->locals[i].type == GDScriptParser::SuiteNode::Local::CONSTANT) {
|
||||
option = ScriptCodeCompletionOption(p_suite->locals[i].name, ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
option = ScriptLanguage::CodeCompletionOption(p_suite->locals[i].name, ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
option.default_value = p_suite->locals[i].constant->initializer->reduced_value;
|
||||
} else {
|
||||
option = ScriptCodeCompletionOption(p_suite->locals[i].name, ScriptCodeCompletionOption::KIND_VARIABLE);
|
||||
option = ScriptLanguage::CodeCompletionOption(p_suite->locals[i].name, ScriptLanguage::CODE_COMPLETION_KIND_VARIABLE);
|
||||
}
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
|
@ -778,9 +778,9 @@ static void _find_identifiers_in_suite(const GDScriptParser::SuiteNode *p_suite,
|
|||
}
|
||||
}
|
||||
|
||||
static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth);
|
||||
static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth);
|
||||
|
||||
static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class, bool p_only_functions, bool p_static, bool p_parent_only, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth) {
|
||||
static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class, bool p_only_functions, bool p_static, bool p_parent_only, Map<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
|
||||
ERR_FAIL_COND(p_recursion_depth > COMPLETION_RECURSION_LIMIT);
|
||||
|
||||
if (!p_parent_only) {
|
||||
|
|
@ -789,13 +789,13 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
|
|||
while (clss) {
|
||||
for (int i = 0; i < clss->members.size(); i++) {
|
||||
const GDScriptParser::ClassNode::Member &member = clss->members[i];
|
||||
ScriptCodeCompletionOption option;
|
||||
ScriptLanguage::CodeCompletionOption option;
|
||||
switch (member.type) {
|
||||
case GDScriptParser::ClassNode::Member::VARIABLE:
|
||||
if (p_only_functions || outer || (p_static)) {
|
||||
continue;
|
||||
}
|
||||
option = ScriptCodeCompletionOption(member.variable->identifier->name, ScriptCodeCompletionOption::KIND_MEMBER);
|
||||
option = ScriptLanguage::CodeCompletionOption(member.variable->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_MEMBER);
|
||||
break;
|
||||
case GDScriptParser::ClassNode::Member::CONSTANT:
|
||||
if (p_only_functions) {
|
||||
|
|
@ -804,7 +804,7 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
|
|||
if (r_result.has(member.constant->identifier->name)) {
|
||||
continue;
|
||||
}
|
||||
option = ScriptCodeCompletionOption(member.constant->identifier->name, ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
option = ScriptLanguage::CodeCompletionOption(member.constant->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
if (member.constant->initializer) {
|
||||
option.default_value = member.constant->initializer->reduced_value;
|
||||
}
|
||||
|
|
@ -813,25 +813,25 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
|
|||
if (p_only_functions) {
|
||||
continue;
|
||||
}
|
||||
option = ScriptCodeCompletionOption(member.m_class->identifier->name, ScriptCodeCompletionOption::KIND_CLASS);
|
||||
option = ScriptLanguage::CodeCompletionOption(member.m_class->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
break;
|
||||
case GDScriptParser::ClassNode::Member::ENUM_VALUE:
|
||||
if (p_only_functions) {
|
||||
continue;
|
||||
}
|
||||
option = ScriptCodeCompletionOption(member.enum_value.identifier->name, ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
option = ScriptLanguage::CodeCompletionOption(member.enum_value.identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
break;
|
||||
case GDScriptParser::ClassNode::Member::ENUM:
|
||||
if (p_only_functions) {
|
||||
continue;
|
||||
}
|
||||
option = ScriptCodeCompletionOption(member.m_enum->identifier->name, ScriptCodeCompletionOption::KIND_ENUM);
|
||||
option = ScriptLanguage::CodeCompletionOption(member.m_enum->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_ENUM);
|
||||
break;
|
||||
case GDScriptParser::ClassNode::Member::FUNCTION:
|
||||
if (outer || (p_static && !member.function->is_static) || member.function->identifier->name.operator String().begins_with("@")) {
|
||||
continue;
|
||||
}
|
||||
option = ScriptCodeCompletionOption(member.function->identifier->name, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
option = ScriptLanguage::CodeCompletionOption(member.function->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
if (member.function->parameters.size() > 0) {
|
||||
option.insert_text += "(";
|
||||
} else {
|
||||
|
|
@ -842,7 +842,7 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
|
|||
if (p_only_functions || outer) {
|
||||
continue;
|
||||
}
|
||||
option = ScriptCodeCompletionOption(member.signal->identifier->name, ScriptCodeCompletionOption::KIND_SIGNAL);
|
||||
option = ScriptLanguage::CodeCompletionOption(member.signal->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_SIGNAL);
|
||||
break;
|
||||
case GDScriptParser::ClassNode::Member::UNDEFINED:
|
||||
break;
|
||||
|
|
@ -862,14 +862,14 @@ static void _find_identifiers_in_class(const GDScriptParser::ClassNode *p_class,
|
|||
_find_identifiers_in_base(base_type, p_only_functions, r_result, p_recursion_depth + 1);
|
||||
}
|
||||
|
||||
static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth) {
|
||||
static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base, bool p_only_functions, Map<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
|
||||
ERR_FAIL_COND(p_recursion_depth > COMPLETION_RECURSION_LIMIT);
|
||||
|
||||
GDScriptParser::DataType base_type = p_base.type;
|
||||
bool _static = base_type.is_meta_type;
|
||||
|
||||
if (_static && base_type.kind != GDScriptParser::DataType::BUILTIN) {
|
||||
ScriptCodeCompletionOption option("new", ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option("new", ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
option.insert_text += "(";
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
|
@ -889,21 +889,21 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
List<PropertyInfo> members;
|
||||
scr->get_script_property_list(&members);
|
||||
for (const PropertyInfo &E : members) {
|
||||
ScriptCodeCompletionOption option(E.name, ScriptCodeCompletionOption::KIND_MEMBER);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_MEMBER);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
Map<StringName, Variant> constants;
|
||||
scr->get_constants(&constants);
|
||||
for (const KeyValue<StringName, Variant> &E : constants) {
|
||||
ScriptCodeCompletionOption option(E.key.operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
ScriptLanguage::CodeCompletionOption option(E.key.operator String(), ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
||||
List<MethodInfo> signals;
|
||||
scr->get_script_signal_list(&signals);
|
||||
for (const MethodInfo &E : signals) {
|
||||
ScriptCodeCompletionOption option(E.name, ScriptCodeCompletionOption::KIND_SIGNAL);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_SIGNAL);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -914,7 +914,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
if (E.name.begins_with("@")) {
|
||||
continue;
|
||||
}
|
||||
ScriptCodeCompletionOption option(E.name, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
if (E.arguments.size()) {
|
||||
option.insert_text += "(";
|
||||
} else {
|
||||
|
|
@ -944,7 +944,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
List<String> constants;
|
||||
ClassDB::get_integer_constant_list(type, &constants);
|
||||
for (const String &E : constants) {
|
||||
ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
||||
|
|
@ -958,7 +958,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
if (E.name.contains("/")) {
|
||||
continue;
|
||||
}
|
||||
ScriptCodeCompletionOption option(E.name, ScriptCodeCompletionOption::KIND_MEMBER);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_MEMBER);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -971,7 +971,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
if (E.name.begins_with("_")) {
|
||||
continue;
|
||||
}
|
||||
ScriptCodeCompletionOption option(E.name, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
if (E.arguments.size()) {
|
||||
option.insert_text += "(";
|
||||
} else {
|
||||
|
|
@ -1001,7 +1001,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
|
||||
for (const PropertyInfo &E : members) {
|
||||
if (!String(E.name).contains("/")) {
|
||||
ScriptCodeCompletionOption option(E.name, ScriptCodeCompletionOption::KIND_MEMBER);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_MEMBER);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -1010,7 +1010,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
List<MethodInfo> methods;
|
||||
tmp.get_method_list(&methods);
|
||||
for (const MethodInfo &E : methods) {
|
||||
ScriptCodeCompletionOption option(E.name, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
if (E.arguments.size()) {
|
||||
option.insert_text += "(";
|
||||
} else {
|
||||
|
|
@ -1028,7 +1028,7 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
|
|||
}
|
||||
}
|
||||
|
||||
static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool p_only_functions, Map<String, ScriptCodeCompletionOption> &r_result, int p_recursion_depth) {
|
||||
static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool p_only_functions, Map<String, ScriptLanguage::CodeCompletionOption> &r_result, int p_recursion_depth) {
|
||||
if (!p_only_functions && p_context.current_suite) {
|
||||
// This includes function parameters, since they are also locals.
|
||||
_find_identifiers_in_suite(p_context.current_suite, r_result);
|
||||
|
|
@ -1043,7 +1043,7 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
|
|||
|
||||
for (const StringName &E : functions) {
|
||||
MethodInfo function = GDScriptUtilityFunctions::get_function_info(E);
|
||||
ScriptCodeCompletionOption option(String(E), ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(String(E), ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
if (function.arguments.size() || (function.flags & METHOD_FLAG_VARARG)) {
|
||||
option.insert_text += "(";
|
||||
} else {
|
||||
|
|
@ -1064,7 +1064,7 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
|
|||
static_assert((sizeof(_type_names) / sizeof(*_type_names)) == Variant::VARIANT_MAX, "Completion for builtin types is incomplete");
|
||||
|
||||
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
|
||||
ScriptCodeCompletionOption option(_type_names[i], ScriptCodeCompletionOption::KIND_CLASS);
|
||||
ScriptLanguage::CodeCompletionOption option(_type_names[i], ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
||||
|
|
@ -1076,7 +1076,7 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
|
|||
|
||||
const char **kw = _keywords;
|
||||
while (*kw) {
|
||||
ScriptCodeCompletionOption option(*kw, ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption option(*kw, ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
r_result.insert(option.display, option);
|
||||
kw++;
|
||||
}
|
||||
|
|
@ -1089,7 +1089,7 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
|
|||
|
||||
const char **kws = _keywords_with_space;
|
||||
while (*kws) {
|
||||
ScriptCodeCompletionOption option(*kws, ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption option(*kws, ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
option.insert_text += " ";
|
||||
r_result.insert(option.display, option);
|
||||
kws++;
|
||||
|
|
@ -1102,7 +1102,7 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
|
|||
|
||||
const char **kwa = _keywords_with_args;
|
||||
while (*kwa) {
|
||||
ScriptCodeCompletionOption option(*kwa, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(*kwa, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
option.insert_text += "(";
|
||||
r_result.insert(option.display, option);
|
||||
kwa++;
|
||||
|
|
@ -1112,7 +1112,7 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
|
|||
Variant::get_utility_function_list(&utility_func_names);
|
||||
|
||||
for (List<StringName>::Element *E = utility_func_names.front(); E; E = E->next()) {
|
||||
ScriptCodeCompletionOption option(E->get(), ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(E->get(), ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
option.insert_text += "(";
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
|
@ -1122,17 +1122,17 @@ static void _find_identifiers(GDScriptParser::CompletionContext &p_context, bool
|
|||
if (!E.value().is_singleton) {
|
||||
continue;
|
||||
}
|
||||
ScriptCodeCompletionOption option(E.key(), ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
ScriptLanguage::CodeCompletionOption option(E.key(), ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
||||
// Native classes and global constants.
|
||||
for (const KeyValue<StringName, int> &E : GDScriptLanguage::get_singleton()->get_global_map()) {
|
||||
ScriptCodeCompletionOption option;
|
||||
ScriptLanguage::CodeCompletionOption option;
|
||||
if (ClassDB::class_exists(E.key) || Engine::get_singleton()->has_singleton(E.key)) {
|
||||
option = ScriptCodeCompletionOption(E.key.operator String(), ScriptCodeCompletionOption::KIND_CLASS);
|
||||
option = ScriptLanguage::CodeCompletionOption(E.key.operator String(), ScriptLanguage::CODE_COMPLETION_KIND_CLASS);
|
||||
} else {
|
||||
option = ScriptCodeCompletionOption(E.key.operator String(), ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
option = ScriptLanguage::CodeCompletionOption(E.key.operator String(), ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
}
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
|
@ -2210,20 +2210,20 @@ static bool _guess_method_return_type_from_base(GDScriptParser::CompletionContex
|
|||
return false;
|
||||
}
|
||||
|
||||
static void _find_enumeration_candidates(GDScriptParser::CompletionContext &p_context, const String &p_enum_hint, Map<String, ScriptCodeCompletionOption> &r_result) {
|
||||
static void _find_enumeration_candidates(GDScriptParser::CompletionContext &p_context, const String &p_enum_hint, Map<String, ScriptLanguage::CodeCompletionOption> &r_result) {
|
||||
if (!p_enum_hint.contains(".")) {
|
||||
// Global constant or in the current class.
|
||||
StringName current_enum = p_enum_hint;
|
||||
if (p_context.current_class && p_context.current_class->has_member(current_enum) && p_context.current_class->get_member(current_enum).type == GDScriptParser::ClassNode::Member::ENUM) {
|
||||
const GDScriptParser::EnumNode *_enum = p_context.current_class->get_member(current_enum).m_enum;
|
||||
for (int i = 0; i < _enum->values.size(); i++) {
|
||||
ScriptCodeCompletionOption option(_enum->values[i].identifier->name, ScriptCodeCompletionOption::KIND_ENUM);
|
||||
ScriptLanguage::CodeCompletionOption option(_enum->values[i].identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_ENUM);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
} else {
|
||||
for (int i = 0; i < CoreConstants::get_global_constant_count(); i++) {
|
||||
if (CoreConstants::get_global_constant_enum(i) == current_enum) {
|
||||
ScriptCodeCompletionOption option(CoreConstants::get_global_constant_name(i), ScriptCodeCompletionOption::KIND_ENUM);
|
||||
ScriptLanguage::CodeCompletionOption option(CoreConstants::get_global_constant_name(i), ScriptLanguage::CODE_COMPLETION_KIND_ENUM);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -2240,13 +2240,13 @@ static void _find_enumeration_candidates(GDScriptParser::CompletionContext &p_co
|
|||
ClassDB::get_enum_constants(class_name, enum_name, &enum_constants);
|
||||
for (const StringName &E : enum_constants) {
|
||||
String candidate = class_name + "." + E;
|
||||
ScriptCodeCompletionOption option(candidate, ScriptCodeCompletionOption::KIND_ENUM);
|
||||
ScriptLanguage::CodeCompletionOption option(candidate, ScriptLanguage::CODE_COMPLETION_KIND_ENUM);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, int p_argidx, bool p_static, Map<String, ScriptCodeCompletionOption> &r_result, String &r_arghint) {
|
||||
static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, const GDScriptCompletionIdentifier &p_base, const StringName &p_method, int p_argidx, bool p_static, Map<String, ScriptLanguage::CodeCompletionOption> &r_result, String &r_arghint) {
|
||||
Variant base = p_base.value;
|
||||
GDScriptParser::DataType base_type = p_base.type;
|
||||
|
||||
|
|
@ -2287,7 +2287,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
if (opt.is_quoted()) {
|
||||
opt = opt.unquote().quote(quote_style); // Handle user preference.
|
||||
}
|
||||
ScriptCodeCompletionOption option(opt, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(opt, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -2314,7 +2314,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
continue;
|
||||
}
|
||||
String name = s.get_slice("/", 1);
|
||||
ScriptCodeCompletionOption option("/root/" + name, ScriptCodeCompletionOption::KIND_NODE_PATH);
|
||||
ScriptLanguage::CodeCompletionOption option("/root/" + name, ScriptLanguage::CODE_COMPLETION_KIND_NODE_PATH);
|
||||
option.insert_text = option.display.quote(quote_style);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
|
@ -2330,7 +2330,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
continue;
|
||||
}
|
||||
String name = s.get_slice("/", 1);
|
||||
ScriptCodeCompletionOption option(name, ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
ScriptLanguage::CodeCompletionOption option(name, ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
option.insert_text = option.display.quote(quote_style);
|
||||
r_result.insert(option.display, option);
|
||||
}
|
||||
|
|
@ -2365,7 +2365,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
}
|
||||
}
|
||||
|
||||
static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, const GDScriptParser::Node *p_call, int p_argidx, Map<String, ScriptCodeCompletionOption> &r_result, bool &r_forced, String &r_arghint) {
|
||||
static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, const GDScriptParser::Node *p_call, int p_argidx, Map<String, ScriptLanguage::CodeCompletionOption> &r_result, bool &r_forced, String &r_arghint) {
|
||||
if (p_call->type == GDScriptParser::Node::PRELOAD) {
|
||||
if (p_argidx == 0 && bool(EditorSettings::get_singleton()->get("text_editor/completion/complete_file_paths"))) {
|
||||
_get_directory_contents(EditorFileSystem::get_singleton()->get_filesystem(), r_result);
|
||||
|
|
@ -2444,7 +2444,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
r_forced = r_result.size() > 0;
|
||||
}
|
||||
|
||||
::Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptCodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint) {
|
||||
::Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptLanguage::CodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint) {
|
||||
const String quote_style = EDITOR_GET("text_editor/completion/use_single_quotes") ? "'" : "\"";
|
||||
|
||||
GDScriptParser parser;
|
||||
|
|
@ -2454,7 +2454,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
analyzer.analyze();
|
||||
|
||||
r_forced = false;
|
||||
Map<String, ScriptCodeCompletionOption> options;
|
||||
Map<String, ScriptLanguage::CodeCompletionOption> options;
|
||||
|
||||
GDScriptParser::CompletionContext completion_context = parser.get_completion_context();
|
||||
completion_context.base = p_owner;
|
||||
|
|
@ -2467,7 +2467,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
List<MethodInfo> annotations;
|
||||
parser.get_annotation_list(&annotations);
|
||||
for (const MethodInfo &E : annotations) {
|
||||
ScriptCodeCompletionOption option(E.name.substr(1), ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption option(E.name.substr(1), ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
if (E.arguments.size() > 0) {
|
||||
option.insert_text += "(";
|
||||
}
|
||||
|
|
@ -2487,7 +2487,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
List<StringName> constants;
|
||||
Variant::get_constants_for_type(completion_context.builtin_type, &constants);
|
||||
for (const StringName &E : constants) {
|
||||
ScriptCodeCompletionOption option(E, ScriptCodeCompletionOption::KIND_CONSTANT);
|
||||
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT);
|
||||
bool valid = false;
|
||||
Variant default_value = Variant::get_constant_value(completion_context.builtin_type, E, &valid);
|
||||
if (valid) {
|
||||
|
|
@ -2501,7 +2501,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
r_forced = true;
|
||||
} break;
|
||||
case GDScriptParser::COMPLETION_TYPE_NAME_OR_VOID: {
|
||||
ScriptCodeCompletionOption option("void", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption option("void", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
options.insert(option.display, option);
|
||||
}
|
||||
[[fallthrough]];
|
||||
|
|
@ -2511,16 +2511,16 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
} break;
|
||||
case GDScriptParser::COMPLETION_PROPERTY_DECLARATION_OR_TYPE: {
|
||||
_list_available_types(false, completion_context, options);
|
||||
ScriptCodeCompletionOption get("get", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption get("get", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
options.insert(get.display, get);
|
||||
ScriptCodeCompletionOption set("set", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption set("set", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
options.insert(set.display, set);
|
||||
r_forced = true;
|
||||
} break;
|
||||
case GDScriptParser::COMPLETION_PROPERTY_DECLARATION: {
|
||||
ScriptCodeCompletionOption get("get", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption get("get", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
options.insert(get.display, get);
|
||||
ScriptCodeCompletionOption set("set", ScriptCodeCompletionOption::KIND_PLAIN_TEXT);
|
||||
ScriptLanguage::CodeCompletionOption set("set", ScriptLanguage::CODE_COMPLETION_KIND_PLAIN_TEXT);
|
||||
options.insert(set.display, set);
|
||||
r_forced = true;
|
||||
} break;
|
||||
|
|
@ -2536,7 +2536,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
if (member.function->is_static) {
|
||||
continue;
|
||||
}
|
||||
ScriptCodeCompletionOption option(member.function->identifier->name, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(member.function->identifier->name, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
options.insert(option.display, option);
|
||||
}
|
||||
r_forced = true;
|
||||
|
|
@ -2706,7 +2706,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
}
|
||||
method_hint += ":";
|
||||
|
||||
ScriptCodeCompletionOption option(method_hint, ScriptCodeCompletionOption::KIND_FUNCTION);
|
||||
ScriptLanguage::CodeCompletionOption option(method_hint, ScriptLanguage::CODE_COMPLETION_KIND_FUNCTION);
|
||||
options.insert(option.display, option);
|
||||
}
|
||||
} break;
|
||||
|
|
@ -2729,7 +2729,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
if (!opt.replace("/", "_").is_valid_identifier()) {
|
||||
opt = opt.quote(quote_style); // Handle user preference.
|
||||
}
|
||||
ScriptCodeCompletionOption option(opt, ScriptCodeCompletionOption::KIND_NODE_PATH);
|
||||
ScriptLanguage::CodeCompletionOption option(opt, ScriptLanguage::CODE_COMPLETION_KIND_NODE_PATH);
|
||||
options.insert(option.display, option);
|
||||
}
|
||||
|
||||
|
|
@ -2738,7 +2738,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
|
||||
for (OrderedHashMap<StringName, ProjectSettings::AutoloadInfo>::Element E = autoloads.front(); E; E = E.next()) {
|
||||
String path = "/root/" + E.key();
|
||||
ScriptCodeCompletionOption option(path.quote(quote_style), ScriptCodeCompletionOption::KIND_NODE_PATH);
|
||||
ScriptLanguage::CodeCompletionOption option(path.quote(quote_style), ScriptLanguage::CODE_COMPLETION_KIND_NODE_PATH);
|
||||
options.insert(option.display, option);
|
||||
}
|
||||
}
|
||||
|
|
@ -2751,7 +2751,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
} break;
|
||||
}
|
||||
|
||||
for (const KeyValue<String, ScriptCodeCompletionOption> &E : options) {
|
||||
for (const KeyValue<String, ScriptLanguage::CodeCompletionOption> &E : options) {
|
||||
r_options->push_back(E.value);
|
||||
}
|
||||
|
||||
|
|
@ -2760,7 +2760,7 @@ static void _find_call_arguments(GDScriptParser::CompletionContext &p_context, c
|
|||
|
||||
#else
|
||||
|
||||
Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptCodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint) {
|
||||
Error GDScriptLanguage::complete_code(const String &p_code, const String &p_path, Object *p_owner, List<ScriptLanguage::CodeCompletionOption> *r_options, bool &r_forced, String &r_call_hint) {
|
||||
return OK;
|
||||
}
|
||||
|
||||
|
|
@ -2859,7 +2859,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
case GDScriptParser::DataType::CLASS: {
|
||||
if (base_type.class_type) {
|
||||
if (base_type.class_type->has_member(p_symbol)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
|
||||
r_result.location = base_type.class_type->get_member(p_symbol).get_line();
|
||||
r_result.class_path = base_type.script_path;
|
||||
r_result.script = GDScriptCache::get_shallow_script(r_result.class_path);
|
||||
|
|
@ -2873,7 +2873,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
if (scr.is_valid()) {
|
||||
int line = scr->get_member_line(p_symbol);
|
||||
if (line >= 0) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
|
||||
r_result.location = line;
|
||||
r_result.script = scr;
|
||||
return OK;
|
||||
|
|
@ -2897,7 +2897,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
}
|
||||
|
||||
if (ClassDB::has_method(class_name, p_symbol, true)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_METHOD;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
|
||||
r_result.class_name = base_type.native_type;
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -2907,7 +2907,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
ClassDB::get_virtual_methods(class_name, &virtual_methods, true);
|
||||
for (const MethodInfo &E : virtual_methods) {
|
||||
if (E.name == p_symbol) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_METHOD;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
|
||||
r_result.class_name = base_type.native_type;
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -2916,7 +2916,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
|
||||
StringName enum_name = ClassDB::get_integer_constant_enum(class_name, p_symbol, true);
|
||||
if (enum_name != StringName()) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_ENUM;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_ENUM;
|
||||
r_result.class_name = base_type.native_type;
|
||||
r_result.class_member = enum_name;
|
||||
return OK;
|
||||
|
|
@ -2926,7 +2926,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
ClassDB::get_integer_constant_list(class_name, &constants, true);
|
||||
for (const String &E : constants) {
|
||||
if (E == p_symbol) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
|
||||
r_result.class_name = base_type.native_type;
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -2934,7 +2934,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
}
|
||||
|
||||
if (ClassDB::has_property(class_name, p_symbol, true)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_PROPERTY;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY;
|
||||
r_result.class_name = base_type.native_type;
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -2951,7 +2951,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
base_type.kind = GDScriptParser::DataType::UNRESOLVED;
|
||||
|
||||
if (Variant::has_constant(base_type.builtin_type, p_symbol)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
|
||||
r_result.class_name = Variant::get_type_name(base_type.builtin_type);
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -2971,7 +2971,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
}
|
||||
|
||||
if (v.has_method(p_symbol)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_METHOD;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
|
||||
r_result.class_name = Variant::get_type_name(base_type.builtin_type);
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -2980,7 +2980,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
bool valid = false;
|
||||
v.get(p_symbol, &valid);
|
||||
if (valid) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_PROPERTY;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_PROPERTY;
|
||||
r_result.class_name = Variant::get_type_name(base_type.builtin_type);
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -2998,7 +2998,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)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS;
|
||||
r_result.class_name = p_symbol;
|
||||
return OK;
|
||||
}
|
||||
|
|
@ -3006,21 +3006,21 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
|
||||
Variant::Type t = Variant::Type(i);
|
||||
if (Variant::get_type_name(t) == p_symbol) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS;
|
||||
r_result.class_name = Variant::get_type_name(t);
|
||||
return OK;
|
||||
}
|
||||
}
|
||||
|
||||
if (GDScriptUtilityFunctions::function_exists(p_symbol)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_METHOD;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_METHOD;
|
||||
r_result.class_name = "@GDScript";
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
}
|
||||
|
||||
if ("PI" == p_symbol || "TAU" == p_symbol || "INF" == p_symbol || "NAN" == p_symbol) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
|
||||
r_result.class_name = "@GDScript";
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -3037,7 +3037,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
bool success = false;
|
||||
ClassDB::get_integer_constant(context.current_class->extends[0], p_symbol, &success);
|
||||
if (success) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
|
||||
r_result.class_name = context.current_class->extends[0];
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -3048,7 +3048,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
|
||||
switch (context.type) {
|
||||
case GDScriptParser::COMPLETION_BUILT_IN_TYPE_CONSTANT: {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
|
||||
r_result.class_name = Variant::get_type_name(context.builtin_type);
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -3076,7 +3076,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
const GDScriptParser::SuiteNode *suite = context.current_suite;
|
||||
while (suite) {
|
||||
if (suite->has_local(p_symbol)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
|
||||
r_result.location = suite->get_local(p_symbol).start_line;
|
||||
return OK;
|
||||
}
|
||||
|
|
@ -3101,7 +3101,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
}
|
||||
|
||||
if (FileAccess::exists(script)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_SCRIPT_LOCATION;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_SCRIPT_LOCATION;
|
||||
r_result.location = 0;
|
||||
r_result.script = ResourceLoader::load(script);
|
||||
return OK;
|
||||
|
|
@ -3117,10 +3117,10 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
Object *obj = value;
|
||||
if (obj) {
|
||||
if (Object::cast_to<GDScriptNativeClass>(obj)) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS;
|
||||
r_result.class_name = Object::cast_to<GDScriptNativeClass>(obj)->get_name();
|
||||
} else {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS;
|
||||
r_result.class_name = obj->get_class();
|
||||
}
|
||||
|
||||
|
|
@ -3137,18 +3137,18 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
// Otherwise these codes would work
|
||||
StringName enumName = ClassDB::get_integer_constant_enum("@GlobalScope", p_symbol, true);
|
||||
if (enumName != nullptr) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_ENUM;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_ENUM;
|
||||
r_result.class_name = "@GlobalScope";
|
||||
r_result.class_member = enumName;
|
||||
return OK;
|
||||
}
|
||||
else {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_CONSTANT;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
|
||||
r_result.class_name = "@GlobalScope";
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
}*/
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_TBD_GLOBALSCOPE;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE;
|
||||
r_result.class_name = "@GlobalScope";
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
@ -3157,7 +3157,7 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
|
|||
List<StringName> utility_functions;
|
||||
Variant::get_utility_function_list(&utility_functions);
|
||||
if (utility_functions.find(p_symbol) != nullptr) {
|
||||
r_result.type = ScriptLanguage::LookupResult::RESULT_CLASS_TBD_GLOBALSCOPE;
|
||||
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_TBD_GLOBALSCOPE;
|
||||
r_result.class_name = "@GlobalScope";
|
||||
r_result.class_member = p_symbol;
|
||||
return OK;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue