godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #106441 from jorgekorgut/fix-highlight-issues

Browse Source 
Fix highlighting warning and error issues
This commit is contained in:
Thaddeus Crews
2025-05-21 09:06:24 -05:00
parent 174da961b3 77e6d92357
commit 6414451ced
5 changed files with 109 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
editor/plugins/script_text_editor.cpp
View File

@@ -601,6 +601,50 @@ void ScriptTextEditor::_update_color_constructor_options() {
}
}
void ScriptTextEditor::_update_background_color() {
// Clear background lines.
CodeEdit *te = code_editor->get_text_editor();
for (int i = 0; i < te->get_line_count(); i++) {
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));
}
// Set the warning background.
if (warning_line_color.a != 0.0) {
for (const ScriptLanguage::Warning &warning : warnings) {
int folder_line_header = te->get_folded_line_header(warning.end_line - 2);
bool is_folded = folder_line_header != (warning.end_line - 2);
if (is_folded) {
te->set_line_background_color(folder_line_header, warning_line_color);
} else if (warning.end_line - warning.start_line > 0 && warning.end_line - warning.start_line < 20) {
// If the warning spans below 20 lines (arbitrary), set the background color for all lines.
// (W.end_line - W.start_line > 0) ensures that we set the background for single line warnings.
for (int i = warning.start_line - 1; i < warning.end_line - 1; i++) {
te->set_line_background_color(i, warning_line_color);
}
} else {
// Otherwise, just set the background color for the start line of the warning.
te->set_line_background_color(warning.start_line - 1, warning_line_color);
}
}
}
// Set the error background.
if (marked_line_color.a != 0.0) {
for (const ScriptLanguage::ScriptError &error : errors) {
int folder_line_header = te->get_folded_line_header(error.line - 1);
bool is_folded_code = folder_line_header != (error.line - 1);
if (is_folded_code) {
te->set_line_background_color(folder_line_header, marked_line_color);
} else {
te->set_line_background_color(error.line - 1, marked_line_color);
}
}
}
}
void ScriptTextEditor::_update_color_text() {
if (inline_color_line < 0) {
return;
@@ -802,6 +846,7 @@ void ScriptTextEditor::_validate_script() {
_update_connected_methods();
_update_warnings();
_update_errors();
_update_background_color();
emit_signal(SNAME("name_changed"));
emit_signal(SNAME("edited_script_changed"));
@@ -870,17 +915,6 @@ 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() {
@@ -943,23 +977,11 @@ void ScriptTextEditor::_update_errors() {
errors_panel->pop(); // Indent.
}
CodeEdit *te = code_editor->get_text_editor();
bool highlight_safe = EDITOR_GET("text_editor/appearance/gutters/highlight_type_safe_lines");
bool last_is_safe = false;
for (int i = 0; i < te->get_line_count(); i++) {
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 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));
if (error_line) {
break;
}
}
}
CodeEdit *te = code_editor->get_text_editor();
for (int i = 0; i < te->get_line_count(); i++) {
if (highlight_safe) {
if (safe_lines.has(i + 1)) {
te->set_line_gutter_item_color(i, line_number_gutter, safe_line_number_color);
@@ -1727,11 +1749,9 @@ void ScriptTextEditor::_edit_option(int p_op) {
} break;
case EDIT_FOLD_ALL_LINES: {
tx->fold_all_lines();
tx->queue_redraw();
} break;
case EDIT_UNFOLD_ALL_LINES: {
tx->unfold_all_lines();
tx->queue_redraw();
} break;
case EDIT_CREATE_CODE_REGION: {
tx->create_code_region();
@@ -2031,6 +2051,7 @@ void ScriptTextEditor::_notification(int p_what) {
if (is_visible_in_tree()) {
_update_warnings();
_update_errors();
_update_background_color();
}
[[fallthrough]];
case NOTIFICATION_ENTER_TREE: {
@@ -2588,6 +2609,7 @@ void ScriptTextEditor::_enable_code_editor() {
code_editor->get_text_editor()->connect("gutter_added", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
code_editor->get_text_editor()->connect("gutter_removed", callable_mp(this, &ScriptTextEditor::_update_gutter_indexes));
code_editor->get_text_editor()->connect("gutter_clicked", callable_mp(this, &ScriptTextEditor::_gutter_clicked));
code_editor->get_text_editor()->connect("_fold_line_updated", callable_mp(this, &ScriptTextEditor::_update_background_color));
code_editor->get_text_editor()->connect(SceneStringName(gui_input), callable_mp(this, &ScriptTextEditor::_text_edit_gui_input));
code_editor->show_toggle_files_button();
_update_gutter_indexes();