Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 21:51:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #102469 from sockeye-d/warning-highlights

Browse source 
Highlight warning lines in Script editor
This commit is contained in:
Thaddeus Crews 2025-03-11 14:00:33 -05:00
commit 5280c0bf4a
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
5 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
editor/plugins/script_text_editor.cpp
View file

@ -184,16 +184,22 @@ void ScriptTextEditor::enable_editor(Control *p_shortcut_context) {
void ScriptTextEditor::_load_theme_settings() {
CodeEdit *text_edit = code_editor->get_text_editor();
Color updated_warning_line_color = EDITOR_GET("text_editor/theme/highlighting/warning_color");
Color updated_marked_line_color = EDITOR_GET("text_editor/theme/highlighting/mark_color");
Color updated_safe_line_number_color = EDITOR_GET("text_editor/theme/highlighting/safe_line_number_color");
Color updated_folded_code_region_color = EDITOR_GET("text_editor/theme/highlighting/folded_code_region_color");
bool safe_line_number_color_updated = updated_safe_line_number_color != safe_line_number_color;
bool warning_line_color_updated = updated_warning_line_color != warning_line_color;
bool marked_line_color_updated = updated_marked_line_color != marked_line_color;
bool safe_line_number_color_updated = updated_safe_line_number_color != safe_line_number_color;
bool folded_code_region_color_updated = updated_folded_code_region_color != folded_code_region_color;
if (safe_line_number_color_updated || marked_line_color_updated || folded_code_region_color_updated) {
if (safe_line_number_color_updated || warning_line_color_updated || marked_line_color_updated || folded_code_region_color_updated) {
safe_line_number_color = updated_safe_line_number_color;
for (int i = 0; i < text_edit->get_line_count(); i++) {
if (warning_line_color_updated && text_edit->get_line_background_color(i) == warning_line_color) {
text_edit->set_line_background_color(i, updated_warning_line_color);
}
if (marked_line_color_updated && text_edit->get_line_background_color(i) == marked_line_color) {
text_edit->set_line_background_color(i, updated_marked_line_color);
}
@ -206,6 +212,7 @@ void ScriptTextEditor::_load_theme_settings() {
text_edit->set_line_background_color(i, updated_folded_code_region_color);
}
}
warning_line_color = updated_warning_line_color;
marked_line_color = updated_marked_line_color;
folded_code_region_color = updated_folded_code_region_color;
}
@ -567,8 +574,8 @@ void ScriptTextEditor::_validate_script() {
script_is_valid = true;
}
_update_connected_methods();
_update_warnings();
_update_errors();
_update_warnings();
emit_signal(SNAME("name_changed"));
emit_signal(SNAME("edited_script_changed"));
@ -637,6 +644,17 @@ void ScriptTextEditor::_update_warnings() {
warnings_panel->pop(); // Cell.
}
warnings_panel->pop(); // Table.
if (warning_line_color.a != 0.0) {
CodeEdit *te = code_editor->get_text_editor();
for (int i = 0; i < te->get_line_count(); i++) {
for (const ScriptLanguage::Warning &W : warnings) {
if (i >= W.start_line - 1 && i < W.end_line) {
te->set_line_background_color(i, warning_line_color);
break;
}
}
}
}
}
void ScriptTextEditor::_update_errors() {
@ -706,7 +724,7 @@ void ScriptTextEditor::_update_errors() {
if (errors.is_empty()) {
bool is_folded_code_region = te->is_line_code_region_start(i) && te->is_line_folded(i);
te->set_line_background_color(i, is_folded_code_region ? folded_code_region_color : Color(0, 0, 0, 0));
} else {
} else if (marked_line_color.a != 0) {
for (const ScriptLanguage::ScriptError &E : errors) {
bool error_line = i == E.line - 1;
te->set_line_background_color(i, error_line ? marked_line_color : Color(0, 0, 0, 0));
@ -1806,8 +1824,8 @@ void ScriptTextEditor::_notification(int p_what) {
break;
}
if (is_visible_in_tree()) {
_update_warnings();
_update_errors();
_update_warnings();
}
[[fallthrough]];
case NOTIFICATION_ENTER_TREE: {