Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-26 14:13:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #51655 from RevoluPowered/improve-gdscript-code-editor-performance

Browse Source 
Improve GDScript Editor performance
This commit is contained in:
Rémi Verschelde 2021-09-21 15:18:17 +02:00 committed by GitHub
commit b458feba24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/code_editor.cpp
View File

@ -1579,17 +1579,10 @@ void CodeTextEditor::_update_text_editor_theme() {
}
void CodeTextEditor::_on_settings_change() {
if (settings_changed) {
return;
}
settings_changed = true;
MessageQueue::get_singleton()->push_callable(callable_mp(this, &CodeTextEditor::_apply_settings_change));
_apply_settings_change();
}
void CodeTextEditor::_apply_settings_change() {
settings_changed = false;
_update_text_editor_theme();
font_size = EditorSettings::get_singleton()->get("interface/editor/code_font_size");

2
editor/code_editor.h
View File

@ -162,8 +162,6 @@ class CodeTextEditor : public VBoxContainer {
int error_line;
int error_column;
bool settings_changed = false;
void _on_settings_change();
void _apply_settings_change();

8
modules/gdscript/editor/gdscript_highlighter.cpp
View File

@ -467,7 +467,7 @@ void GDScriptSyntaxHighlighter::_update_cache() {
List<StringName> global_classes;
ScriptServer::get_global_class_list(&global_classes);
for (const StringName &E : global_classes) {
keywords[String(E)] = usertype_color;
keywords[E] = usertype_color;
}
/* Autoloads. */
@ -486,7 +486,7 @@ void GDScriptSyntaxHighlighter::_update_cache() {
List<String> core_types;
gdscript->get_core_type_words(&core_types);
for (const String &E : core_types) {
keywords[E] = basetype_color;
keywords[StringName(E)] = basetype_color;
}
/* Reserved words. */
@ -496,9 +496,9 @@ void GDScriptSyntaxHighlighter::_update_cache() {
gdscript->get_reserved_words(&keyword_list);
for (const String &E : keyword_list) {
if (gdscript->is_control_flow_keyword(E)) {
keywords[E] = control_flow_keyword_color;
keywords[StringName(E)] = control_flow_keyword_color;
} else {
keywords[E] = keyword_color;
keywords[StringName(E)] = keyword_color;
}
}

4
modules/gdscript/editor/gdscript_highlighter.h
View File

@ -47,8 +47,8 @@ private:
Vector<ColorRegion> color_regions;
Map<int, int> color_region_cache;
Dictionary keywords;
Dictionary member_keywords;
HashMap<StringName, Color> keywords;
HashMap<StringName, Color> member_keywords;
enum Type {
NONE,