From 4c72a531e4c335a596aecf284b38a83903b63fc7 Mon Sep 17 00:00:00 2001 From: HolonProduction Date: Thu, 30 Jan 2025 13:06:10 +0100 Subject: [PATCH] Highlighting: Improve enum support --- modules/gdscript/editor/gdscript_highlighter.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/gdscript/editor/gdscript_highlighter.cpp b/modules/gdscript/editor/gdscript_highlighter.cpp index 9bcb21909f..a3cb4e5c07 100644 --- a/modules/gdscript/editor/gdscript_highlighter.cpp +++ b/modules/gdscript/editor/gdscript_highlighter.cpp @@ -34,6 +34,7 @@ #include "../gdscript_tokenizer.h" #include "core/config/project_settings.h" +#include "core/core_constants.h" #include "editor/editor_settings.h" #include "editor/themes/editor_theme_manager.h" #include "scene/gui/text_edit.h" @@ -722,6 +723,13 @@ void GDScriptSyntaxHighlighter::_update_cache() { } } + /* Global enums. */ + List global_enums; + CoreConstants::get_global_enums(&global_enums); + for (const StringName &enum_name : global_enums) { + class_names[enum_name] = types_color; + } + /* User types. */ const Color usertype_color = EDITOR_GET("text_editor/theme/highlighting/user_type_color"); List global_classes; @@ -848,6 +856,12 @@ void GDScriptSyntaxHighlighter::_update_cache() { for (const String &E : constant_list) { member_keywords[E] = member_variable_color; } + + List builtin_enums; + ClassDB::get_enum_list(instance_base, &builtin_enums); + for (const StringName &E : builtin_enums) { + member_keywords[E] = types_color; + } } List scr_property_list;