godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Editor: Fix Ctrl+Click on enum values ​​does nothing

Browse Source
This commit is contained in:
Danil Alexeev
2025-01-04 17:12:55 +03:00
parent bdf625bd54
commit 4cef91e0f5
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
modules/gdscript/gdscript_editor.cpp
View File

@@ -3684,12 +3684,12 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
case GDScriptParser::ClassNode::Member::GROUP: case GDScriptParser::ClassNode::Member::GROUP:
return ERR_BUG; return ERR_BUG;
case GDScriptParser::ClassNode::Member::CLASS: { case GDScriptParser::ClassNode::Member::CLASS: {
String type_name; String doc_type_name;
String enum_name; String doc_enum_name;
GDScriptDocGen::doctype_from_gdtype(GDScriptAnalyzer::type_from_metatype(member.get_datatype()), type_name, enum_name); GDScriptDocGen::doctype_from_gdtype(GDScriptAnalyzer::type_from_metatype(member.get_datatype()), doc_type_name, doc_enum_name);
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS; r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS;
r_result.class_name = type_name; r_result.class_name = doc_type_name;
} break; } break;
case GDScriptParser::ClassNode::Member::CONSTANT: case GDScriptParser::ClassNode::Member::CONSTANT:
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT; r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
@@ -3712,11 +3712,11 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
} }
if (member.type != GDScriptParser::ClassNode::Member::CLASS) { if (member.type != GDScriptParser::ClassNode::Member::CLASS) {
String type_name; String doc_type_name;
String enum_name; String doc_enum_name;
GDScriptDocGen::doctype_from_gdtype(GDScriptAnalyzer::type_from_metatype(base_type), type_name, enum_name); GDScriptDocGen::doctype_from_gdtype(GDScriptAnalyzer::type_from_metatype(base_type), doc_type_name, doc_enum_name);
r_result.class_name = type_name; r_result.class_name = doc_type_name;
r_result.class_member = name; r_result.class_member = name;
} }
@@ -3934,21 +3934,35 @@ static Error _lookup_symbol_from_base(const GDScriptParser::DataType &p_base, co
case GDScriptParser::DataType::ENUM: { case GDScriptParser::DataType::ENUM: {
if (base_type.is_meta_type) { if (base_type.is_meta_type) {
if (base_type.enum_values.has(p_symbol)) { if (base_type.enum_values.has(p_symbol)) {
String type_name; String doc_type_name;
String enum_name; String doc_enum_name;
GDScriptDocGen::doctype_from_gdtype(GDScriptAnalyzer::type_from_metatype(base_type), type_name, enum_name); GDScriptDocGen::doctype_from_gdtype(GDScriptAnalyzer::type_from_metatype(base_type), doc_type_name, doc_enum_name);
if (CoreConstants::is_global_enum(enum_name)) { if (CoreConstants::is_global_enum(doc_enum_name)) {
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT; r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
r_result.class_name = "@GlobalScope"; r_result.class_name = "@GlobalScope";
r_result.class_member = p_symbol; r_result.class_member = p_symbol;
return OK; return OK;
} else { } else {
const int dot_pos = enum_name.rfind_char('.'); const int dot_pos = doc_enum_name.rfind_char('.');
if (dot_pos >= 0) { if (dot_pos >= 0) {
r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT; r_result.type = ScriptLanguage::LOOKUP_RESULT_CLASS_CONSTANT;
r_result.class_name = enum_name.left(dot_pos); r_result.class_name = doc_enum_name.left(dot_pos);
r_result.class_member = p_symbol; r_result.class_member = p_symbol;
if (base_type.class_type != nullptr) {
const String enum_name = doc_enum_name.substr(dot_pos + 1);
if (base_type.class_type->has_member(enum_name)) {
const GDScriptParser::ClassNode::Member member = base_type.class_type->get_member(enum_name);
if (member.type == GDScriptParser::ClassNode::Member::ENUM) {
for (const GDScriptParser::EnumNode::Value &value : member.m_enum->values) {
if (value.identifier->name == p_symbol) {
r_result.location = value.line;
break;
}
}
}
}
}
return OK; return OK;
} }
} }