Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix enum autocompletion for core classes #89382

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Fix enum autocompletion for core classes #89382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions modules/gdscript/gdscript_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,21 @@ static int _get_enum_constant_location(const StringName &p_class, const StringNa
return depth | ScriptLanguage::LOCATION_PARENT_MASK;
}

static int _get_enum_location(const StringName &p_class, const StringName &p_enum) {
if (!ClassDB::has_enum(p_class, p_enum)) {
return ScriptLanguage::LOCATION_OTHER;
}

int depth = 0;
StringName class_test = p_class;
while (class_test && !ClassDB::has_enum(class_test, p_enum, true)) {
class_test = ClassDB::get_parent_class(class_test);
depth++;
}

return depth | ScriptLanguage::LOCATION_PARENT_MASK;
}

// END LOCATION METHODS

static String _trim_parent_class(const String &p_class, const String &p_base_class) {
Expand Down Expand Up @@ -1198,13 +1213,15 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
return;
}

List<StringName> enums;
ClassDB::get_enum_list(type, &enums);
for (const StringName &E : enums) {
int location = p_recursion_depth + _get_enum_location(type, E);
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_ENUM, location);
r_result.insert(option.display, option);
}

if (p_types_only) {
List<StringName> enums;
ClassDB::get_enum_list(type, &enums);
for (const StringName &E : enums) {
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_ENUM);
r_result.insert(option.display, option);
}
return;
}

Expand Down Expand Up @@ -1264,7 +1281,20 @@ static void _find_identifiers_in_base(const GDScriptCompletionIdentifier &p_base
}
return;
} break;
case GDScriptParser::DataType::ENUM:
case GDScriptParser::DataType::ENUM: {
String type_str = base_type.native_type;
StringName type = type_str.get_slicec('.', 0);
StringName type_enum = base_type.enum_type;

List<StringName> enum_values;
ClassDB::get_enum_constants(type, type_enum, &enum_values);
for (const StringName &E : enum_values) {
int location = p_recursion_depth + _get_enum_constant_location(type, E);
ScriptLanguage::CodeCompletionOption option(E, ScriptLanguage::CODE_COMPLETION_KIND_CONSTANT, location);
r_result.insert(option.display, option);
}
}
[[fallthrough]];
AThousandShips marked this conversation as resolved.
Show resolved Hide resolved
case GDScriptParser::DataType::BUILTIN: {
if (p_types_only) {
return;
Expand Down
9 changes: 9 additions & 0 deletions modules/gdscript/tests/scripts/completion/builtin_enum/builtin_enum_autocomplete.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[output]
include=[
{"display": "DrawMode",
"location": 256},
{"display": "Anchor",
"location": 257},
{"display": "TextureRepeat",
"location": 258},
]
4 changes: 4 additions & 0 deletions modules/gdscript/tests/scripts/completion/builtin_enum/builtin_enum_autocomplete.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
extends Control

func _ready():
var t = BaseButton.➡
5 changes: 5 additions & 0 deletions ...les/gdscript/tests/scripts/completion/builtin_enum/builtin_enum_values_autocompletion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[output]
include=[
{"display": "HEURISTIC_MAX"},
{"display": "HEURISTIC_OCTILE"},
]
4 changes: 4 additions & 0 deletions modules/gdscript/tests/scripts/completion/builtin_enum/builtin_enum_values_autocompletion.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
extends Control

func _ready():
AStarGrid2D.Heuristic.➡
Loading